|
@@ -1839,13 +1839,13 @@ void Temperature::init() {
|
1839
|
1839
|
#if HAS_JOY_ADC_EN
|
1840
|
1840
|
SET_INPUT_PULLUP(JOY_EN_PIN);
|
1841
|
1841
|
#endif
|
1842
|
|
- #if HAS_HEATED_BED
|
|
1842
|
+ #if HAS_TEMP_ADC_BED
|
1843
|
1843
|
HAL_ANALOG_SELECT(TEMP_BED_PIN);
|
1844
|
1844
|
#endif
|
1845
|
|
- #if HAS_TEMP_CHAMBER
|
|
1845
|
+ #if HAS_TEMP_ADC_CHAMBER
|
1846
|
1846
|
HAL_ANALOG_SELECT(TEMP_CHAMBER_PIN);
|
1847
|
1847
|
#endif
|
1848
|
|
- #if HAS_TEMP_PROBE
|
|
1848
|
+ #if HAS_TEMP_ADC_PROBE
|
1849
|
1849
|
HAL_ANALOG_SELECT(TEMP_PROBE_PIN);
|
1850
|
1850
|
#endif
|
1851
|
1851
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
|
@@ -2355,9 +2355,9 @@ void Temperature::update_raw_temperatures() {
|
2355
|
2355
|
TERN_(HAS_TEMP_ADC_5, temp_hotend[5].update());
|
2356
|
2356
|
TERN_(HAS_TEMP_ADC_6, temp_hotend[6].update());
|
2357
|
2357
|
TERN_(HAS_TEMP_ADC_7, temp_hotend[7].update());
|
2358
|
|
- TERN_(HAS_HEATED_BED, temp_bed.update());
|
2359
|
|
- TERN_(HAS_TEMP_CHAMBER, temp_chamber.update());
|
2360
|
|
- TERN_(HAS_TEMP_PROBE, temp_probe.update());
|
|
2358
|
+ TERN_(HAS_TEMP_ADC_BED, temp_bed.update());
|
|
2359
|
+ TERN_(HAS_TEMP_ADC_CHAMBER, temp_chamber.update());
|
|
2360
|
+ TERN_(HAS_TEMP_ADC_PROBE, temp_probe.update());
|
2361
|
2361
|
|
2362
|
2362
|
TERN_(HAS_JOY_ADC_X, joystick.x.update());
|
2363
|
2363
|
TERN_(HAS_JOY_ADC_Y, joystick.y.update());
|
|
@@ -2822,17 +2822,17 @@ void Temperature::tick() {
|
2822
|
2822
|
case MeasureTemp_0: ACCUMULATE_ADC(temp_hotend[0]); break;
|
2823
|
2823
|
#endif
|
2824
|
2824
|
|
2825
|
|
- #if HAS_HEATED_BED
|
|
2825
|
+ #if HAS_TEMP_ADC_BED
|
2826
|
2826
|
case PrepareTemp_BED: HAL_START_ADC(TEMP_BED_PIN); break;
|
2827
|
2827
|
case MeasureTemp_BED: ACCUMULATE_ADC(temp_bed); break;
|
2828
|
2828
|
#endif
|
2829
|
2829
|
|
2830
|
|
- #if HAS_TEMP_CHAMBER
|
|
2830
|
+ #if HAS_TEMP_ADC_CHAMBER
|
2831
|
2831
|
case PrepareTemp_CHAMBER: HAL_START_ADC(TEMP_CHAMBER_PIN); break;
|
2832
|
2832
|
case MeasureTemp_CHAMBER: ACCUMULATE_ADC(temp_chamber); break;
|
2833
|
2833
|
#endif
|
2834
|
2834
|
|
2835
|
|
- #if HAS_TEMP_PROBE
|
|
2835
|
+ #if HAS_TEMP_ADC_PROBE
|
2836
|
2836
|
case PrepareTemp_PROBE: HAL_START_ADC(TEMP_PROBE_PIN); break;
|
2837
|
2837
|
case MeasureTemp_PROBE: ACCUMULATE_ADC(temp_probe); break;
|
2838
|
2838
|
#endif
|