bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Standard methods to wait for heating (#11949)

Browse Source
This commit is contained in:
Scott Lahteine
2018-09-29 01:44:47 -05:00
committed by GitHub
parent bdc9889d3a
commit e4389f7d23
7 changed files with 265 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -433,7 +433,12 @@ class Temperature {
return target_temperature[HOTEND_INDEX] < current_temperature[HOTEND_INDEX];
}
#if HAS_TEMP_HOTEND
static bool wait_for_hotend(const uint8_t target_extruder, const bool no_wait_for_cooling=true);
#endif
#if HAS_HEATED_BED
#if ENABLED(SHOW_TEMP_ADC_VALUES)
FORCE_INLINE static int16_t rawBedTemp() { return current_temperature_bed_raw; }
#endif
@ -461,7 +466,10 @@ class Temperature {
#if WATCH_THE_BED
static void start_watching_bed();
#endif
#endif
static void wait_for_bed(const bool no_wait_for_cooling);
#endif // HAS_HEATED_BED
#if HAS_TEMP_CHAMBER
#if ENABLED(SHOW_TEMP_ADC_VALUES)
@ -470,7 +478,7 @@ class Temperature {
FORCE_INLINE static float degChamber() { return current_temperature_chamber; }
#endif
FORCE_INLINE static bool wait_for_heating(const uint8_t e) {
FORCE_INLINE static bool still_heating(const uint8_t e) {
return degTargetHotend(e) > TEMP_HYSTERESIS && ABS(degHotend(e) - degTargetHotend(e)) > TEMP_HYSTERESIS;
}