Преглед на файлове

Clean up trailing spaces

Scott Lahteine преди 7 години
родител
ревизия
ada90f7335

+ 13
- 13
Marlin/src/HAL/HAL_LPC1768/HardwareSerial.cpp Целия файл

@@ -102,7 +102,7 @@ void HardwareSerial::begin(uint32_t baudrate) {
102 102
 
103 103
 	// Initialize eripheral with given to corresponding parameter
104 104
   UART_Init(UARTx, &UARTConfigStruct);
105
-  
105
+
106 106
   // Enable and reset the TX and RX FIFOs
107 107
   UART_FIFOConfigStructInit(&FIFOConfig);
108 108
   UART_FIFOConfig(UARTx, &FIFOConfig);
@@ -113,7 +113,7 @@ void HardwareSerial::begin(uint32_t baudrate) {
113 113
   // Configure Interrupts
114 114
   UART_IntConfig(UARTx, UART_INTCFG_RBR, ENABLE);
115 115
   UART_IntConfig(UARTx, UART_INTCFG_RLS, ENABLE);
116
-  
116
+
117 117
   if (UARTx == LPC_UART0)
118 118
     NVIC_EnableIRQ(UART0_IRQn);
119 119
   else if ((LPC_UART1_TypeDef *) UARTx == LPC_UART1)
@@ -135,13 +135,13 @@ int HardwareSerial::peek() {
135 135
   /* Temporarily lock out UART receive interrupts during this read so the UART receive
136 136
      interrupt won't cause problems with the index values */
137 137
   UART_IntConfig(UARTx, UART_INTCFG_RBR, DISABLE);
138
-  
138
+
139 139
   if (RxQueueReadPos != RxQueueWritePos)
140 140
     byte = RxBuffer[RxQueueReadPos];
141 141
 
142 142
   /* Re-enable UART interrupts */
143 143
   UART_IntConfig(UARTx, UART_INTCFG_RBR, ENABLE);
144
-  
144
+
145 145
   return byte;
146 146
 }
147 147
 
@@ -151,7 +151,7 @@ int HardwareSerial::read() {
151 151
   /* Temporarily lock out UART receive interrupts during this read so the UART receive
152 152
      interrupt won't cause problems with the index values */
153 153
   UART_IntConfig(UARTx, UART_INTCFG_RBR, DISABLE);
154
-  
154
+
155 155
   if (RxQueueReadPos != RxQueueWritePos) {
156 156
     byte = RxBuffer[RxQueueReadPos];
157 157
     RxQueueReadPos = (RxQueueReadPos + 1) % RX_BUFFER_SIZE;
@@ -159,7 +159,7 @@ int HardwareSerial::read() {
159 159
 
160 160
   /* Re-enable UART interrupts */
161 161
   UART_IntConfig(UARTx, UART_INTCFG_RBR, ENABLE);
162
-  
162
+
163 163
   return byte;
164 164
 }
165 165
 
@@ -170,7 +170,7 @@ size_t HardwareSerial::write(uint8_t send) {
170 170
 
171 171
     /* If the Tx Buffer is full, wait for space to clear */
172 172
     if ((TxQueueWritePos+1) % TX_BUFFER_SIZE == TxQueueReadPos) flushTX();
173
-  
173
+
174 174
     /* Temporarily lock out UART transmit interrupts during this read so the UART transmit interrupt won't
175 175
        cause problems with the index values */
176 176
     UART_IntConfig(UARTx, UART_INTCFG_THRE, DISABLE);
@@ -180,7 +180,7 @@ size_t HardwareSerial::write(uint8_t send) {
180 180
       fifolvl = *(reinterpret_cast<volatile uint32_t *>(&((LPC_UART1_TypeDef *) UARTx)->FIFOLVL));
181 181
     else
182 182
       fifolvl = *(reinterpret_cast<volatile uint32_t *>(&UARTx->FIFOLVL));
183
-  
183
+
184 184
     /* If the queue is empty and there's space in the FIFO, immediately send the byte */
185 185
     if (TxQueueWritePos == TxQueueReadPos && fifolvl < UART_TX_FIFO_SIZE) {
186 186
       bytes = UART_Send(UARTx, &send, 1, BLOCKING);
@@ -191,10 +191,10 @@ size_t HardwareSerial::write(uint8_t send) {
191 191
       TxQueueWritePos = (TxQueueWritePos+1) % TX_BUFFER_SIZE;
192 192
       bytes++;
193 193
     }
194
-  
194
+
195 195
     /* Re-enable the TX Interrupt */
196 196
     UART_IntConfig(UARTx, UART_INTCFG_THRE, ENABLE);
197
-  
197
+
198 198
     return bytes;
199 199
   #else
200 200
     return UART_Send(UARTx, &send, 1, BLOCKING);
@@ -251,7 +251,7 @@ void HardwareSerial::IRQHandler() {
251 251
       return;
252 252
     }
253 253
   }
254
-  
254
+
255 255
   if ( IIRValue == UART_IIR_INTID_RDA )	/* Receive Data Available */
256 256
   {
257 257
     /* Clear the FIFO */
@@ -278,7 +278,7 @@ void HardwareSerial::IRQHandler() {
278 278
 
279 279
       /* Wait for FIFO buffer empty */
280 280
       while (UART_CheckBusy(UARTx) == SET);
281
-    
281
+
282 282
       /* Transfer up to UART_TX_FIFO_SIZE bytes of data */
283 283
       for (int i = 0; i < UART_TX_FIFO_SIZE && TxQueueWritePos != TxQueueReadPos; i++) {
284 284
         /* Move a piece of data into the transmit FIFO */
@@ -287,7 +287,7 @@ void HardwareSerial::IRQHandler() {
287 287
         else
288 288
           break;
289 289
       }
290
-    
290
+
291 291
       /* If there is no more data to send, disable the transmit interrupt - else enable it or keep it enabled */
292 292
       if (TxQueueWritePos == TxQueueReadPos)
293 293
         UART_IntConfig(UARTx, UART_INTCFG_THRE, DISABLE);

+ 2
- 2
Marlin/src/HAL/HAL_LPC1768/pinmapping.h Целия файл

@@ -163,7 +163,7 @@ constexpr bool INTERRUPT_PIN(const pin_t p) {
163 163
   #define NUM_ANALOG_INPUTS 8
164 164
 #endif
165 165
 
166
-constexpr pin_t adc_pin_table[] = { 
166
+constexpr pin_t adc_pin_table[] = {
167 167
   P0_23, P0_24, P0_25, P0_26, P1_30, P1_31,
168 168
   #if SERIAL_PORT != 0
169 169
     P0_3, P0_2
@@ -214,5 +214,5 @@ const pin_t pin_map[] = {
214 214
 
215 215
 int16_t GET_PIN_MAP_INDEX(pin_t pin);
216 216
 int16_t PARSED_PIN_INDEX(char code, int16_t dval = 0);
217
-                           
217
+
218 218
 #endif // __HAL_PINMAPPING_H__

+ 9
- 10
Marlin/src/feature/Max7219_Debug_LEDs.cpp Целия файл

@@ -329,23 +329,22 @@ void Max7219_idle_tasks() {
329 329
 
330 330
   #if ENABLED(MAX7219_DEBUG_PRINTER_ALIVE)
331 331
     static millis_t next_blink = 0;
332
-
333 332
     if (ELAPSED(millis(), next_blink)) {
334
-        Max7219_LED_Toggle(7, 7);
335
-        next_blink = millis() + 750;
333
+      Max7219_LED_Toggle(7, 7);
334
+      next_blink = millis() + 750;
336 335
     }
337 336
   #endif
338 337
 
339 338
   #ifdef MAX7219_DEBUG_STEPPER_HEAD
340 339
     static int16_t last_head_cnt=0;
341 340
     if (last_head_cnt != head) {
342
-      if ( last_head_cnt < 8)
341
+      if (last_head_cnt < 8)
343 342
         Max7219_LED_Off( last_head_cnt, MAX7219_DEBUG_STEPPER_HEAD);
344 343
       else
345 344
         Max7219_LED_Off( last_head_cnt-8, MAX7219_DEBUG_STEPPER_HEAD+1);
346 345
 
347 346
       last_head_cnt = head;
348
-      if ( head < 8)
347
+      if (head < 8)
349 348
         Max7219_LED_On(head, MAX7219_DEBUG_STEPPER_HEAD);
350 349
       else
351 350
         Max7219_LED_On(head-8, MAX7219_DEBUG_STEPPER_HEAD+1);
@@ -355,13 +354,13 @@ void Max7219_idle_tasks() {
355 354
   #ifdef MAX7219_DEBUG_STEPPER_TAIL
356 355
     static int16_t last_tail_cnt=0;
357 356
     if (last_tail_cnt != tail) {
358
-      if ( last_tail_cnt < 8)
357
+      if (last_tail_cnt < 8)
359 358
         Max7219_LED_Off( last_tail_cnt, MAX7219_DEBUG_STEPPER_TAIL);
360 359
       else
361 360
         Max7219_LED_Off( last_tail_cnt-8, MAX7219_DEBUG_STEPPER_TAIL+1);
362 361
 
363 362
       last_tail_cnt = tail;
364
-      if ( tail < 8)
363
+      if (tail < 8)
365 364
         Max7219_LED_On(tail, MAX7219_DEBUG_STEPPER_TAIL);
366 365
       else
367 366
         Max7219_LED_On(tail-8, MAX7219_DEBUG_STEPPER_TAIL+1);
@@ -381,10 +380,10 @@ void Max7219_idle_tasks() {
381 380
                     en = max(current_depth, last_depth);
382 381
       if (current_depth < last_depth)
383 382
         for (uint8_t i = st; i <= en; i++)   // clear the highest order LEDs
384
-            Max7219_LED_Off(i/2, MAX7219_DEBUG_STEPPER_QUEUE + (i & 1));
383
+          Max7219_LED_Off(i/2, MAX7219_DEBUG_STEPPER_QUEUE + (i & 1));
385 384
       else
386
-          for (uint8_t i = st; i <= en; i++)   // set the LEDs to current depth
387
-            Max7219_LED_On(i/2, MAX7219_DEBUG_STEPPER_QUEUE + (i & 1));
385
+        for (uint8_t i = st; i <= en; i++)   // set the LEDs to current depth
386
+          Max7219_LED_On(i/2, MAX7219_DEBUG_STEPPER_QUEUE + (i & 1));
388 387
 
389 388
       last_depth = current_depth;
390 389
     }

+ 4
- 4
Marlin/src/lcd/ultralcd.cpp Целия файл

@@ -3749,9 +3749,9 @@ void kill_screen(const char* lcd_msg) {
3749 3749
 
3750 3750
     void lcd_sdcard_menu() {
3751 3751
       ENCODER_DIRECTION_MENUS();
3752
-  
3752
+
3753 3753
       #if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
3754
-        if (ELAPSED(millis(), assume_print_finished)) { // if the printer has been busy printing, lcd_sdcard_menu() should not 
3754
+        if (ELAPSED(millis(), assume_print_finished)) { // if the printer has been busy printing, lcd_sdcard_menu() should not
3755 3755
           lcdDrawUpdate = LCDVIEW_REDRAW_NOW;           // have been active for 5 seconds.  In this case, restore the previous
3756 3756
           encoderPosition = saved_encoderPosition;      // encoderPosition to the last selected item.
3757 3757
           assume_print_finished = millis() + 5000;
@@ -3759,7 +3759,7 @@ void kill_screen(const char* lcd_msg) {
3759 3759
         saved_encoderPosition = encoderPosition;
3760 3760
         defer_return_to_status = true;
3761 3761
       #endif
3762
-      
3762
+
3763 3763
       const uint16_t fileCnt = card.getnrfilenames();
3764 3764
       START_MENU();
3765 3765
       MENU_BACK(MSG_MAIN);
@@ -4780,7 +4780,7 @@ void lcd_update() {
4780 4780
       if (currentScreen == lcd_status_screen || defer_return_to_status)
4781 4781
         #if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
4782 4782
           if (currentScreen != lcd_sdcard_menu)                // lcd_sdcard_menu() does not time out if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
4783
-            return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS;  // When the printer finishes a file, it will wait with the file selected for 
4783
+            return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS;  // When the printer finishes a file, it will wait with the file selected for
4784 4784
         #else                                                  // a re-print.
4785 4785
         return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS;
4786 4786
         #endif

+ 1
- 1
Marlin/src/pins/pins_AZSMZ_MINI.h Целия файл

@@ -39,7 +39,7 @@
39 39
 // Servos
40 40
 //
41 41
 #define SERVO0_PIN         53
42
-    
42
+
43 43
 //
44 44
 // Limit Switches
45 45
 //

Loading…
Отказ
Запис