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

power panic: re-use saved_extruder_relative_mode 

Change in memory:
Flash: +8 bytes
SRAM: 0 bytes
This commit is contained in:
Guðni Már Gilbert 2023-07-01 11:52:23 +00:00 committed by DRracer
parent a2ac513794
commit 97c27525d4
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Firmware/Marlin.h
View File

@ -305,6 +305,7 @@ extern uint8_t saved_printing_type;
extern uint16_t saved_extruder_temperature; //!< Active extruder temperature extern uint16_t saved_extruder_temperature; //!< Active extruder temperature
extern uint8_t saved_bed_temperature; //!< Bed temperature extern uint8_t saved_bed_temperature; //!< Bed temperature
extern bool saved_extruder_relative_mode;
extern uint8_t saved_fan_speed; //!< Print fan speed, ranges from 0 to 255 extern uint8_t saved_fan_speed; //!< Print fan speed, ranges from 0 to 255
extern uint16_t saved_feedrate2; extern uint16_t saved_feedrate2;

2
Firmware/Marlin_main.cpp
View File

@ -316,7 +316,7 @@ uint16_t saved_feedrate2 = 0; //!< Default feedrate (truncated from float)
static int saved_feedmultiply2 = 0; static int saved_feedmultiply2 = 0;
uint16_t saved_extruder_temperature; //!< Active extruder temperature uint16_t saved_extruder_temperature; //!< Active extruder temperature
uint8_t saved_bed_temperature; //!< Bed temperature uint8_t saved_bed_temperature; //!< Bed temperature
static bool saved_extruder_relative_mode = false; bool saved_extruder_relative_mode;
uint8_t saved_fan_speed = 0; //!< Print fan speed uint8_t saved_fan_speed = 0; //!< Print fan speed
//! @} //! @}

5
Firmware/power_panic.cpp
View File

@ -64,13 +64,14 @@ void uvlo_() {
tmc2130_set_current_r(E_AXIS, 20); tmc2130_set_current_r(E_AXIS, 20);
#endif //TMC2130 #endif //TMC2130
// Stop all heaters
if (!sd_print_saved_in_ram) if (!sd_print_saved_in_ram)
{ {
saved_bed_temperature = target_temperature_bed; saved_bed_temperature = target_temperature_bed;
saved_extruder_temperature = target_temperature[active_extruder]; saved_extruder_temperature = target_temperature[active_extruder];
saved_extruder_relative_mode = axis_relative_modes & E_AXIS_MASK;
} }
// Stop all heaters
setTargetHotend(0); setTargetHotend(0);
setTargetBed(0); setTargetBed(0);
@ -99,7 +100,7 @@ void uvlo_() {
// Store the print E position before we lose track // Store the print E position before we lose track
eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E), current_position[E_AXIS]); eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E), current_position[E_AXIS]);
eeprom_update_byte((uint8_t*)EEPROM_UVLO_E_ABS, (axis_relative_modes & E_AXIS_MASK)?0:1); eeprom_update_byte((uint8_t*)EEPROM_UVLO_E_ABS, !saved_extruder_relative_mode);
// Clean the input command queue, inhibit serial processing using saved_printing // Clean the input command queue, inhibit serial processing using saved_printing
cmdqueue_reset(); cmdqueue_reset();