melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix dummy thermistors for Bed, Chamber, Probe (#20247)

Browse Source
This commit is contained in:
Jason Smith 2020-11-22 16:47:52 -08:00 committed by Scott Lahteine
parent 300a944af6
commit 8cd25f35c2
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Marlin/src/inc/Conditionals_post.h
View File

@ -1774,12 +1774,19 @@
#define HAS_TEMP_ADC_CHAMBER 1 #define HAS_TEMP_ADC_CHAMBER 1
#endif #endif
#if HAS_HOTEND && ANY(HAS_TEMP_ADC_0, HEATER_0_USES_MAX6675, HEATER_0_DUMMY_THERMISTOR) #define HAS_TEMP(N) ANY(HAS_TEMP_ADC_##N, HEATER_##N##_USES_MAX6675, HEATER_##N##_DUMMY_THERMISTOR)
#if HAS_HOTEND && HAS_TEMP(0)
#define HAS_TEMP_HOTEND 1 #define HAS_TEMP_HOTEND 1
#endif #endif
#define HAS_TEMP_BED HAS_TEMP_ADC_BED #if HAS_TEMP(BED)
#define HAS_TEMP_PROBE HAS_TEMP_ADC_PROBE #define HAS_TEMP_BED 1
#define HAS_TEMP_CHAMBER HAS_TEMP_ADC_CHAMBER #endif
#if HAS_TEMP(PROBE)
#define HAS_TEMP_PROBE 1
#endif
#if HAS_TEMP(CHAMBER)
#define HAS_TEMP_CHAMBER 1
#endif
#if ENABLED(JOYSTICK) #if ENABLED(JOYSTICK)
#if PIN_EXISTS(JOY_X) #if PIN_EXISTS(JOY_X)

18
Marlin/src/module/temperature.cpp
View File

@ -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

6
Marlin/src/module/temperature.h
View File

@ -89,13 +89,13 @@ enum ADCSensorState : char {
#if HAS_TEMP_ADC_0 #if HAS_TEMP_ADC_0
PrepareTemp_0, MeasureTemp_0, PrepareTemp_0, MeasureTemp_0,
#endif #endif
#if HAS_HEATED_BED #if HAS_TEMP_ADC_BED
PrepareTemp_BED, MeasureTemp_BED, PrepareTemp_BED, MeasureTemp_BED,
#endif #endif
#if HAS_TEMP_CHAMBER #if HAS_TEMP_ADC_CHAMBER
PrepareTemp_CHAMBER, MeasureTemp_CHAMBER, PrepareTemp_CHAMBER, MeasureTemp_CHAMBER,
#endif #endif
#if HAS_TEMP_PROBE #if HAS_TEMP_ADC_PROBE
PrepareTemp_PROBE, MeasureTemp_PROBE, PrepareTemp_PROBE, MeasureTemp_PROBE,
#endif #endif
#if HAS_TEMP_ADC_1 #if HAS_TEMP_ADC_1