瀏覽代碼

Clean trailing whitespace

Scott Lahteine 6 年之前
父節點
當前提交
e05e95cf97

+ 3
- 3
Marlin/src/feature/Max7219_Debug_LEDs.h 查看文件

35
  * support functions available to control the LEDs in the 8x8 grid.
35
  * support functions available to control the LEDs in the 8x8 grid.
36
  *
36
  *
37
  * If you are using the Max7219 matrix for firmware debug purposes in time sensitive
37
  * If you are using the Max7219 matrix for firmware debug purposes in time sensitive
38
- * areas of the code, please be aware that the orientation (rotation) of the display can 
38
+ * areas of the code, please be aware that the orientation (rotation) of the display can
39
  * affect the speed.   The Max7219 can update a single column fairly fast.  It is much
39
  * affect the speed.   The Max7219 can update a single column fairly fast.  It is much
40
  * faster to do a Max7219_Set_Column() with a rotation of 90 or 270 degrees than to do
40
  * faster to do a Max7219_Set_Column() with a rotation of 90 or 270 degrees than to do
41
  * a Max7219_Set_Row().    The opposite is true for rotations of 0 or 180 degrees.
41
  * a Max7219_Set_Row().    The opposite is true for rotations of 0 or 180 degrees.
107
   #define MAX7219_Y_LEDS          8
107
   #define MAX7219_Y_LEDS          8
108
   #define MAX7219_X_LEDS          (MAX7219_Y_LEDS * (MAX7219_NUMBER_UNITS))
108
   #define MAX7219_X_LEDS          (MAX7219_Y_LEDS * (MAX7219_NUMBER_UNITS))
109
   #define XOR_7219(x, y)          LEDs[(x & 0xF8) + y] ^= _BV(7 - (x & 0x07))
109
   #define XOR_7219(x, y)          LEDs[(x & 0xF8) + y] ^= _BV(7 - (x & 0x07))
110
-  #define SET_PIXEL_7219(x, y)    LEDs[(x & 0xF8) + y] |= _BV(7 - (x & 0x07)) 
110
+  #define SET_PIXEL_7219(x, y)    LEDs[(x & 0xF8) + y] |= _BV(7 - (x & 0x07))
111
   #define CLEAR_PIXEL_7219(x, y)  LEDs[(x & 0xF8) + y] &= (_BV(7 - (x & 0x07)) ^ 0xFF)
111
   #define CLEAR_PIXEL_7219(x, y)  LEDs[(x & 0xF8) + y] &= (_BV(7 - (x & 0x07)) ^ 0xFF)
112
   #define BIT_7219(x, y)          TEST(LEDs[(x & 0xF8) + y], 7 - (x & 0x07))
112
   #define BIT_7219(x, y)          TEST(LEDs[(x & 0xF8) + y], 7 - (x & 0x07))
113
   #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);
113
   #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
   #define MAX7219_Y_LEDS          8
125
   #define MAX7219_Y_LEDS          8
126
   #define MAX7219_X_LEDS          (MAX7219_Y_LEDS * (MAX7219_NUMBER_UNITS))
126
   #define MAX7219_X_LEDS          (MAX7219_Y_LEDS * (MAX7219_NUMBER_UNITS))
127
   #define XOR_7219(x, y)          LEDs[y + (MAX7219_X_LEDS - 1 - (x)) & 0xF8] ^= _BV((x & 0x07))
127
   #define XOR_7219(x, y)          LEDs[y + (MAX7219_X_LEDS - 1 - (x)) & 0xF8] ^= _BV((x & 0x07))
128
-  #define SET_PIXEL_7219(x, y)    LEDs[y + (MAX7219_X_LEDS - 1 - (x)) & 0xF8] |= _BV((x & 0x07)) 
128
+  #define SET_PIXEL_7219(x, y)    LEDs[y + (MAX7219_X_LEDS - 1 - (x)) & 0xF8] |= _BV((x & 0x07))
129
   #define CLEAR_PIXEL_7219(x, y)  LEDs[y + (MAX7219_X_LEDS - 1 - (x)) & 0xF8] &= (_BV((x & 0x07)) ^ 0xFF)
129
   #define CLEAR_PIXEL_7219(x, y)  LEDs[y + (MAX7219_X_LEDS - 1 - (x)) & 0xF8] &= (_BV((x & 0x07)) ^ 0xFF)
130
   #define BIT_7219(x, y)          TEST(LEDs[y + (MAX7219_X_LEDS - 1 - (x)) & 0xF8], ((x & 0x07)))
130
   #define BIT_7219(x, y)          TEST(LEDs[y + (MAX7219_X_LEDS - 1 - (x)) & 0xF8], ((x & 0x07)))
131
   #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);
131
   #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);

+ 3
- 3
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp 查看文件

1566
             incremental_LSF(&lsf_results, PROBE_PT_3_X, PROBE_PT_3_Y, measured_z);
1566
             incremental_LSF(&lsf_results, PROBE_PT_3_X, PROBE_PT_3_Y, measured_z);
1567
           }
1567
           }
1568
         }
1568
         }
1569
-        
1569
+
1570
         STOW_PROBE();
1570
         STOW_PROBE();
1571
         #ifdef Z_AFTER_PROBING
1571
         #ifdef Z_AFTER_PROBING
1572
           move_z_after_probing();
1572
           move_z_after_probing();
1573
         #endif
1573
         #endif
1574
-        
1574
+
1575
         if (abort_flag) {
1575
         if (abort_flag) {
1576
           SERIAL_ECHOPGM("?Error probing point.  Aborting operation.\n");
1576
           SERIAL_ECHOPGM("?Error probing point.  Aborting operation.\n");
1577
           return;
1577
           return;
1632
       #ifdef Z_AFTER_PROBING
1632
       #ifdef Z_AFTER_PROBING
1633
         move_z_after_probing();
1633
         move_z_after_probing();
1634
       #endif
1634
       #endif
1635
-      
1635
+
1636
       if (abort_flag || finish_incremental_LSF(&lsf_results)) {
1636
       if (abort_flag || finish_incremental_LSF(&lsf_results)) {
1637
         SERIAL_ECHOPGM("Could not complete LSF!");
1637
         SERIAL_ECHOPGM("Could not complete LSF!");
1638
         return;
1638
         return;

+ 2
- 2
Marlin/src/gcode/bedlevel/abl/G29.cpp 查看文件

66
   #define G29_RETURN(b) return b;
66
   #define G29_RETURN(b) return b;
67
 #else
67
 #else
68
   #define G29_RETURN(b) return;
68
   #define G29_RETURN(b) return;
69
-#endif 
69
+#endif
70
 
70
 
71
 /**
71
 /**
72
  * G29: Detailed Z probe, probes the bed at 3 or more points.
72
  * G29: Detailed Z probe, probes the bed at 3 or more points.
996
   #endif
996
   #endif
997
 
997
 
998
   report_current_position();
998
   report_current_position();
999
-  
999
+
1000
   G29_RETURN(isnan(measured_z));
1000
   G29_RETURN(isnan(measured_z));
1001
 }
1001
 }
1002
 
1002
 

+ 2
- 2
Marlin/src/gcode/feature/leds/M7219.cpp 查看文件

29
 
29
 
30
 /**
30
 /**
31
  * M7219: Control the Max7219 LED matrix
31
  * M7219: Control the Max7219 LED matrix
32
- * 
32
+ *
33
  *  I         - Initialize (clear) the matrix
33
  *  I         - Initialize (clear) the matrix
34
  *  F         - Fill the matrix (set all bits)
34
  *  F         - Fill the matrix (set all bits)
35
  *  P         - Dump the LEDs[] array values
35
  *  P         - Dump the LEDs[] array values
38
  *  X<pos>    - X position of an LED to set or toggle
38
  *  X<pos>    - X position of an LED to set or toggle
39
  *  Y<pos>    - Y position of an LED to set or toggle
39
  *  Y<pos>    - Y position of an LED to set or toggle
40
  *  V<value>  - The potentially 32-bit value or on/off state to set
40
  *  V<value>  - The potentially 32-bit value or on/off state to set
41
- *              (for example: a chain of 4 Max7219 devices can have 32 bit 
41
+ *              (for example: a chain of 4 Max7219 devices can have 32 bit
42
  *               rows or columns depending upon rotation)
42
  *               rows or columns depending upon rotation)
43
  */
43
  */
44
 void GcodeSuite::M7219() {
44
 void GcodeSuite::M7219() {

+ 2
- 2
Marlin/src/gcode/gcode.cpp 查看文件

134
   #ifndef G29_MAX_RETRIES
134
   #ifndef G29_MAX_RETRIES
135
     #define G29_MAX_RETRIES 0
135
     #define G29_MAX_RETRIES 0
136
   #endif
136
   #endif
137
-   
137
+
138
   void GcodeSuite::G29_with_retry() {
138
   void GcodeSuite::G29_with_retry() {
139
     uint8_t retries = G29_MAX_RETRIES;
139
     uint8_t retries = G29_MAX_RETRIES;
140
     while (G29()) { // G29 should return true for failed probes ONLY
140
     while (G29()) { // G29 should return true for failed probes ONLY
144
         #endif
144
         #endif
145
         #ifdef G29_RECOVER_COMMANDS
145
         #ifdef G29_RECOVER_COMMANDS
146
           process_subcommands_now_P(PSTR(G29_RECOVER_COMMANDS));
146
           process_subcommands_now_P(PSTR(G29_RECOVER_COMMANDS));
147
-        #endif   
147
+        #endif
148
       }
148
       }
149
       else {
149
       else {
150
         #ifdef G29_FAILURE_COMMANDS
150
         #ifdef G29_FAILURE_COMMANDS

Loading…
取消
儲存