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

Merge pull request #3648 from wavexx/more_cleanups 

cleanup: Expand tabs to fixup suspicious indentation warnings
This commit is contained in:
3d-gussner 2022-10-03 11:53:42 +02:00 committed by GitHub
parent 57c4716b8f 4cc6695195
commit 992845198d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Firmware/Marlin_main.cpp
View File

@ -11346,11 +11346,11 @@ void restore_print_from_ram_and_continue(float e_move)
// restore bed temperature (bed can be disabled during a thermal warning)
if (degBed() != saved_bed_temperature)
setTargetBed(saved_bed_temperature);
fanSpeed = saved_fan_speed;
restore_extruder_temperature_from_ram();
axis_relative_modes ^= (-saved_extruder_relative_mode ^ axis_relative_modes) & E_AXIS_MASK;
float e = saved_pos[E_AXIS] - e_move;
plan_set_e_position(e);
fanSpeed = saved_fan_speed;
restore_extruder_temperature_from_ram();
axis_relative_modes ^= (-saved_extruder_relative_mode ^ axis_relative_modes) & E_AXIS_MASK;
float e = saved_pos[E_AXIS] - e_move;
plan_set_e_position(e);
#ifdef FANCHECK
fans_check_enabled = false;

8
Firmware/ultralcd.cpp
View File

@ -7525,12 +7525,12 @@ static void lcd_updatestatus(const char *message, bool progmem = false)
else
strncpy(lcd_status_message, message, LCD_WIDTH);
lcd_status_message[LCD_WIDTH] = 0;
lcd_status_message[LCD_WIDTH] = 0;
SERIAL_PROTOCOLLNRPGM(MSG_LCD_STATUS_CHANGED);
SERIAL_PROTOCOLLNRPGM(MSG_LCD_STATUS_CHANGED);
// hack lcd_draw_update to 1, i.e. without clear
lcd_draw_update = 1;
// hack lcd_draw_update to 1, i.e. without clear
lcd_draw_update = 1;
}
void lcd_setstatus(const char* message)