Browse Source

🐛 Restore STM32 / STM32F1 12-bit ADC (#23871)

tombrazier 2 years ago
parent
commit
b123fa763d
No account linked to committer's email address
3 changed files with 2 additions and 2 deletions
  1. 1
    1
      Marlin/src/HAL/STM32F1/HAL.cpp
  2. 1
    0
      ini/stm32-common.ini
  3. 0
    1
      ini/stm32g0.ini

+ 1
- 1
Marlin/src/HAL/STM32F1/HAL.cpp View File

@@ -335,7 +335,7 @@ void MarlinHAL::adc_start(const pin_t pin) {
335 335
     _TCASE(POWER_MONITOR_CURRENT, POWER_MONITOR_CURRENT_PIN, POWERMON_CURRENT)
336 336
     _TCASE(POWER_MONITOR_VOLTAGE, POWER_MONITOR_VOLTAGE_PIN, POWERMON_VOLTS)
337 337
   }
338
-  adc_result = adc_results[(int)pin_index] >> (12 - HAL_ADC_RESOLUTION); // shift out unused bits
338
+  adc_result = (adc_results[(int)pin_index] & 0xFFF) >> (12 - HAL_ADC_RESOLUTION); // shift out unused bits
339 339
 }
340 340
 
341 341
 #endif // __STM32F1__

+ 1
- 0
ini/stm32-common.ini View File

@@ -16,6 +16,7 @@ build_flags      = ${common.build_flags}
16 16
                    -std=gnu++14 -DHAL_STM32
17 17
                    -DUSBCON -DUSBD_USE_CDC
18 18
                    -DTIM_IRQ_PRIO=13
19
+                   -DADC_RESOLUTION=12
19 20
 build_unflags    = -std=gnu++11
20 21
 src_filter       = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/shared/backtrace>
21 22
 extra_scripts    = ${common.extra_scripts}

+ 0
- 1
ini/stm32g0.ini View File

@@ -30,7 +30,6 @@ board                       = marlin_STM32G0B1RE
30 30
 board_build.offset          = 0x2000
31 31
 board_upload.offset_address = 0x08002000
32 32
 build_flags                 = ${stm32_variant.build_flags}
33
-                            -DADC_RESOLUTION=12
34 33
                             -DPIN_SERIAL4_RX=PC_11 -DPIN_SERIAL4_TX=PC_10
35 34
                             -DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
36 35
                             -DTIMER_SERVO=TIM3 -DTIMER_TONE=TIM4

Loading…
Cancel
Save