Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix STM32F1 ADC read temperature error after connect USB CDC #15026

Merged
merged 25 commits into from
Aug 24, 2019
Merged

fix STM32F1 ADC read temperature error after connect USB CDC #15026

Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c5f5173
Fix bug in STM32F1 WRITE macro
Msq001 Jun 12, 2019
403ac83
Merge pull request #33 from MarlinFirmware/bugfix-2.0.x
Msq001 Jun 15, 2019
e652aae
Merge pull request #35 from MarlinFirmware/bugfix-2.0.x
Msq001 Jun 19, 2019
0b3528a
delet lib_ignore u8g for skr mini
Msq001 Jun 19, 2019
4603fd4
Update pins_BIGTREE_SKR_MINI_V1_1.h
Msq001 Jun 19, 2019
527c305
Merge pull request #36 from MarlinFirmware/bugfix-2.0.x
Msq001 Jun 24, 2019
051e568
Update pins_BIGTREE_SKR_MINI_V1_1.h
Msq001 Jun 24, 2019
8efed2f
Update pins_BIGTREE_SKR_MINI_V1_1.h
Msq001 Jun 25, 2019
f7bdc3a
Merge pull request #37 from MarlinFirmware/bugfix-2.0.x
Msq001 Jun 28, 2019
078d97a
Merge pull request #39 from MarlinFirmware/bugfix-2.0.x
Msq001 Jul 1, 2019
9f2ebfa
Merge pull request #40 from MarlinFirmware/bugfix-2.0.x
Msq001 Jul 3, 2019
4aa70f2
Merge pull request #41 from MarlinFirmware/bugfix-2.0.x
Msq001 Jul 4, 2019
698e752
Merge pull request #42 from MarlinFirmware/bugfix-2.0.x
Msq001 Jul 8, 2019
edb5720
Merge pull request #43 from MarlinFirmware/bugfix-2.0.x
Msq001 Jul 10, 2019
76f0aa5
Merge pull request #44 from MarlinFirmware/bugfix-2.0.x
Msq001 Jul 13, 2019
7fe3d7c
Merge pull request #46 from MarlinFirmware/bugfix-2.0.x
Msq001 Jul 16, 2019
4f2d2c3
Merge pull request #47 from MarlinFirmware/bugfix-2.0.x
Msq001 Jul 22, 2019
d16185e
Merge pull request #48 from MarlinFirmware/bugfix-2.0.x
Msq001 Jul 23, 2019
4552b72
Merge pull request #49 from MarlinFirmware/bugfix-2.0.x
Msq001 Jul 26, 2019
8a853e2
Merge pull request #50 from MarlinFirmware/bugfix-2.0.x
Msq001 Aug 3, 2019
5528206
Merge pull request #51 from MarlinFirmware/bugfix-2.0.x
Msq001 Aug 6, 2019
66fc599
Merge pull request #52 from MarlinFirmware/bugfix-2.0.x
Msq001 Aug 12, 2019
3ce5de6
Merge pull request #53 from MarlinFirmware/bugfix-2.0.x
Msq001 Aug 13, 2019
9b7f103
Merge pull request #2 from MarlinFirmware/bugfix-2.0.x
bigtreetech Aug 22, 2019
825d7f9
fix adc after connect usb cdc
bigtreetech Aug 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Marlin/src/HAL/HAL_STM32F1/HAL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ uint16_t HAL_adc_result;
// ------------------------
STM32ADC adc(ADC1);

uint8_t adc_pins[] = {
const uint8_t adc_pins[] = {
#if HAS_TEMP_ADC_0
TEMP_0_PIN,
#endif
Expand Down Expand Up @@ -270,7 +270,7 @@ void HAL_adc_init(void) {
#else
adc.setSampleRate(ADC_SMPR_41_5); // 41.5 ADC cycles
#endif
adc.setPins(adc_pins, ADC_PIN_COUNT);
adc.setPins((uint8_t *)adc_pins, ADC_PIN_COUNT);
adc.setDMA(HAL_adc_results, (uint16_t)ADC_PIN_COUNT, (uint32_t)(DMA_MINC_MODE | DMA_CIRC_MODE), nullptr);
adc.setScanMode();
adc.setContinuous();
Expand Down