josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4173 from gudnimg/disable-heaters-gudni 

optimisation: use `disable_heater()` in more places
This commit is contained in:
3d-gussner 2023-11-20 07:01:05 +01:00 committed by GitHub
parent b39b83ecbf 6187b7eecf
commit 9fd478c9c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Firmware/Marlin_main.cpp
View File

@ -3112,8 +3112,7 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level)
// Only Z calibration? // Only Z calibration?
if (!onlyZ) if (!onlyZ)
{ {
setTargetBed(0); disable_heater();
setTargetHotend(0);
eeprom_adjust_bed_reset(); //reset bed level correction eeprom_adjust_bed_reset(); //reset bed level correction
} }
@ -9390,8 +9389,7 @@ static void handleSafetyTimer()
} }
else if (safetyTimer.expired(farm_mode?FARM_DEFAULT_SAFETYTIMER_TIME_ms:safetytimer_inactive_time)) else if (safetyTimer.expired(farm_mode?FARM_DEFAULT_SAFETYTIMER_TIME_ms:safetytimer_inactive_time))
{ {
setTargetBed(0); disable_heater();
setTargetHotend(0);
lcd_show_fullscreen_message_and_wait_P(_i("Heating disabled by safety timer."));////MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 lcd_show_fullscreen_message_and_wait_P(_i("Heating disabled by safety timer."));////MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
} }
} }

4
Firmware/Prusa_farm.cpp
View File

@ -163,9 +163,7 @@ static void trace() {
} }
void serial_read_stream() { void serial_read_stream() {
disable_heater();
setTargetHotend(0);
setTargetBed(0);
lcd_clear(); lcd_clear();
lcd_puts_P(PSTR(" Upload in progress")); lcd_puts_P(PSTR(" Upload in progress"));

6
Firmware/power_panic.cpp
View File

@ -78,8 +78,7 @@ void uvlo_() {
} }
// Stop all heaters before continuing // Stop all heaters before continuing
setTargetHotend(0); disable_heater();
setTargetBed(0);
// Fetch data not included in a partial back-up // Fetch data not included in a partial back-up
if (!sd_print_saved_in_ram) { if (!sd_print_saved_in_ram) {
@ -234,8 +233,7 @@ static void uvlo_tiny() {
#endif //TMC2130 #endif //TMC2130
// Stop all heaters // Stop all heaters
setTargetHotend(0); disable_heater();
setTargetBed(0);
// When power is interrupted on the _first_ recovery an attempt can be made to raise the // When power is interrupted on the _first_ recovery an attempt can be made to raise the
// extruder, causing the Z position to change. Similarly, when recovering, the Z position is // extruder, causing the Z position to change. Similarly, when recovering, the Z position is

9
Firmware/ultralcd.cpp
View File

@ -1038,8 +1038,7 @@ static void lcd_move_menu_axis();
static void lcd_cooldown() static void lcd_cooldown()
{ {
setTargetHotend(0); disable_heater();
setTargetBed(0);
fanSpeed = 0; fanSpeed = 0;
lcd_return_to_status(); lcd_return_to_status();
} }
@ -2722,8 +2721,7 @@ void pid_extruder()
#ifdef PINDA_THERMISTOR #ifdef PINDA_THERMISTOR
bool lcd_wait_for_pinda(float temp) { bool lcd_wait_for_pinda(float temp) {
setTargetHotend(0); disable_heater();
setTargetBed(0);
LongTimer pinda_timeout; LongTimer pinda_timeout;
pinda_timeout.start(); pinda_timeout.start();
bool target_temp_reached = true; bool target_temp_reached = true;
@ -2754,8 +2752,7 @@ void lcd_wait_for_heater() {
} }
void lcd_wait_for_cool_down() { void lcd_wait_for_cool_down() {
setTargetHotend(0); disable_heater();
setTargetBed(0);
uint8_t fanSpeedBckp = fanSpeed; uint8_t fanSpeedBckp = fanSpeed;
fanSpeed = 255; fanSpeed = 255;
while ((degHotend(0)>MAX_HOTEND_TEMP_CALIBRATION) || (degBed() > MAX_BED_TEMP_CALIBRATION)) { while ((degHotend(0)>MAX_HOTEND_TEMP_CALIBRATION) || (degBed() > MAX_BED_TEMP_CALIBRATION)) {