Browse Source

Clean up trailing spaces

Scott Lahteine 4 years ago
parent
commit
aea60d9450

+ 1
- 1
Marlin/Configuration_adv.h View File

@@ -1689,7 +1689,7 @@
1689 1689
     // increasing the height the probe is raised to.
1690 1690
     // #define PTC_PROBE_RAISE 15U
1691 1691
 
1692
-    // If the probe is outside of the defined range, use linear extrapolation using the closest 
1692
+    // If the probe is outside of the defined range, use linear extrapolation using the closest
1693 1693
     // point and the PTC_LINEAR_EXTRAPOLATION'th next point. E.g. if set to 4 it will use data[0]
1694 1694
     // and data[4] to perform linear extrapolation for values below PTC_SAMPLE_START.
1695 1695
     // #define PTC_LINEAR_EXTRAPOLATION 4

+ 2
- 2
Marlin/src/HAL/STM32F1/sdio.cpp View File

@@ -102,7 +102,7 @@ bool SDIO_ReadBlock_DMA(uint32_t blockAddress, uint8_t *data) {
102 102
   }
103 103
 
104 104
   while (!SDIO_GET_FLAG(SDIO_STA_DATAEND | SDIO_STA_TRX_ERROR_FLAGS)) { /* wait */ }
105
-  
105
+
106 106
   //If there were SDIO errors, do not wait DMA.
107 107
   if (SDIO->STA & SDIO_STA_TRX_ERROR_FLAGS) {
108 108
     SDIO_CLEAR_FLAG(SDIO_ICR_CMD_FLAGS | SDIO_ICR_DATA_FLAGS);
@@ -118,7 +118,7 @@ bool SDIO_ReadBlock_DMA(uint32_t blockAddress, uint8_t *data) {
118 118
     SDIO_CLEAR_FLAG(SDIO_ICR_CMD_FLAGS | SDIO_ICR_DATA_FLAGS);
119 119
     return false;
120 120
   }
121
-  
121
+
122 122
   dma_disable(SDIO_DMA_DEV, SDIO_DMA_CHANNEL);
123 123
 
124 124
   if (SDIO->STA & SDIO_STA_RXDAVL) {

+ 1
- 1
Marlin/src/feature/spindle_laser.h View File

@@ -233,7 +233,7 @@ public:
233 233
     // Inline modes of all other functions; all enable planner inline power control
234 234
     static inline void set_inline_enabled(const bool enable) {
235 235
       if (enable)
236
-        inline_power(cpwr_to_upwr(SPEED_POWER_STARTUP)); 
236
+        inline_power(cpwr_to_upwr(SPEED_POWER_STARTUP));
237 237
       else {
238 238
         isReady = false;
239 239
         unitPower = menuPower = 0;

+ 1
- 1
Marlin/src/gcode/config/M200-M205.cpp View File

@@ -65,7 +65,7 @@
65 65
           SERIAL_ECHOLNPGM("?L value out of range (0-20).");
66 66
       }
67 67
     #endif
68
-    
68
+
69 69
     planner.calculate_volumetric_multipliers();
70 70
   }
71 71
 

+ 2
- 2
Marlin/src/lcd/menu/menu_led.cpp View File

@@ -32,7 +32,7 @@
32 32
 
33 33
 #if ENABLED(LED_CONTROL_MENU)
34 34
   #include "../../feature/leds/leds.h"
35
-  
35
+
36 36
   #if ENABLED(LED_COLOR_PRESETS)
37 37
     void menu_led_presets() {
38 38
       START_MENU();
@@ -71,7 +71,7 @@
71 71
 
72 72
 #if ENABLED(CASE_LIGHT_MENU)
73 73
   #include "../../feature/caselight.h"
74
-  
74
+
75 75
   #if DISABLED(CASE_LIGHT_NO_BRIGHTNESS)
76 76
     void menu_case_light() {
77 77
       START_MENU();

+ 2
- 2
Marlin/src/module/planner.cpp View File

@@ -2107,9 +2107,9 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
2107 2107
                             * TERN(HAS_MIXER_SYNC_CHANNEL, MIXING_STEPPERS, 1);
2108 2108
 
2109 2109
       if (cs > max_fr) NOMORE(speed_factor, max_fr / cs); //respect max feedrate on any movement (doesn't matter if E axes only or not)
2110
-      
2110
+
2111 2111
       #if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
2112
-        const feedRate_t max_vfr = volumetric_extruder_feedrate_limit[extruder] 
2112
+        const feedRate_t max_vfr = volumetric_extruder_feedrate_limit[extruder]
2113 2113
                                    * TERN(HAS_MIXER_SYNC_CHANNEL, MIXING_STEPPERS, 1);
2114 2114
 
2115 2115
         // TODO: Doesn't work properly for joined segments. Set MIN_STEPS_PER_SEGMENT 1 as workaround.

+ 1
- 1
Marlin/src/module/planner.h View File

@@ -493,7 +493,7 @@ class Planner {
493 493
 
494 494
       // Update multipliers based on new diameter measurements
495 495
       static void calculate_volumetric_multipliers();
496
-  
496
+
497 497
       #if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
498 498
         // Update pre calculated extruder feedrate limits based on volumetric values
499 499
         static void calculate_volumetric_extruder_limit(const uint8_t e);

+ 1
- 1
Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h View File

@@ -31,7 +31,7 @@
31 31
 #define BOARD_INFO_NAME "RUMBA32"
32 32
 
33 33
 #if NO_EEPROM_SELECTED
34
-  #if MB(RUMBA32_V1_0) 
34
+  #if MB(RUMBA32_V1_0)
35 35
     #define FLASH_EEPROM_EMULATION
36 36
     #define MARLIN_EEPROM_SIZE 0x1000             // 4KB
37 37
   #elif MB(RUMBA32_V1_1)

+ 19
- 19
buildroot/share/PlatformIO/variants/CHITU_F103/board.cpp View File

@@ -71,19 +71,19 @@ void boardInit(void) {
71 71
 
72 72
 extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
73 73
   /*
74
-    gpio_dev *gpio_device;      GPIO device 
74
+    gpio_dev *gpio_device;      GPIO device
75 75
     timer_dev *timer_device;    Pin's timer device, if any.
76
-    const adc_dev *adc_device;  ADC device, if any. 
77
-    uint8 gpio_bit;             Pin's GPIO port bit. 
78
-    uint8 timer_channel;        Timer channel, or 0 if none. 
79
-    uint8 adc_channel;          Pin ADC channel, or ADCx if none. 
76
+    const adc_dev *adc_device;  ADC device, if any.
77
+    uint8 gpio_bit;             Pin's GPIO port bit.
78
+    uint8 timer_channel;        Timer channel, or 0 if none.
79
+    uint8 adc_channel;          Pin ADC channel, or ADCx if none.
80 80
   */
81 81
 
82 82
   {&gpioa, &timer2, &adc1,  0, 1,    0}, /* PA0 */
83 83
   {&gpioa, &timer2, &adc1,  1, 2,    1}, /* PA1 */
84 84
   {&gpioa, &timer2, &adc1,  2, 3,    2}, /* PA2 */
85 85
   {&gpioa, &timer2, &adc1,  3, 4,    3}, /* PA3 */
86
-  {&gpioa,   NULL, &adc1,  4, 0,    4}, /* PA4 */	
86
+  {&gpioa,   NULL, &adc1,  4, 0,    4}, /* PA4 */
87 87
   {&gpioa,   NULL, &adc1,  5, 0,    5}, /* PA5 */
88 88
   {&gpioa, &timer3, &adc1,  6, 1,    6}, /* PA6 */
89 89
   {&gpioa, &timer3, &adc1,  7, 2,    7}, /* PA7 */
@@ -91,7 +91,7 @@ extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
91 91
   {&gpioa, &timer1, NULL,  9, 2, ADCx}, /* PA9 */
92 92
   {&gpioa, &timer1, NULL, 10, 3, ADCx}, /* PA10 */
93 93
   {&gpioa,   NULL, NULL, 11, 0, ADCx}, /* PA11 */
94
-  {&gpioa,   NULL, NULL, 12, 0, ADCx}, /* PA12 */	
94
+  {&gpioa,   NULL, NULL, 12, 0, ADCx}, /* PA12 */
95 95
   {&gpioa,   NULL, NULL, 13, 0, ADCx}, /* PA13 */
96 96
   {&gpioa,   NULL, NULL, 14, 0, ADCx}, /* PA14 */
97 97
   {&gpioa,   NULL, NULL, 15, 0, ADCx}, /* PA15 */
@@ -120,13 +120,13 @@ extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
120 120
   {&gpioc,   NULL, &adc1,  3, 0,   13}, /* PC3 */
121 121
   {&gpioc,   NULL, &adc1,  4, 0,   14}, /* PC4 */
122 122
   {&gpioc,   NULL, &adc1,  5, 0,   15}, /* PC5 */
123
-  {&gpioc, &timer8, NULL,  6, 1, ADCx}, /* PC6 */	
123
+  {&gpioc, &timer8, NULL,  6, 1, ADCx}, /* PC6 */
124 124
   {&gpioc, &timer8, NULL,  7, 2, ADCx}, /* PC7 */
125 125
   {&gpioc, &timer8, NULL,  8, 3, ADCx}, /* PC8 */
126 126
   {&gpioc, &timer8, NULL,  9, 4, ADCx}, /* PC9 */
127 127
   {&gpioc,   NULL, NULL, 10, 0, ADCx}, /* PC10 UART4_TX/SDIO_D2 */
128 128
   {&gpioc,   NULL, NULL, 11, 0, ADCx}, /* PC11 UART4_RX/SDIO_D3 */
129
-  {&gpioc,   NULL, NULL, 12, 0, ADCx}, /* PC12 UART5_TX/SDIO_CK */	
129
+  {&gpioc,   NULL, NULL, 12, 0, ADCx}, /* PC12 UART5_TX/SDIO_CK */
130 130
   {&gpioc,   NULL, NULL, 13, 0, ADCx}, /* PC13 TAMPER-RTC */
131 131
   {&gpioc,   NULL, NULL, 14, 0, ADCx}, /* PC14 OSC32_IN */
132 132
   {&gpioc,   NULL, NULL, 15, 0, ADCx}, /* PC15 OSC32_OUT */
@@ -134,7 +134,7 @@ extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
134 134
 	{&gpiod,   NULL, NULL,   0, 0, ADCx} , /* PD0 OSC_IN */
135 135
 	{&gpiod,   NULL, NULL,   1, 0, ADCx} , /* PD1  OSC_OUT */
136 136
 	{&gpiod,   NULL, NULL,   2, 0, ADCx} , /* PD2  TIM3_ETR/UART5_RX SDIO_CMD */
137
-	
137
+
138 138
 	{&gpiod,   NULL, NULL,   3, 0, ADCx} , /* PD3  FSMC_CLK */
139 139
 	{&gpiod,   NULL, NULL,   4, 0, ADCx} , /* PD4  FSMC_NOE */
140 140
 	{&gpiod,   NULL, NULL,   5, 0, ADCx} , /* PD5  FSMC_NWE */
@@ -145,10 +145,10 @@ extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
145 145
 	{&gpiod,   NULL, NULL,  10, 0, ADCx} , /* PD10  FSMC_D15 */
146 146
 	{&gpiod,   NULL, NULL,  11, 0, ADCx} , /* PD11  FSMC_A16 */
147 147
 	{&gpiod,   NULL, NULL,  12, 0, ADCx} , /* PD12  FSMC_A17 */
148
-	{&gpiod,   NULL, NULL,  13, 0, ADCx} , /* PD13  FSMC_A18 */	
148
+	{&gpiod,   NULL, NULL,  13, 0, ADCx} , /* PD13  FSMC_A18 */
149 149
 	{&gpiod,   NULL, NULL,  14, 0, ADCx} , /* PD14  FSMC_D0 */
150 150
 	{&gpiod,   NULL, NULL,  15, 0, ADCx} , /* PD15  FSMC_D1 */
151
-	
151
+
152 152
 	{&gpioe,   NULL, NULL,   0, 0, ADCx} , /* PE0   */
153 153
 	{&gpioe,   NULL, NULL,   1, 0, ADCx} , /* PE1   */
154 154
 	{&gpioe,   NULL, NULL,   2, 0, ADCx} , /* PE2   */
@@ -162,9 +162,9 @@ extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
162 162
 	{&gpioe,   NULL, NULL,  10, 0, ADCx} , /* PE10  */
163 163
 	{&gpioe,   NULL, NULL,  11, 0, ADCx} , /* PE11  */
164 164
 	{&gpioe,   NULL, NULL,  12, 0, ADCx} , /* PE12  */
165
-	{&gpioe,   NULL, NULL,  13, 0, ADCx} , /* PE13  */	
165
+	{&gpioe,   NULL, NULL,  13, 0, ADCx} , /* PE13  */
166 166
 	{&gpioe,   NULL, NULL,  14, 0, ADCx} , /* PE14  */
167
-	{&gpioe,   NULL, NULL,  15, 0, ADCx} , /* PE15  */	
167
+	{&gpioe,   NULL, NULL,  15, 0, ADCx} , /* PE15  */
168 168
 
169 169
 	{&gpiof,   NULL, NULL,   0, 0, ADCx} , /* PF0   */
170 170
 	{&gpiof,   NULL, NULL,   1, 0, ADCx} , /* PF1   */
@@ -179,10 +179,10 @@ extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
179 179
 	{&gpiof,   NULL, NULL,  10, 0, ADCx} , /* PF10  */
180 180
 	{&gpiof,   NULL, NULL,  11, 0, ADCx} , /* PF11  */
181 181
 	{&gpiof,   NULL, NULL,  12, 0, ADCx} , /* PF12  */
182
-	{&gpiof,   NULL, NULL,  13, 0, ADCx} , /* PF13  */	
182
+	{&gpiof,   NULL, NULL,  13, 0, ADCx} , /* PF13  */
183 183
 	{&gpiof,   NULL, NULL,  14, 0, ADCx} , /* PF14  */
184
-	{&gpiof,   NULL, NULL,  15, 0, ADCx} , /* PF15  */		
185
-	
184
+	{&gpiof,   NULL, NULL,  15, 0, ADCx} , /* PF15  */
185
+
186 186
 	{&gpiog,   NULL, NULL,   0, 0, ADCx} , /* PG0   */
187 187
 	{&gpiog,   NULL, NULL,   1, 0, ADCx} , /* PG1   */
188 188
 	{&gpiog,   NULL, NULL,   2, 0, ADCx} , /* PG2   */
@@ -196,9 +196,9 @@ extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
196 196
 	{&gpiog,   NULL, NULL,  10, 0, ADCx} , /* PG10  */
197 197
 	{&gpiog,   NULL, NULL,  11, 0, ADCx} , /* PG11  */
198 198
 	{&gpiog,   NULL, NULL,  12, 0, ADCx} , /* PG12  */
199
-	{&gpiog,   NULL, NULL,  13, 0, ADCx} , /* PG13  */	
199
+	{&gpiog,   NULL, NULL,  13, 0, ADCx} , /* PG13  */
200 200
 	{&gpiog,   NULL, NULL,  14, 0, ADCx} , /* PG14  */
201
-	{&gpiog,   NULL, NULL,  15, 0, ADCx}   /* PG15  */		
201
+	{&gpiog,   NULL, NULL,  15, 0, ADCx}   /* PG15  */
202 202
 };
203 203
 
204 204
 /*  Basically everything that is defined as having a timer us PWM */

+ 1
- 1
buildroot/share/PlatformIO/variants/CHITU_F103/ld/stm32f103z_dfu.ld View File

@@ -1,5 +1,5 @@
1 1
 /*
2
- * libmaple linker script 
2
+ * libmaple linker script
3 3
  *
4 4
  * This build puts .text (and .rodata) in Flash, and
5 5
  * .data/.bss/heap (of course) in SRAM, but links starting at the

+ 1
- 1
buildroot/share/PlatformIO/variants/CHITU_F103/ld/stm32f103zc.ld View File

@@ -1,5 +1,5 @@
1 1
 /*
2
- * libmaple linker script 
2
+ * libmaple linker script
3 3
  *
4 4
  * This build puts .text (and .rodata) in Flash, and
5 5
  * .data/.bss/heap (of course) in SRAM, but links starting at the

+ 1
- 1
buildroot/share/PlatformIO/variants/CHITU_F103/ld/stm32f103zd.ld View File

@@ -1,5 +1,5 @@
1 1
 /*
2
- * libmaple linker script 
2
+ * libmaple linker script
3 3
  *
4 4
  * This build puts .text (and .rodata) in Flash, and
5 5
  * .data/.bss/heap (of course) in SRAM, but links starting at the

+ 1
- 1
buildroot/share/PlatformIO/variants/CHITU_F103/ld/stm32f103ze.ld View File

@@ -1,5 +1,5 @@
1 1
 /*
2
- * libmaple linker script 
2
+ * libmaple linker script
3 3
  *
4 4
  * This build puts .text (and .rodata) in Flash, and
5 5
  * .data/.bss/heap (of course) in SRAM, but links starting at the

+ 8
- 8
buildroot/share/PlatformIO/variants/CHITU_F103/wirish/boards_setup.cpp View File

@@ -87,8 +87,8 @@ namespace wirish {
87 87
       #if F_CPU == 72000000
88 88
       rcc_set_prescaler(RCC_PRESCALER_USB, RCC_USB_SYSCLK_DIV_1_5);
89 89
       #elif F_CPU == 48000000
90
-      rcc_set_prescaler(RCC_PRESCALER_USB, RCC_USB_SYSCLK_DIV_1);     
91
-      #endif  
90
+      rcc_set_prescaler(RCC_PRESCALER_USB, RCC_USB_SYSCLK_DIV_1);
91
+      #endif
92 92
         }
93 93
 
94 94
         __weak void board_setup_gpio(void) {
@@ -96,18 +96,18 @@ namespace wirish {
96 96
         }
97 97
 
98 98
         __weak void board_setup_usb(void) {
99
-      
100 99
 
101
-  
102
-#ifdef SERIAL_USB 
103
-#ifdef GENERIC_BOOTLOADER     
100
+
101
+
102
+#ifdef SERIAL_USB
103
+#ifdef GENERIC_BOOTLOADER
104 104
       //Reset the USB interface on generic boards - developed by Victor PV
105 105
       gpio_set_mode(PIN_MAP[PA12].gpio_device, PIN_MAP[PA12].gpio_bit, GPIO_OUTPUT_PP);
106 106
       gpio_write_bit(PIN_MAP[PA12].gpio_device, PIN_MAP[PA12].gpio_bit,0);
107
-      
107
+
108 108
       for(volatile unsigned int i=0;i<512;i++);// Only small delay seems to be needed, and USB pins will get configured in Serial.begin
109 109
       gpio_set_mode(PIN_MAP[PA12].gpio_device, PIN_MAP[PA12].gpio_bit, GPIO_INPUT_FLOATING);
110
-#endif  
110
+#endif
111 111
 
112 112
       Serial.begin();// Roger Clark. Changed SerialUSB to Serial for Arduino sketch compatibility
113 113
 #endif

+ 1
- 1
buildroot/share/sublime/RepRapTools/syntax_test_G-code.gcode View File

@@ -93,7 +93,7 @@ N234 G1 X-5 Y+2 *64 error
93 93
 ;                ^constant.numeric.checksum.gcode
94 94
 ;                  ^invalid.error.syntax.gcode
95 95
 
96
-N234 M107 *64     
96
+N234 M107 *64
97 97
 ;              ^-invalid.error.syntax.gcode
98 98
 
99 99
 M92 E304.5:304.5:420:420:420:420 ; EOL Comment

Loading…
Cancel
Save