MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up some trailing spaces

Browse Source
This commit is contained in:
Scott Lahteine 2018-05-31 19:36:20 -05:00
parent 2b49f8ee65
commit c010b1f43f
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/planner.h
View File

@ -174,7 +174,6 @@ class Planner {
static uint16_t cleaning_buffer_counter; // A counter to disable queuing of blocks 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 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 block_buffer_planned; // Index of the optimally planned block
#if ENABLED(DISTINCT_E_FACTORS) #if ENABLED(DISTINCT_E_FACTORS)
static uint8_t last_extruder; // Respond to extruder change static uint8_t last_extruder; // Respond to extruder change
@ -789,7 +788,6 @@ class Planner {
static void recalculate_trapezoids(); static void recalculate_trapezoids();
static void recalculate(); static void recalculate();
}; };
#define PLANNER_XY_FEEDRATE() (MIN(planner.max_feedrate_mm_s[X_AXIS], planner.max_feedrate_mm_s[Y_AXIS])) #define PLANNER_XY_FEEDRATE() (MIN(planner.max_feedrate_mm_s[X_AXIS], planner.max_feedrate_mm_s[Y_AXIS]))

8
Marlin/status_screen_DOGM.h
View File

@ -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) { inline void lcd_implementation_status_message(const bool blink) {
#if ENABLED(STATUS_MESSAGE_SCROLLING) #if ENABLED(STATUS_MESSAGE_SCROLLING)
static bool last_blink = false; static bool last_blink = false;
// Get the UTF8 character count of the string // Get the UTF8 character count of the string
uint8_t slen = lcd_strlen(lcd_status_message); 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 u8g.print('.'); // Always at 1+ spaces left, draw a dot
if (--chars) { // Draw a second dot if there's space if (--chars) { // Draw a second dot if there's space
u8g.print('.'); u8g.print('.');
if (--chars) { if (--chars) // Print a second copy of the message
// Print a second copy of the message lcd_print_utf(lcd_status_message, LCD_WIDTH - (rlen + 2));
lcd_print_utf(lcd_status_message, LCD_WIDTH - (rlen+2));
}
} }
} }
if (last_blink != blink) { if (last_blink != blink) {

2
Marlin/status_screen_lite_ST7920.h
View File

@ -617,7 +617,7 @@ void ST7920_Lite_Status_Screen::draw_status_message(const char *str) {
begin_data(); begin_data();
const uint8_t lcd_len = 16; const uint8_t lcd_len = 16;
#if ENABLED(STATUS_MESSAGE_SCROLLING) #if ENABLED(STATUS_MESSAGE_SCROLLING)
uint8_t slen = lcd_strlen(str); uint8_t slen = lcd_strlen(str);
// If the string fits into the LCD, just print it and do not scroll it // If the string fits into the LCD, just print it and do not scroll it