🐛 HAL refactor followup (MarlinFirmware#23354)

Foxies-CSTL · Dec 26, 2021 · a47f559 · a47f559
1 parent 57315f0
commit a47f559
Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/Marlin/src/HAL/SAMD51/HAL.h b/Marlin/src/HAL/SAMD51/HAL.h
@@ -186,7 +186,7 @@ class MarlinHAL {
   static void adc_init();
 
   // Called by Temperature::init for each sensor at startup
-  static void adc_enable(const uint8_t ch);
+  static inline void adc_enable(const uint8_t ch) {}
 
   // Begin ADC sampling on the given channel
   static void adc_start(const pin_t pin);

diff --git a/Marlin/src/HAL/STM32/HAL_SPI.cpp b/Marlin/src/HAL/STM32/HAL_SPI.cpp
@@ -104,7 +104,7 @@ static SPISettings spiConfig;
   uint8_t spiRec() {
     hal.isr_off();                                                // No interrupts during byte receive
     const uint8_t data = HAL_SPI_STM32_SpiTransfer_Mode_3(0xFF);
-    hal.isr_off();                                                // Enable interrupts
+    hal.isr_on();                                                 // Enable interrupts
     return data;
   }
 

diff --git a/Marlin/src/HAL/STM32F1/HAL.h b/Marlin/src/HAL/STM32F1/HAL.h
@@ -280,7 +280,7 @@ class MarlinHAL {
   static void adc_init();
 
   // Called by Temperature::init for each sensor at startup
-  static void adc_enable(const pin_t pin);
+  static inline void adc_enable(const pin_t pin) { pinMode(pin, INPUT_ANALOG); }
 
   // Begin ADC sampling on the given channel
   static void adc_start(const pin_t pin);

diff --git a/Marlin/src/HAL/TEENSY31_32/HAL.h b/Marlin/src/HAL/TEENSY31_32/HAL.h
@@ -163,7 +163,7 @@ class MarlinHAL {
   static void adc_init();
 
   // Called by Temperature::init for each sensor at startup
-  static void adc_enable(const pin_t ch);
+  static inline void adc_enable(const pin_t ch) {}
 
   // Begin ADC sampling on the given channel
   static void adc_start(const pin_t ch);

diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.h b/Marlin/src/HAL/TEENSY40_41/HAL.h
@@ -192,7 +192,7 @@ class MarlinHAL {
   static void adc_init();
 
   // Called by Temperature::init for each sensor at startup
-  static void adc_enable(const pin_t pin);
+  static inline void adc_enable(const pin_t pin) {}
 
   // Begin ADC sampling on the given channel
   static void adc_start(const pin_t pin);