Browse Source

Marlin code whitespace cleanup

Scott Lahteine 6 years ago
parent
commit
dff2904c0f

+ 3
- 3
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h View File

1392
 
1392
 
1393
 #define MAX7219_DEBUG
1393
 #define MAX7219_DEBUG
1394
 #if ENABLED(MAX7219_DEBUG)
1394
 #if ENABLED(MAX7219_DEBUG)
1395
-  #define MAX7219_CLK_PIN   64  // 77 on Re-ARM       // Configuration of the 3 pins to control the display 
1396
-  #define MAX7219_DIN_PIN 57  // 78 on Re-ARM
1397
-  #define MAX7219_LOAD_PIN    44  // 79 on Re-ARM
1395
+  #define MAX7219_CLK_PIN   64  // 77 on Re-ARM       // Configuration of the 3 pins to control the display
1396
+  #define MAX7219_DIN_PIN   57  // 78 on Re-ARM
1397
+  #define MAX7219_LOAD_PIN  44  // 79 on Re-ARM
1398
 
1398
 
1399
   /**
1399
   /**
1400
    * Sample debug features
1400
    * Sample debug features

+ 1
- 1
Marlin/src/feature/caselight.cpp View File

26
 
26
 
27
 uint8_t case_light_brightness = CASE_LIGHT_DEFAULT_BRIGHTNESS;
27
 uint8_t case_light_brightness = CASE_LIGHT_DEFAULT_BRIGHTNESS;
28
 bool case_light_on = CASE_LIGHT_DEFAULT_ON;
28
 bool case_light_on = CASE_LIGHT_DEFAULT_ON;
29
-    
29
+
30
 #ifndef INVERT_CASE_LIGHT
30
 #ifndef INVERT_CASE_LIGHT
31
   #define INVERT_CASE_LIGHT false
31
   #define INVERT_CASE_LIGHT false
32
 #endif
32
 #endif

+ 1
- 1
Marlin/src/feature/dac/dac_dac084s085.cpp View File

74
 
74
 
75
   externalDac_buf[0] |= (value >> 4);
75
   externalDac_buf[0] |= (value >> 4);
76
   externalDac_buf[1] |= (value << 4);
76
   externalDac_buf[1] |= (value << 4);
77
-  
77
+
78
   // All SPI chip-select HIGH
78
   // All SPI chip-select HIGH
79
   digitalWrite( DAC0_SYNC , HIGH );
79
   digitalWrite( DAC0_SYNC , HIGH );
80
   #if EXTRUDERS > 1
80
   #if EXTRUDERS > 1

+ 1
- 1
Marlin/src/gcode/calibrate/G33.cpp View File

375
       float a_sum = 0.0;
375
       float a_sum = 0.0;
376
       LOOP_XYZ(axis) a_sum += delta_tower_angle_trim[axis];
376
       LOOP_XYZ(axis) a_sum += delta_tower_angle_trim[axis];
377
       LOOP_XYZ(axis) delta_tower_angle_trim[axis] -= a_sum / 3.0;
377
       LOOP_XYZ(axis) delta_tower_angle_trim[axis] -= a_sum / 3.0;
378
-      
378
+
379
       // adjust delta_height and endstops by the max amount
379
       // adjust delta_height and endstops by the max amount
380
       const float z_temp = MAX3(delta_endstop_adj[A_AXIS], delta_endstop_adj[B_AXIS], delta_endstop_adj[C_AXIS]);
380
       const float z_temp = MAX3(delta_endstop_adj[A_AXIS], delta_endstop_adj[B_AXIS], delta_endstop_adj[C_AXIS]);
381
       home_offset[Z_AXIS] -= z_temp;
381
       home_offset[Z_AXIS] -= z_temp;

+ 8
- 8
Marlin/src/lcd/dogm/ultralcd_st7565_u8glib_VIKI.h View File

142
       ST7565_WRITE_BYTE(0x40);          // Display start line for Displaytech 64128N
142
       ST7565_WRITE_BYTE(0x40);          // Display start line for Displaytech 64128N
143
 
143
 
144
       ST7565_WRITE_BYTE(0x28 | 0x04);   // power control: turn on voltage converter
144
       ST7565_WRITE_BYTE(0x28 | 0x04);   // power control: turn on voltage converter
145
-      //U8G_ESC_DLY(50);                  // delay 50 ms - hangs after a reset if used 
145
+      //U8G_ESC_DLY(50);                  // delay 50 ms - hangs after a reset if used
146
 
146
 
147
       ST7565_WRITE_BYTE(0x28 | 0x06);   // power control: turn on voltage regulator
147
       ST7565_WRITE_BYTE(0x28 | 0x06);   // power control: turn on voltage regulator
148
-      //U8G_ESC_DLY(50);                  // delay 50 ms - hangs after a reset if used 
148
+      //U8G_ESC_DLY(50);                  // delay 50 ms - hangs after a reset if used
149
 
149
 
150
       ST7565_WRITE_BYTE(0x28 | 0x07);   // power control: turn on voltage follower
150
       ST7565_WRITE_BYTE(0x28 | 0x07);   // power control: turn on voltage follower
151
-      //U8G_ESC_DLY(50);                  // delay 50 ms - hangs after a reset if used 
151
+      //U8G_ESC_DLY(50);                  // delay 50 ms - hangs after a reset if used
152
 
152
 
153
       ST7565_WRITE_BYTE(0x10);          // Set V0 voltage resistor ratio. Setting for controlling brightness of Displaytech 64128N
153
       ST7565_WRITE_BYTE(0x10);          // Set V0 voltage resistor ratio. Setting for controlling brightness of Displaytech 64128N
154
 
154
 
228
 
228
 
229
 class U8GLIB_ST7565_64128n_2x_VIKI : public U8GLIB {
229
 class U8GLIB_ST7565_64128n_2x_VIKI : public U8GLIB {
230
   public:
230
   public:
231
-  U8GLIB_ST7565_64128n_2x_VIKI(uint8_t dummy) 
232
-    : U8GLIB(&u8g_dev_st7565_64128n_2x_VIKI_sw_spi) 
231
+  U8GLIB_ST7565_64128n_2x_VIKI(uint8_t dummy)
232
+    : U8GLIB(&u8g_dev_st7565_64128n_2x_VIKI_sw_spi)
233
+    {  }
234
+  U8GLIB_ST7565_64128n_2x_VIKI(uint8_t sck, uint8_t mosi, uint8_t cs, uint8_t a0, uint8_t reset = U8G_PIN_NONE)
235
+    : U8GLIB(&u8g_dev_st7565_64128n_2x_VIKI_sw_spi)
233
     {  }
236
     {  }
234
-  U8GLIB_ST7565_64128n_2x_VIKI(uint8_t sck, uint8_t mosi, uint8_t cs, uint8_t a0, uint8_t reset = U8G_PIN_NONE) 
235
-    : U8GLIB(&u8g_dev_st7565_64128n_2x_VIKI_sw_spi) 
236
-    {  }  
237
 };
237
 };
238
 
238
 
239
 #pragma GCC reset_options
239
 #pragma GCC reset_options

+ 3
- 3
Marlin/src/lcd/ultralcd_impl_DOGM.h View File

176
   //U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0);  // 8 stripes
176
   //U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0);  // 8 stripes
177
   U8GLIB_LM6059_2X u8g(DOGLCD_CS, DOGLCD_A0); // 4 stripes
177
   U8GLIB_LM6059_2X u8g(DOGLCD_CS, DOGLCD_A0); // 4 stripes
178
 #elif ENABLED(U8GLIB_ST7565_64128N)
178
 #elif ENABLED(U8GLIB_ST7565_64128N)
179
-  // The MaKrPanel, Mini Viki, and Viki 2.0, ST7565 controller 
180
-  //U8GLIB_ST7565_64128n_2x_VIKI u8g(0);  // using SW-SPI DOGLCD_MOSI != -1 && DOGLCD_SCK 
181
-  U8GLIB_ST7565_64128n_2x_VIKI u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0);  // using SW-SPI 
179
+  // The MaKrPanel, Mini Viki, and Viki 2.0, ST7565 controller
180
+  //U8GLIB_ST7565_64128n_2x_VIKI u8g(0);  // using SW-SPI DOGLCD_MOSI != -1 && DOGLCD_SCK
181
+  U8GLIB_ST7565_64128n_2x_VIKI u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0);  // using SW-SPI
182
   //U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0);  // 8 stripes
182
   //U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0);  // 8 stripes
183
   //U8GLIB_NHD_C12864_2X u8g(DOGLCD_CS, DOGLCD_A0); // 4 stripes  HWSPI
183
   //U8GLIB_NHD_C12864_2X u8g(DOGLCD_CS, DOGLCD_A0); // 4 stripes  HWSPI
184
 #elif ENABLED(U8GLIB_SSD1306)
184
 #elif ENABLED(U8GLIB_SSD1306)

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

302
       #endif
302
       #endif
303
 
303
 
304
       #ifdef CPU_32_BIT
304
       #ifdef CPU_32_BIT
305
-        // In case of high-performance processor, it is able to calculate in real-time 
305
+        // In case of high-performance processor, it is able to calculate in real-time
306
         timer = (uint32_t)(HAL_STEPPER_TIMER_RATE) / step_rate;
306
         timer = (uint32_t)(HAL_STEPPER_TIMER_RATE) / step_rate;
307
         if (timer < (HAL_STEPPER_TIMER_RATE / (STEP_DOUBLER_FREQUENCY * 2))) { // (STEP_DOUBLER_FREQUENCY * 2 kHz - this should never happen)
307
         if (timer < (HAL_STEPPER_TIMER_RATE / (STEP_DOUBLER_FREQUENCY * 2))) { // (STEP_DOUBLER_FREQUENCY * 2 kHz - this should never happen)
308
           timer = (HAL_STEPPER_TIMER_RATE / (STEP_DOUBLER_FREQUENCY * 2));
308
           timer = (HAL_STEPPER_TIMER_RATE / (STEP_DOUBLER_FREQUENCY * 2));

Loading…
Cancel
Save