|
@ -1839,13 +1839,13 @@ void Temperature::init() { |
|
|
#if HAS_JOY_ADC_EN |
|
|
#if HAS_JOY_ADC_EN |
|
|
SET_INPUT_PULLUP(JOY_EN_PIN); |
|
|
SET_INPUT_PULLUP(JOY_EN_PIN); |
|
|
#endif |
|
|
#endif |
|
|
#if HAS_HEATED_BED |
|
|
#if HAS_TEMP_ADC_BED |
|
|
HAL_ANALOG_SELECT(TEMP_BED_PIN); |
|
|
HAL_ANALOG_SELECT(TEMP_BED_PIN); |
|
|
#endif |
|
|
#endif |
|
|
#if HAS_TEMP_CHAMBER |
|
|
#if HAS_TEMP_ADC_CHAMBER |
|
|
HAL_ANALOG_SELECT(TEMP_CHAMBER_PIN); |
|
|
HAL_ANALOG_SELECT(TEMP_CHAMBER_PIN); |
|
|
#endif |
|
|
#endif |
|
|
#if HAS_TEMP_PROBE |
|
|
#if HAS_TEMP_ADC_PROBE |
|
|
HAL_ANALOG_SELECT(TEMP_PROBE_PIN); |
|
|
HAL_ANALOG_SELECT(TEMP_PROBE_PIN); |
|
|
#endif |
|
|
#endif |
|
|
#if ENABLED(FILAMENT_WIDTH_SENSOR) |
|
|
#if ENABLED(FILAMENT_WIDTH_SENSOR) |
|
@ -2355,9 +2355,9 @@ void Temperature::update_raw_temperatures() { |
|
|
TERN_(HAS_TEMP_ADC_5, temp_hotend[5].update()); |
|
|
TERN_(HAS_TEMP_ADC_5, temp_hotend[5].update()); |
|
|
TERN_(HAS_TEMP_ADC_6, temp_hotend[6].update()); |
|
|
TERN_(HAS_TEMP_ADC_6, temp_hotend[6].update()); |
|
|
TERN_(HAS_TEMP_ADC_7, temp_hotend[7].update()); |
|
|
TERN_(HAS_TEMP_ADC_7, temp_hotend[7].update()); |
|
|
TERN_(HAS_HEATED_BED, temp_bed.update()); |
|
|
TERN_(HAS_TEMP_ADC_BED, temp_bed.update()); |
|
|
TERN_(HAS_TEMP_CHAMBER, temp_chamber.update()); |
|
|
TERN_(HAS_TEMP_ADC_CHAMBER, temp_chamber.update()); |
|
|
TERN_(HAS_TEMP_PROBE, temp_probe.update()); |
|
|
TERN_(HAS_TEMP_ADC_PROBE, temp_probe.update()); |
|
|
|
|
|
|
|
|
TERN_(HAS_JOY_ADC_X, joystick.x.update()); |
|
|
TERN_(HAS_JOY_ADC_X, joystick.x.update()); |
|
|
TERN_(HAS_JOY_ADC_Y, joystick.y.update()); |
|
|
TERN_(HAS_JOY_ADC_Y, joystick.y.update()); |
|
@ -2822,17 +2822,17 @@ void Temperature::tick() { |
|
|
case MeasureTemp_0: ACCUMULATE_ADC(temp_hotend[0]); break; |
|
|
case MeasureTemp_0: ACCUMULATE_ADC(temp_hotend[0]); break; |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
#if HAS_HEATED_BED |
|
|
#if HAS_TEMP_ADC_BED |
|
|
case PrepareTemp_BED: HAL_START_ADC(TEMP_BED_PIN); break; |
|
|
case PrepareTemp_BED: HAL_START_ADC(TEMP_BED_PIN); break; |
|
|
case MeasureTemp_BED: ACCUMULATE_ADC(temp_bed); break; |
|
|
case MeasureTemp_BED: ACCUMULATE_ADC(temp_bed); break; |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
#if HAS_TEMP_CHAMBER |
|
|
#if HAS_TEMP_ADC_CHAMBER |
|
|
case PrepareTemp_CHAMBER: HAL_START_ADC(TEMP_CHAMBER_PIN); break; |
|
|
case PrepareTemp_CHAMBER: HAL_START_ADC(TEMP_CHAMBER_PIN); break; |
|
|
case MeasureTemp_CHAMBER: ACCUMULATE_ADC(temp_chamber); break; |
|
|
case MeasureTemp_CHAMBER: ACCUMULATE_ADC(temp_chamber); break; |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
#if HAS_TEMP_PROBE |
|
|
#if HAS_TEMP_ADC_PROBE |
|
|
case PrepareTemp_PROBE: HAL_START_ADC(TEMP_PROBE_PIN); break; |
|
|
case PrepareTemp_PROBE: HAL_START_ADC(TEMP_PROBE_PIN); break; |
|
|
case MeasureTemp_PROBE: ACCUMULATE_ADC(temp_probe); break; |
|
|
case MeasureTemp_PROBE: ACCUMULATE_ADC(temp_probe); break; |
|
|
#endif |
|
|
#endif |
|
|