3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-12-01 07:42:37 +00:00
Code Issues Releases Wiki Activity

🐛 Fix adc_start for AVR, native

Browse Source 
Followup to #23295
This commit is contained in:
Scott Lahteine 2021-12-25 22:10:47 -06:00
parent 555c749fe2
commit 00e6e90648
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/src/HAL/AVR/HAL.h
View File

@ -229,12 +229,14 @@ public:
} }
// Begin ADC sampling on the given channel // Begin ADC sampling on the given channel
static inline void adc_start(const pin_t ch) { static inline void adc_start(const uint8_t ch) {
#ifdef MUX5 #ifdef MUX5
if (ch > 7) { ADCSRB = _BV(MUX5); return; } ADCSRB = ch > 7 ? _BV(MUX5) : 0;
#endif #else
ADCSRB = 0; ADCSRB = 0;
ADMUX = _BV(REFS0) | (ch & 0x07); SBI(ADCSRA, ADSC); #endif
ADMUX = _BV(REFS0) | (ch & 0x07);
SBI(ADCSRA, ADSC);
} }
// Is the ADC ready for reading? // Is the ADC ready for reading?

2
Marlin/src/HAL/LINUX/HAL.h
View File

@ -140,7 +140,7 @@ public:
static inline void adc_enable(const uint8_t) {} static inline void adc_enable(const uint8_t) {}
// Begin ADC sampling on the given channel // Begin ADC sampling on the given channel
static inline void adc_start(const pin_t ch) { active_ch = ch; } static inline void adc_start(const uint8_t ch) { active_ch = ch; }
// Is the ADC ready for reading? // Is the ADC ready for reading?
static inline bool adc_ready() { return true; } static inline bool adc_ready() { return true; }