Remove all remaining evidence of M109.

M109 went away a few commits ago in favour of only M116.
This commit is contained in:
Markus Hitter 2012-10-03 11:44:25 +02:00
parent b83027def2
commit a054d4c6cd
12 changed files with 41 additions and 32 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -467,7 +467,7 @@ void process_gcode_command() {
//?
//? Example: M104 S190
//?
//? Set the temperature of the current extruder to 190<sup>o</sup>C 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 190<sup>o</sup>C 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)

2
temp.c
View File

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