SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Clean trailing whitespace

Browse source
This commit is contained in:
Scott Lahteine 2018-07-25 18:49:32 -05:00
parent 9c2bfa2ab3
commit e05e95cf97
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Marlin/src/feature/Max7219_Debug_LEDs.h
View file

@ -35,7 +35,7 @@
* support functions available to control the LEDs in the 8x8 grid. * 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 * 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 * 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 * 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. * 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_Y_LEDS 8
#define MAX7219_X_LEDS (MAX7219_Y_LEDS * (MAX7219_NUMBER_UNITS)) #define MAX7219_X_LEDS (MAX7219_Y_LEDS * (MAX7219_NUMBER_UNITS))
#define XOR_7219(x, y) LEDs[(x & 0xF8) + y] ^= _BV(7 - (x & 0x07)) #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 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 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); #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_Y_LEDS 8
#define MAX7219_X_LEDS (MAX7219_Y_LEDS * (MAX7219_NUMBER_UNITS)) #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 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 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 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); #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);

6
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View file

@ -1566,12 +1566,12 @@
incremental_LSF(&lsf_results, PROBE_PT_3_X, PROBE_PT_3_Y, measured_z); incremental_LSF(&lsf_results, PROBE_PT_3_X, PROBE_PT_3_Y, measured_z);
} }
} }
STOW_PROBE(); STOW_PROBE();
#ifdef Z_AFTER_PROBING #ifdef Z_AFTER_PROBING
move_z_after_probing(); move_z_after_probing();
#endif #endif
if (abort_flag) { if (abort_flag) {
SERIAL_ECHOPGM("?Error probing point. Aborting operation.\n"); SERIAL_ECHOPGM("?Error probing point. Aborting operation.\n");
return; return;
@ -1632,7 +1632,7 @@
#ifdef Z_AFTER_PROBING #ifdef Z_AFTER_PROBING
move_z_after_probing(); move_z_after_probing();
#endif #endif
if (abort_flag || finish_incremental_LSF(&lsf_results)) { if (abort_flag || finish_incremental_LSF(&lsf_results)) {
SERIAL_ECHOPGM("Could not complete LSF!"); SERIAL_ECHOPGM("Could not complete LSF!");
return; return;

4
Marlin/src/gcode/bedlevel/abl/G29.cpp
View file

@ -66,7 +66,7 @@
#define G29_RETURN(b) return b; #define G29_RETURN(b) return b;
#else #else
#define G29_RETURN(b) return; #define G29_RETURN(b) return;
#endif #endif
/** /**
* G29: Detailed Z probe, probes the bed at 3 or more points. * G29: Detailed Z probe, probes the bed at 3 or more points.
@ -996,7 +996,7 @@ G29_TYPE GcodeSuite::G29() {
#endif #endif
report_current_position(); report_current_position();
G29_RETURN(isnan(measured_z)); G29_RETURN(isnan(measured_z));
} }

4
Marlin/src/gcode/feature/leds/M7219.cpp
View file

@ -29,7 +29,7 @@
/** /**
* M7219: Control the Max7219 LED matrix * M7219: Control the Max7219 LED matrix
* *
* I - Initialize (clear) the matrix * I - Initialize (clear) the matrix
* F - Fill the matrix (set all bits) * F - Fill the matrix (set all bits)
* P - Dump the LEDs[] array values * P - Dump the LEDs[] array values
@ -38,7 +38,7 @@
* X<pos> - X position of an LED to set or toggle * X<pos> - X position of an LED to set or toggle
* Y<pos> - Y position of an LED to set or toggle * Y<pos> - Y position of an LED to set or toggle
* V<value> - The potentially 32-bit value or on/off state to set * V<value> - 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) * rows or columns depending upon rotation)
*/ */
void GcodeSuite::M7219() { void GcodeSuite::M7219() {

4
Marlin/src/gcode/gcode.cpp
View file

@ -134,7 +134,7 @@ void GcodeSuite::dwell(millis_t time) {
#ifndef G29_MAX_RETRIES #ifndef G29_MAX_RETRIES
#define G29_MAX_RETRIES 0 #define G29_MAX_RETRIES 0
#endif #endif
void GcodeSuite::G29_with_retry() { void GcodeSuite::G29_with_retry() {
uint8_t retries = G29_MAX_RETRIES; uint8_t retries = G29_MAX_RETRIES;
while (G29()) { // G29 should return true for failed probes ONLY while (G29()) { // G29 should return true for failed probes ONLY
@ -144,7 +144,7 @@ void GcodeSuite::dwell(millis_t time) {
#endif #endif
#ifdef G29_RECOVER_COMMANDS #ifdef G29_RECOVER_COMMANDS
process_subcommands_now_P(PSTR(G29_RECOVER_COMMANDS)); process_subcommands_now_P(PSTR(G29_RECOVER_COMMANDS));
#endif #endif
} }
else { else {
#ifdef G29_FAILURE_COMMANDS #ifdef G29_FAILURE_COMMANDS