0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
tombrazier 2022-03-11 23:09:04 +00:00 committed by GitHub
parent 79b38e0e14
commit b123fa763d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/HAL/STM32F1/HAL.cpp
View file

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

1
ini/stm32-common.ini
View file

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

1
ini/stm32g0.ini
View file

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