Skip to content

Commit

Permalink
Merge pull request MarlinFirmware#3648 from wavexx/more_cleanups
Browse files Browse the repository at this point in the history
cleanup: Expand tabs to fixup suspicious indentation warnings
  • Loading branch information
3d-gussner authored Oct 3, 2022
2 parents 57c4716 + 4cc6695 commit 9928451
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions Firmware/Marlin_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions Firmware/ultralcd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 9928451

Please sign in to comment.