Skip to content

Commit 8c50a40

Browse files
committed
manage_heater => task
1 parent af936f6 commit 8c50a40

File tree

11 files changed

+14
-14
lines changed

11 files changed

+14
-14
lines changed

Marlin/src/MarlinCore.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@ void idle(bool no_stepper_sleep/*=false*/) {
789789
manage_inactivity(no_stepper_sleep);
790790

791791
// Manage Heaters (and Watchdog)
792-
thermalManager.manage_heater();
792+
thermalManager.task();
793793

794794
// Max7219 heartbeat, animation, etc
795795
TERN_(MAX7219_DEBUG, max7219.idle_tasks());

Marlin/src/core/utility.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ void safe_delay(millis_t ms) {
2929
while (ms > 50) {
3030
ms -= 50;
3131
delay(50);
32-
thermalManager.manage_heater();
32+
thermalManager.task();
3333
}
3434
delay(ms);
35-
thermalManager.manage_heater(); // This keeps us safe if too many small safe_delay() calls are made
35+
thermalManager.task(); // This keeps us safe if too many small safe_delay() calls are made
3636
}
3737

3838
// A delay to provide brittle hosts time to receive bytes

Marlin/src/gcode/motion/G2_G3.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ void plan_arc(
290290

291291
for (uint16_t i = 1; i < segments; i++) { // Iterate (segments-1) times
292292

293-
thermalManager.manage_heater();
293+
thermalManager.task();
294294
const millis_t ms = millis();
295295
if (ELAPSED(ms, next_idle_ms)) {
296296
next_idle_ms = ms + 200UL;

Marlin/src/gcode/queue.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ inline bool process_line_done(uint8_t &sis, char (&buff)[MAX_CMD_SIZE], int &ind
384384
buff[ind] = '\0'; // Of course, I'm a Terminator.
385385
const bool is_empty = (ind == 0); // An empty line?
386386
if (is_empty)
387-
thermalManager.manage_heater(); // Keep sensors satisfied
387+
thermalManager.task(); // Keep sensors satisfied
388388
else
389389
ind = 0; // Start a new line
390390
return is_empty; // Inform the caller

Marlin/src/lcd/extui/ui_api.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ namespace ExtUI {
169169
}
170170

171171
void yield() {
172-
if (!flags.printer_killed) thermalManager.manage_heater();
172+
if (!flags.printer_killed) thermalManager.task();
173173
}
174174

175175
void enableHeater(const extruder_t extruder) {

Marlin/src/libs/buzzer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void Buzzer::tone(const uint16_t duration, const uint16_t frequency/*=0*/) {
4848
if (!ui.sound_on) return;
4949
while (buffer.isFull()) {
5050
tick();
51-
thermalManager.manage_heater();
51+
thermalManager.task();
5252
}
5353
tone_t tone = { duration, frequency };
5454
buffer.enqueue(tone);

Marlin/src/module/motion.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -966,7 +966,7 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
966966
next_idle_ms = ms + 200UL;
967967
return idle();
968968
}
969-
thermalManager.manage_heater(); // Returns immediately on most calls
969+
thermalManager.task(); // Returns immediately on most calls
970970
}
971971

972972
#if IS_KINEMATIC

Marlin/src/module/planner_bezier.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ void cubic_b_spline(
123123

124124
for (float t = 0; t < 1;) {
125125

126-
thermalManager.manage_heater();
126+
thermalManager.task();
127127
millis_t now = millis();
128128
if (ELAPSED(now, next_idle_ms)) {
129129
next_idle_ms = now + 200UL;

Marlin/src/module/temperature.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1837,7 +1837,7 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
18371837
* - Apply filament width to the extrusion rate (may move)
18381838
* - Update the heated bed PID output value
18391839
*/
1840-
void Temperature::manage_heater() {
1840+
void Temperature::task() {
18411841
if (marlin_state == MF_INITIALIZING) return hal.watchdog_refresh(); // If Marlin isn't started, at least reset the watchdog!
18421842

18431843
static bool no_reentry = false; // Prevent recursion
@@ -2393,7 +2393,7 @@ void Temperature::updateTemperaturesFromRawValues() {
23932393
/**
23942394
* Initialize the temperature manager
23952395
*
2396-
* The manager is implemented by periodic calls to manage_heater()
2396+
* The manager is implemented by periodic calls to task()
23972397
*
23982398
* - Init (and disable) SPI thermocouples like MAX6675 and MAX31865
23992399
* - Disable RUMBA JTAG to accommodate a thermocouple extension

Marlin/src/module/temperature.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -716,9 +716,9 @@ class Temperature {
716716
static void readings_ready();
717717

718718
/**
719-
* Call periodically to manage heaters
719+
* Call periodically to manage heaters and keep the watchdog fed
720720
*/
721-
static void manage_heater() __O2; // __O2 added to work around a compiler error
721+
static void task();
722722

723723
/**
724724
* Preheating hotends

0 commit comments

Comments
 (0)