Browse Source

🐛 HAL refactor followup (#23354)

Robby Candra 3 years ago
parent
commit
a47f559db1
No account linked to committer's email address

+ 1
- 1
Marlin/src/HAL/SAMD51/HAL.h View File

186
   static void adc_init();
186
   static void adc_init();
187
 
187
 
188
   // Called by Temperature::init for each sensor at startup
188
   // Called by Temperature::init for each sensor at startup
189
-  static void adc_enable(const uint8_t ch);
189
+  static inline void adc_enable(const uint8_t ch) {}
190
 
190
 
191
   // Begin ADC sampling on the given channel
191
   // Begin ADC sampling on the given channel
192
   static void adc_start(const pin_t pin);
192
   static void adc_start(const pin_t pin);

+ 1
- 1
Marlin/src/HAL/STM32/HAL_SPI.cpp View File

104
   uint8_t spiRec() {
104
   uint8_t spiRec() {
105
     hal.isr_off();                                                // No interrupts during byte receive
105
     hal.isr_off();                                                // No interrupts during byte receive
106
     const uint8_t data = HAL_SPI_STM32_SpiTransfer_Mode_3(0xFF);
106
     const uint8_t data = HAL_SPI_STM32_SpiTransfer_Mode_3(0xFF);
107
-    hal.isr_off();                                                // Enable interrupts
107
+    hal.isr_on();                                                 // Enable interrupts
108
     return data;
108
     return data;
109
   }
109
   }
110
 
110
 

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

280
   static void adc_init();
280
   static void adc_init();
281
 
281
 
282
   // Called by Temperature::init for each sensor at startup
282
   // Called by Temperature::init for each sensor at startup
283
-  static void adc_enable(const pin_t pin);
283
+  static inline void adc_enable(const pin_t pin) { pinMode(pin, INPUT_ANALOG); }
284
 
284
 
285
   // Begin ADC sampling on the given channel
285
   // Begin ADC sampling on the given channel
286
   static void adc_start(const pin_t pin);
286
   static void adc_start(const pin_t pin);

+ 1
- 1
Marlin/src/HAL/TEENSY31_32/HAL.h View File

163
   static void adc_init();
163
   static void adc_init();
164
 
164
 
165
   // Called by Temperature::init for each sensor at startup
165
   // Called by Temperature::init for each sensor at startup
166
-  static void adc_enable(const pin_t ch);
166
+  static inline void adc_enable(const pin_t ch) {}
167
 
167
 
168
   // Begin ADC sampling on the given channel
168
   // Begin ADC sampling on the given channel
169
   static void adc_start(const pin_t ch);
169
   static void adc_start(const pin_t ch);

+ 1
- 1
Marlin/src/HAL/TEENSY40_41/HAL.h View File

192
   static void adc_init();
192
   static void adc_init();
193
 
193
 
194
   // Called by Temperature::init for each sensor at startup
194
   // Called by Temperature::init for each sensor at startup
195
-  static void adc_enable(const pin_t pin);
195
+  static inline void adc_enable(const pin_t pin) {}
196
 
196
 
197
   // Begin ADC sampling on the given channel
197
   // Begin ADC sampling on the given channel
198
   static void adc_start(const pin_t pin);
198
   static void adc_start(const pin_t pin);

Loading…
Cancel
Save