Browse Source

Temperature 'autostart' => 'auto_job'

Scott Lahteine 4 years ago
parent
commit
dcb0f5dc3b

+ 2
- 2
Marlin/src/gcode/temp/M104_M109.cpp View File

@@ -105,7 +105,7 @@ void GcodeSuite::M104() {
105 105
        * mode, for instance in a dual extruder setup, without affecting the running
106 106
        * print timer.
107 107
        */
108
-      thermalManager.check_timer_autostart(false, true);
108
+      thermalManager.auto_job_check_timer(false, true);
109 109
     #endif
110 110
   }
111 111
 
@@ -182,7 +182,7 @@ void GcodeSuite::M109() {
182 182
        * standby mode, (e.g., in a dual extruder setup) without affecting
183 183
        * the running print timer.
184 184
        */
185
-      thermalManager.check_timer_autostart(true, true);
185
+      thermalManager.auto_job_check_timer(true, true);
186 186
     #endif
187 187
 
188 188
     #if HAS_DISPLAY

+ 2
- 2
Marlin/src/gcode/temp/M140_M190.cpp View File

@@ -81,7 +81,7 @@ void GcodeSuite::M140() {
81 81
        * temperatures need to be set below mintemp. Order of M140, M104, and M141
82 82
        * at the end of the print does not matter.
83 83
        */
84
-      thermalManager.check_timer_autostart(false, true);
84
+      thermalManager.auto_job_check_timer(false, true);
85 85
     #endif
86 86
   }
87 87
 }
@@ -128,7 +128,7 @@ void GcodeSuite::M190() {
128 128
 
129 129
   thermalManager.setTargetBed(temp);
130 130
 
131
-  TERN_(PRINTJOB_TIMER_AUTOSTART, thermalManager.check_timer_autostart(true, false));
131
+  TERN_(PRINTJOB_TIMER_AUTOSTART, thermalManager.auto_job_check_timer(true, false));
132 132
 
133 133
   ui.set_status_P(thermalManager.isHeatingBed() ? GET_TEXT(MSG_BED_HEATING) : GET_TEXT(MSG_BED_COOLING));
134 134
 

+ 2
- 2
Marlin/src/gcode/temp/M141_M191.cpp View File

@@ -60,7 +60,7 @@ void GcodeSuite::M141() {
60 60
        * temperatures need to be set below mintemp. Order of M140, M104, and M141
61 61
        * at the end of the print does not matter.
62 62
        */
63
-      thermalManager.check_timer_autostart(false, true);
63
+      thermalManager.auto_job_check_timer(false, true);
64 64
     #endif
65 65
   }
66 66
 }
@@ -75,7 +75,7 @@ void GcodeSuite::M191() {
75 75
   const bool no_wait_for_cooling = parser.seenval('S');
76 76
   if (no_wait_for_cooling || parser.seenval('R')) {
77 77
     thermalManager.setTargetChamber(parser.value_celsius());
78
-    TERN_(PRINTJOB_TIMER_AUTOSTART, thermalManager.check_timer_autostart(true, false));
78
+    TERN_(PRINTJOB_TIMER_AUTOSTART, thermalManager.auto_job_check_timer(true, false));
79 79
   }
80 80
   else return;
81 81
 

+ 3
- 3
Marlin/src/module/temperature.cpp View File

@@ -2154,7 +2154,7 @@ void Temperature::disable_all_heaters() {
2154 2154
 
2155 2155
 #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
2156 2156
 
2157
-  bool Temperature::over_autostart_threshold() {
2157
+  bool Temperature::auto_job_over_threshold() {
2158 2158
     #if HAS_HOTEND
2159 2159
       HOTEND_LOOP() if (degTargetHotend(e) > (EXTRUDE_MINTEMP) / 2) return true;
2160 2160
     #endif
@@ -2162,8 +2162,8 @@ void Temperature::disable_all_heaters() {
2162 2162
         || TERN0(HAS_HEATED_CHAMBER, degTargetChamber() > CHAMBER_MINTEMP);
2163 2163
   }
2164 2164
 
2165
-  void Temperature::check_timer_autostart(const bool can_start, const bool can_stop) {
2166
-    if (over_autostart_threshold()) {
2165
+  void Temperature::auto_job_check_timer(const bool can_start, const bool can_stop) {
2166
+    if (auto_job_over_threshold()) {
2167 2167
       if (can_start) startOrResumeJob();
2168 2168
     }
2169 2169
     else if (can_stop) {

+ 2
- 2
Marlin/src/module/temperature.h View File

@@ -731,8 +731,8 @@ class Temperature {
731 731
       /**
732 732
        * Methods to check if heaters are enabled, indicating an active job
733 733
        */
734
-      static bool over_autostart_threshold();
735
-      static void check_timer_autostart(const bool can_start, const bool can_stop);
734
+      static bool auto_job_over_threshold();
735
+      static void auto_job_check_timer(const bool can_start, const bool can_stop);
736 736
     #endif
737 737
 
738 738
     /**

Loading…
Cancel
Save