0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

🧑‍💻 More IntelliSense-friendly declares

Browse source
This commit is contained in:
Scott Lahteine 2023-03-18 01:22:50 -05:00
parent c914761327
commit f50603ff1d
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Marlin/src/module/temperature.cpp
View file

@ -508,8 +508,12 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
// Init min and max temp with extreme values to prevent false errors during startup // Init min and max temp with extreme values to prevent false errors during startup
raw_adc_t Temperature::mintemp_raw_BED = TEMP_SENSOR_BED_RAW_LO_TEMP, raw_adc_t Temperature::mintemp_raw_BED = TEMP_SENSOR_BED_RAW_LO_TEMP,
Temperature::maxtemp_raw_BED = TEMP_SENSOR_BED_RAW_HI_TEMP; Temperature::maxtemp_raw_BED = TEMP_SENSOR_BED_RAW_HI_TEMP;
TERN_(WATCH_BED, bed_watch_t Temperature::watch_bed); // = { 0 } #if WATCH_BED
IF_DISABLED(PIDTEMPBED, millis_t Temperature::next_bed_check_ms); bed_watch_t Temperature::watch_bed; // = { 0 }
#endif
#if DISABLED(PIDTEMPBED)
millis_t Temperature::next_bed_check_ms;
#endif
#endif #endif
#if HAS_TEMP_CHAMBER #if HAS_TEMP_CHAMBER
@ -519,8 +523,12 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
celsius_float_t old_temp = 9999; celsius_float_t old_temp = 9999;
raw_adc_t Temperature::mintemp_raw_CHAMBER = TEMP_SENSOR_CHAMBER_RAW_LO_TEMP, raw_adc_t Temperature::mintemp_raw_CHAMBER = TEMP_SENSOR_CHAMBER_RAW_LO_TEMP,
Temperature::maxtemp_raw_CHAMBER = TEMP_SENSOR_CHAMBER_RAW_HI_TEMP; Temperature::maxtemp_raw_CHAMBER = TEMP_SENSOR_CHAMBER_RAW_HI_TEMP;
TERN_(WATCH_CHAMBER, chamber_watch_t Temperature::watch_chamber{0}); #if WATCH_CHAMBER
IF_DISABLED(PIDTEMPCHAMBER, millis_t Temperature::next_chamber_check_ms); chamber_watch_t Temperature::watch_chamber; // = { 0 }
#endif
#if DISABLED(PIDTEMPCHAMBER)
millis_t Temperature::next_chamber_check_ms;
#endif
#endif #endif
#endif #endif

14
Marlin/src/module/temperature.h
View file

@ -725,23 +725,27 @@ class Temperature {
#endif #endif
#if HAS_HEATED_BED #if HAS_HEATED_BED
#if ENABLED(WATCH_BED) #if WATCH_BED
static bed_watch_t watch_bed; static bed_watch_t watch_bed;
#endif #endif
IF_DISABLED(PIDTEMPBED, static millis_t next_bed_check_ms); #if DISABLED(PIDTEMPBED)
static millis_t next_bed_check_ms;
#endif
static raw_adc_t mintemp_raw_BED, maxtemp_raw_BED; static raw_adc_t mintemp_raw_BED, maxtemp_raw_BED;
#endif #endif
#if HAS_HEATED_CHAMBER #if HAS_HEATED_CHAMBER
#if ENABLED(WATCH_CHAMBER) #if WATCH_CHAMBER
static chamber_watch_t watch_chamber; static chamber_watch_t watch_chamber;
#endif #endif
TERN(PIDTEMPCHAMBER,,static millis_t next_chamber_check_ms); #if DISABLED(PIDTEMPCHAMBER)
static millis_t next_chamber_check_ms;
#endif
static raw_adc_t mintemp_raw_CHAMBER, maxtemp_raw_CHAMBER; static raw_adc_t mintemp_raw_CHAMBER, maxtemp_raw_CHAMBER;
#endif #endif
#if HAS_COOLER #if HAS_COOLER
#if ENABLED(WATCH_COOLER) #if WATCH_COOLER
static cooler_watch_t watch_cooler; static cooler_watch_t watch_cooler;
#endif #endif
static millis_t next_cooler_check_ms, cooler_fan_flush_ms; static millis_t next_cooler_check_ms, cooler_fan_flush_ms;