Fix a few recent (STM32F1 DOGM, SPI) warnings (#14669)

2019-07-20 08:54:02 +02:00
parent 39e1726498
commit 977cfa4494
6 changed files with 23 additions and 30 deletions
--- a/Marlin/src/HAL/HAL_STM32F1/HAL.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/HAL.cpp
@@ -260,7 +260,11 @@ extern "C" {
 void HAL_adc_init(void) {
  // configure the ADC
  adc.calibrate();
-  adc.setSampleRate(ADC_SMPR_41_5); // ?
+  #if F_CPU > 72000000
+    adc.setSampleRate(ADC_SMPR_71_5); // 71.5 ADC cycles
+  #else
+    adc.setSampleRate(ADC_SMPR_41_5); // 41.5 ADC cycles
+  #endif
  adc.setPins(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();