From e05e95cf9721262d241fe313e9a4f15a779c18d9 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 25 Jul 2018 18:49:32 -0500 Subject: [PATCH] Clean trailing whitespace --- Marlin/src/feature/Max7219_Debug_LEDs.h | 6 +++--- Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp | 6 +++--- Marlin/src/gcode/bedlevel/abl/G29.cpp | 4 ++-- Marlin/src/gcode/feature/leds/M7219.cpp | 4 ++-- Marlin/src/gcode/gcode.cpp | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Marlin/src/feature/Max7219_Debug_LEDs.h b/Marlin/src/feature/Max7219_Debug_LEDs.h index 9446a45fab..e550a2906d 100644 --- a/Marlin/src/feature/Max7219_Debug_LEDs.h +++ b/Marlin/src/feature/Max7219_Debug_LEDs.h @@ -35,7 +35,7 @@ * support functions available to control the LEDs in the 8x8 grid. * * If you are using the Max7219 matrix for firmware debug purposes in time sensitive - * areas of the code, please be aware that the orientation (rotation) of the display can + * areas of the code, please be aware that the orientation (rotation) of the display can * affect the speed. The Max7219 can update a single column fairly fast. It is much * faster to do a Max7219_Set_Column() with a rotation of 90 or 270 degrees than to do * a Max7219_Set_Row(). The opposite is true for rotations of 0 or 180 degrees. @@ -107,7 +107,7 @@ void Max7219_idle_tasks(); #define MAX7219_Y_LEDS 8 #define MAX7219_X_LEDS (MAX7219_Y_LEDS * (MAX7219_NUMBER_UNITS)) #define XOR_7219(x, y) LEDs[(x & 0xF8) + y] ^= _BV(7 - (x & 0x07)) - #define SET_PIXEL_7219(x, y) LEDs[(x & 0xF8) + y] |= _BV(7 - (x & 0x07)) + #define SET_PIXEL_7219(x, y) LEDs[(x & 0xF8) + y] |= _BV(7 - (x & 0x07)) #define CLEAR_PIXEL_7219(x, y) LEDs[(x & 0xF8) + y] &= (_BV(7 - (x & 0x07)) ^ 0xFF) #define BIT_7219(x, y) TEST(LEDs[(x & 0xF8) + y], 7 - (x & 0x07)) #define SEND_7219(R) do {for(int8_t jj = 0; jj < MAX7219_NUMBER_UNITS; jj++) Max7219(max7219_reg_digit0 + (R & 0x7), LEDs[(R & 0x7) + jj * 8]); Max7219_pulse_load(); } while (0); @@ -125,7 +125,7 @@ void Max7219_idle_tasks(); #define MAX7219_Y_LEDS 8 #define MAX7219_X_LEDS (MAX7219_Y_LEDS * (MAX7219_NUMBER_UNITS)) #define XOR_7219(x, y) LEDs[y + (MAX7219_X_LEDS - 1 - (x)) & 0xF8] ^= _BV((x & 0x07)) - #define SET_PIXEL_7219(x, y) LEDs[y + (MAX7219_X_LEDS - 1 - (x)) & 0xF8] |= _BV((x & 0x07)) + #define SET_PIXEL_7219(x, y) LEDs[y + (MAX7219_X_LEDS - 1 - (x)) & 0xF8] |= _BV((x & 0x07)) #define CLEAR_PIXEL_7219(x, y) LEDs[y + (MAX7219_X_LEDS - 1 - (x)) & 0xF8] &= (_BV((x & 0x07)) ^ 0xFF) #define BIT_7219(x, y) TEST(LEDs[y + (MAX7219_X_LEDS - 1 - (x)) & 0xF8], ((x & 0x07))) #define SEND_7219(R) do {for(int8_t jj = 0; jj < MAX7219_NUMBER_UNITS; jj++) Max7219(max7219_reg_digit7 - (R & 0x7), LEDs[(R & 0x7) + jj * 8]); Max7219_pulse_load(); } while (0); diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp index 726928742d..654b4c193c 100644 --- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp +++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp @@ -1566,12 +1566,12 @@ incremental_LSF(&lsf_results, PROBE_PT_3_X, PROBE_PT_3_Y, measured_z); } } - + STOW_PROBE(); #ifdef Z_AFTER_PROBING move_z_after_probing(); #endif - + if (abort_flag) { SERIAL_ECHOPGM("?Error probing point. Aborting operation.\n"); return; @@ -1632,7 +1632,7 @@ #ifdef Z_AFTER_PROBING move_z_after_probing(); #endif - + if (abort_flag || finish_incremental_LSF(&lsf_results)) { SERIAL_ECHOPGM("Could not complete LSF!"); return; diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp index 50faafc362..c711b9deed 100644 --- a/Marlin/src/gcode/bedlevel/abl/G29.cpp +++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp @@ -66,7 +66,7 @@ #define G29_RETURN(b) return b; #else #define G29_RETURN(b) return; -#endif +#endif /** * G29: Detailed Z probe, probes the bed at 3 or more points. @@ -996,7 +996,7 @@ G29_TYPE GcodeSuite::G29() { #endif report_current_position(); - + G29_RETURN(isnan(measured_z)); } diff --git a/Marlin/src/gcode/feature/leds/M7219.cpp b/Marlin/src/gcode/feature/leds/M7219.cpp index 7c6b8de960..62edcecea6 100644 --- a/Marlin/src/gcode/feature/leds/M7219.cpp +++ b/Marlin/src/gcode/feature/leds/M7219.cpp @@ -29,7 +29,7 @@ /** * M7219: Control the Max7219 LED matrix - * + * * I - Initialize (clear) the matrix * F - Fill the matrix (set all bits) * P - Dump the LEDs[] array values @@ -38,7 +38,7 @@ * X - X position of an LED to set or toggle * Y - Y position of an LED to set or toggle * V - The potentially 32-bit value or on/off state to set - * (for example: a chain of 4 Max7219 devices can have 32 bit + * (for example: a chain of 4 Max7219 devices can have 32 bit * rows or columns depending upon rotation) */ void GcodeSuite::M7219() { diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp index c067d8e1e6..4708e4cfe9 100644 --- a/Marlin/src/gcode/gcode.cpp +++ b/Marlin/src/gcode/gcode.cpp @@ -134,7 +134,7 @@ void GcodeSuite::dwell(millis_t time) { #ifndef G29_MAX_RETRIES #define G29_MAX_RETRIES 0 #endif - + void GcodeSuite::G29_with_retry() { uint8_t retries = G29_MAX_RETRIES; while (G29()) { // G29 should return true for failed probes ONLY @@ -144,7 +144,7 @@ void GcodeSuite::dwell(millis_t time) { #endif #ifdef G29_RECOVER_COMMANDS process_subcommands_now_P(PSTR(G29_RECOVER_COMMANDS)); - #endif + #endif } else { #ifdef G29_FAILURE_COMMANDS