diff --git a/config.default.h b/config.default.h index ca765d7..84ec516 100644 --- a/config.default.h +++ b/config.default.h @@ -243,10 +243,11 @@ Unit is degree Celsius. */ #define TEMP_HYSTERESIS 5 -/** - TEMP_RESIDENCY_TIME: actual temperature must be close to target for this long before target is achieved - temperature is "achieved" for purposes of M109 and friends when actual temperature is within [hysteresis] of target for [residency] seconds +/** + TEMP_RESIDENCY_TIME: actual temperature must be close to target (within + set temperature +- TEMP_HYSTERESIS) for this long before target is achieved + (and a M116 succeeds). Unit is seconds. */ #define TEMP_RESIDENCY_TIME 60 diff --git a/config.gen3.h b/config.gen3.h index adfb431..440ed36 100644 --- a/config.gen3.h +++ b/config.gen3.h @@ -250,9 +250,9 @@ #define TEMP_HYSTERESIS 5 /** - TEMP_RESIDENCY_TIME: actual temperature must be close to target for this long before target is achieved - - temperature is "achieved" for purposes of M109 and friends when actual temperature is within [hysteresis] of target for [residency] seconds + TEMP_RESIDENCY_TIME: actual temperature must be close to target (within + set temperature +- TEMP_HYSTERESIS) for this long before target is achieved + (and a M116 succeeds). Unit is seconds. */ #define TEMP_RESIDENCY_TIME 60 diff --git a/config.gen6.h b/config.gen6.h index aa38f3f..361d134 100644 --- a/config.gen6.h +++ b/config.gen6.h @@ -243,10 +243,11 @@ Unit is degree Celsius. */ #define TEMP_HYSTERESIS 5 -/** - TEMP_RESIDENCY_TIME: actual temperature must be close to target for this long before target is achieved - temperature is "achieved" for purposes of M109 and friends when actual temperature is within [hysteresis] of target for [residency] seconds +/** + TEMP_RESIDENCY_TIME: actual temperature must be close to target (within + set temperature +- TEMP_HYSTERESIS) for this long before target is achieved + (and a M116 succeeds). Unit is seconds. */ #define TEMP_RESIDENCY_TIME 60 diff --git a/config.gen7-v1.1-v1.3.h b/config.gen7-v1.1-v1.3.h index cff0c06..22e0a65 100644 --- a/config.gen7-v1.1-v1.3.h +++ b/config.gen7-v1.1-v1.3.h @@ -251,10 +251,11 @@ Unit is degree Celsius. */ #define TEMP_HYSTERESIS 20 -/** - TEMP_RESIDENCY_TIME: actual temperature must be close to target for this long before target is achieved - temperature is "achieved" for purposes of M109 and friends when actual temperature is within [hysteresis] of target for [residency] seconds +/** + TEMP_RESIDENCY_TIME: actual temperature must be close to target (within + set temperature +- TEMP_HYSTERESIS) for this long before target is achieved + (and a M116 succeeds). Unit is seconds. */ #define TEMP_RESIDENCY_TIME 60 diff --git a/config.gen7-v1.4.h b/config.gen7-v1.4.h index 325a4b9..c414d6c 100644 --- a/config.gen7-v1.4.h +++ b/config.gen7-v1.4.h @@ -251,10 +251,11 @@ Unit is degree Celsius. */ #define TEMP_HYSTERESIS 20 -/** - TEMP_RESIDENCY_TIME: actual temperature must be close to target for this long before target is achieved - temperature is "achieved" for purposes of M109 and friends when actual temperature is within [hysteresis] of target for [residency] seconds +/** + TEMP_RESIDENCY_TIME: actual temperature must be close to target (within + set temperature +- TEMP_HYSTERESIS) for this long before target is achieved + (and a M116 succeeds). Unit is seconds. */ #define TEMP_RESIDENCY_TIME 60 diff --git a/config.ramps-v1.2.h b/config.ramps-v1.2.h index adb95c6..3aeb09a 100644 --- a/config.ramps-v1.2.h +++ b/config.ramps-v1.2.h @@ -246,10 +246,11 @@ Unit is degree Celsius. */ #define TEMP_HYSTERESIS 5 -/** -TEMP_RESIDENCY_TIME: actual temperature must be close to target for this long before target is achieved -temperature is "achieved" for purposes of M109 and friends when actual temperature is within [hysteresis] of target for [residency] seconds +/** + TEMP_RESIDENCY_TIME: actual temperature must be close to target (within + set temperature +- TEMP_HYSTERESIS) for this long before target is achieved + (and a M116 succeeds). Unit is seconds. */ #define TEMP_RESIDENCY_TIME 60 diff --git a/config.ramps-v1.3.h b/config.ramps-v1.3.h index 142b86a..fec2715 100644 --- a/config.ramps-v1.3.h +++ b/config.ramps-v1.3.h @@ -250,10 +250,11 @@ Unit is degree Celsius. */ #define TEMP_HYSTERESIS 5 -/** -TEMP_RESIDENCY_TIME: actual temperature must be close to target for this long before target is achieved -temperature is "achieved" for purposes of M109 and friends when actual temperature is within [hysteresis] of target for [residency] seconds +/** + TEMP_RESIDENCY_TIME: actual temperature must be close to target (within + set temperature +- TEMP_HYSTERESIS) for this long before target is achieved + (and a M116 succeeds). Unit is seconds. */ #define TEMP_RESIDENCY_TIME 60 diff --git a/config.sanguinololu-v1.1.h b/config.sanguinololu-v1.1.h index 014a3f3..93ffba0 100644 --- a/config.sanguinololu-v1.1.h +++ b/config.sanguinololu-v1.1.h @@ -247,10 +247,11 @@ Unit is degree Celsius. */ #define TEMP_HYSTERESIS 5 -/** - TEMP_RESIDENCY_TIME: actual temperature must be close to target for this long before target is achieved - temperature is "achieved" for purposes of M109 and friends when actual temperature is within [hysteresis] of target for [residency] seconds +/** + TEMP_RESIDENCY_TIME: actual temperature must be close to target (within + set temperature +- TEMP_HYSTERESIS) for this long before target is achieved + (and a M116 succeeds). Unit is seconds. */ #define TEMP_RESIDENCY_TIME 60 diff --git a/config.sanguinololu-v1.2.h b/config.sanguinololu-v1.2.h index b4c9e04..fc4f759 100644 --- a/config.sanguinololu-v1.2.h +++ b/config.sanguinololu-v1.2.h @@ -247,10 +247,11 @@ Unit is degree Celsius. */ #define TEMP_HYSTERESIS 5 -/** - TEMP_RESIDENCY_TIME: actual temperature must be close to target for this long before target is achieved - temperature is "achieved" for purposes of M109 and friends when actual temperature is within [hysteresis] of target for [residency] seconds +/** + TEMP_RESIDENCY_TIME: actual temperature must be close to target (within + set temperature +- TEMP_HYSTERESIS) for this long before target is achieved + (and a M116 succeeds). Unit is seconds. */ #define TEMP_RESIDENCY_TIME 60 diff --git a/config.teensy.h b/config.teensy.h index 7599cbd..a1d8d74 100644 --- a/config.teensy.h +++ b/config.teensy.h @@ -335,10 +335,11 @@ New plan: Unit is degree Celsius. */ #define TEMP_HYSTERESIS 5 -/** - TEMP_RESIDENCY_TIME: actual temperature must be close to target for this long before target is achieved - temperature is "achieved" for purposes of M109 and friends when actual temperature is within [hysteresis] of target for [residency] seconds +/** + TEMP_RESIDENCY_TIME: actual temperature must be close to target (within + set temperature +- TEMP_HYSTERESIS) for this long before target is achieved + (and a M116 succeeds). Unit is seconds. */ #define TEMP_RESIDENCY_TIME 60 diff --git a/gcode_process.c b/gcode_process.c index 8b07005..0400bba 100644 --- a/gcode_process.c +++ b/gcode_process.c @@ -467,7 +467,7 @@ void process_gcode_command() { //? //? Example: M104 S190 //? - //? Set the temperature of the current extruder to 190oC and return control to the host immediately (''i.e.'' before that temperature has been reached by the extruder). See also M109. + //? Set the temperature of the current extruder to 190oC and return control to the host immediately (''i.e.'' before that temperature has been reached by the extruder). See also M116. //? Teacup supports an optional P parameter as a sensor index to address (eg M104 P1 S100 will set the bed temperature rather than the extruder temperature). //? if ( ! next_target.seen_S) diff --git a/temp.c b/temp.c index 9faad33..fe2e246 100644 --- a/temp.c +++ b/temp.c @@ -306,7 +306,7 @@ void temp_sensor_tick() { } /// report whether all temp sensors are reading their target temperatures -/// used for M109 and friends +/// used for M116 and friends uint8_t temp_achieved() { temp_sensor_t i; uint8_t all_ok = 255;