|
@@ -27,7 +27,6 @@
|
27
|
27
|
#include "../gcode.h"
|
28
|
28
|
#include "../../module/temperature.h"
|
29
|
29
|
|
30
|
|
-/*
|
31
|
30
|
#include "../../module/motion.h"
|
32
|
31
|
#include "../../lcd/ultralcd.h"
|
33
|
32
|
|
|
@@ -40,7 +39,6 @@
|
40
|
39
|
#endif
|
41
|
40
|
|
42
|
41
|
#include "../../Marlin.h" // for wait_for_heatup and idle()
|
43
|
|
-*/
|
44
|
42
|
|
45
|
43
|
/**
|
46
|
44
|
* M141: Set chamber temperature
|
|
@@ -54,7 +52,6 @@ void GcodeSuite::M141() {
|
54
|
52
|
* M191: Sxxx Wait for chamber current temp to reach target temp. Waits only when heating
|
55
|
53
|
* Rxxx Wait for chamber current temp to reach target temp. Waits when heating and cooling
|
56
|
54
|
*/
|
57
|
|
-/*
|
58
|
55
|
void GcodeSuite::M191() {
|
59
|
56
|
if (DEBUGGING(DRYRUN)) return;
|
60
|
57
|
|
|
@@ -68,10 +65,11 @@ void GcodeSuite::M191() {
|
68
|
65
|
}
|
69
|
66
|
else return;
|
70
|
67
|
|
71
|
|
- lcd_setstatusPGM(thermalManager.isHeatingChamber() ? GET_TEXT(MSG_CHAMBER_HEATING) : GET_TEXT(MSG_CHAMBER_COOLING));
|
72
|
|
-
|
73
|
|
- thermalManager.wait_for_chamber(no_wait_for_cooling);
|
|
68
|
+ const bool is_heating = thermalManager.isHeatingChamber();
|
|
69
|
+ if (is_heating || !no_wait_for_cooling) {
|
|
70
|
+ lcd_setstatusPGM(is_heating ? GET_TEXT(MSG_CHAMBER_HEATING) : GET_TEXT(MSG_CHAMBER_COOLING));
|
|
71
|
+ thermalManager.wait_for_chamber(false);
|
|
72
|
+ }
|
74
|
73
|
}
|
75
|
|
-*/
|
76
|
74
|
|
77
|
75
|
#endif // HAS_HEATED_CHAMBER
|