From c010b1f43fcee0caa825d2a44eb6048c3de0e24e Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 31 May 2018 19:36:20 -0500 Subject: [PATCH] Clean up some trailing spaces --- Marlin/planner.h | 2 -- Marlin/status_screen_DOGM.h | 8 +++----- Marlin/status_screen_lite_ST7920.h | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Marlin/planner.h b/Marlin/planner.h index d0723d638..894e83a11 100644 --- a/Marlin/planner.h +++ b/Marlin/planner.h @@ -174,7 +174,6 @@ class Planner { static uint16_t cleaning_buffer_counter; // A counter to disable queuing of blocks static uint8_t delay_before_delivering, // This counter delays delivery of blocks when queue becomes empty to allow the opportunity of merging blocks block_buffer_planned; // Index of the optimally planned block - #if ENABLED(DISTINCT_E_FACTORS) static uint8_t last_extruder; // Respond to extruder change @@ -789,7 +788,6 @@ class Planner { static void recalculate_trapezoids(); static void recalculate(); - }; #define PLANNER_XY_FEEDRATE() (MIN(planner.max_feedrate_mm_s[X_AXIS], planner.max_feedrate_mm_s[Y_AXIS])) diff --git a/Marlin/status_screen_DOGM.h b/Marlin/status_screen_DOGM.h index 5faeb6e40..cc33df601 100644 --- a/Marlin/status_screen_DOGM.h +++ b/Marlin/status_screen_DOGM.h @@ -124,7 +124,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const inline void lcd_implementation_status_message(const bool blink) { #if ENABLED(STATUS_MESSAGE_SCROLLING) static bool last_blink = false; - + // Get the UTF8 character count of the string uint8_t slen = lcd_strlen(lcd_status_message); @@ -162,10 +162,8 @@ inline void lcd_implementation_status_message(const bool blink) { u8g.print('.'); // Always at 1+ spaces left, draw a dot if (--chars) { // Draw a second dot if there's space u8g.print('.'); - if (--chars) { - // Print a second copy of the message - lcd_print_utf(lcd_status_message, LCD_WIDTH - (rlen+2)); - } + if (--chars) // Print a second copy of the message + lcd_print_utf(lcd_status_message, LCD_WIDTH - (rlen + 2)); } } if (last_blink != blink) { diff --git a/Marlin/status_screen_lite_ST7920.h b/Marlin/status_screen_lite_ST7920.h index 37eabe14b..1931736c5 100644 --- a/Marlin/status_screen_lite_ST7920.h +++ b/Marlin/status_screen_lite_ST7920.h @@ -617,7 +617,7 @@ void ST7920_Lite_Status_Screen::draw_status_message(const char *str) { begin_data(); const uint8_t lcd_len = 16; #if ENABLED(STATUS_MESSAGE_SCROLLING) - + uint8_t slen = lcd_strlen(str); // If the string fits into the LCD, just print it and do not scroll it