Browse Source

Spacing adjustments

Scott Lahteine 7 years ago
parent
commit
965b0ab53e

+ 1
- 1
Marlin/src/inc/SPI.h View File

@@ -1,7 +1,7 @@
1 1
 #include <stdint.h>
2 2
 
3 3
 
4
-#if !defined(SPI_FULL_SPEED)
4
+#ifndef SPI_FULL_SPEED
5 5
 
6 6
 /**
7 7
  * SPI speed where 0 <= index <= 6

+ 1
- 1
Marlin/src/inc/SanityCheck.h View File

@@ -632,7 +632,7 @@ static_assert(1 >= 0
632 632
   /**
633 633
    * Make sure Z raise values are set
634 634
    */
635
-  #if !defined(Z_CLEARANCE_DEPLOY_PROBE)
635
+  #ifndef Z_CLEARANCE_DEPLOY_PROBE
636 636
     #error "You must define Z_CLEARANCE_DEPLOY_PROBE in your configuration."
637 637
   #elif !defined(Z_CLEARANCE_BETWEEN_PROBES)
638 638
     #error "You must define Z_CLEARANCE_BETWEEN_PROBES in your configuration."

+ 1
- 1
Marlin/src/module/probe.cpp View File

@@ -276,7 +276,7 @@ inline void do_probe_raise(const float z_raise) {
276 276
     #endif
277 277
   }
278 278
 
279
-#endif
279
+#endif // Z_PROBE_ALLEN_KEY
280 280
 
281 281
 #if ENABLED(PROBING_FANS_OFF)
282 282
 

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

@@ -323,7 +323,7 @@ void Stepper::isr() {
323 323
 
324 324
   HAL_TIMER_TYPE ocr_val;
325 325
 
326
-  #if defined(CPU_32_BIT)
326
+  #ifdef CPU_32_BIT
327 327
     #define ENDSTOP_NOMINAL_OCR_VAL 1500 * HAL_TICKS_PER_US    // check endstops every 1.5ms to guarantee two stepper ISRs within 5ms for BLTouch
328 328
     #define OCR_VAL_TOLERANCE 500 * HAL_TICKS_PER_US           // First max delay is 2.0ms, last min delay is 0.5ms, all others 1.5ms
329 329
   #else
@@ -335,7 +335,7 @@ void Stepper::isr() {
335 335
     // Disable Timer0 ISRs and enable global ISR again to capture UART events (incoming chars)
336 336
     DISABLE_TEMPERATURE_INTERRUPT(); // Temperature ISR
337 337
     DISABLE_STEPPER_DRIVER_INTERRUPT();
338
-    #if !defined(CPU_32_BIT)
338
+    #ifndef CPU_32_BIT
339 339
       sei();
340 340
     #endif
341 341
   #endif

+ 1
- 1
Marlin/src/pins/pins_ANET_10.h View File

@@ -88,7 +88,7 @@
88 88
  *   Many thanks to Hans Raaf (@oderwat) for developing the Anet-specific software and supporting the Anet community.
89 89
 */
90 90
 
91
-#if !defined(__AVR_ATmega1284P__)
91
+#ifndef __AVR_ATmega1284P__
92 92
   #error "Oops!  Make sure you have 'Anet V1.0', 'Anet V1.0 (Optiboot)' or 'Sanguino' selected from the 'Tools -> Boards' menu."
93 93
 #endif
94 94
 

+ 24
- 29
Marlin/src/pins/pins_RAMPS_RE_ARM.h View File

@@ -66,7 +66,7 @@
66 66
 #define Y_MAX_PIN          15  //10k pullup to 3.3V, 1K series
67 67
 #define Z_MIN_PIN          18  //10k pullup to 3.3V, 1K series
68 68
 #define Z_MAX_PIN          19  //10k pullup to 3.3V, 1K series
69
-//#define Z_probe_pin         1  // AUX-1
69
+//#define Z_PROBE_PIN         1  // AUX-1
70 70
 
71 71
 
72 72
 //
@@ -267,23 +267,18 @@
267 267
     //#define SHIFT_EN            41  // J5-4 & AUX-4
268 268
   #endif
269 269
 
270
-  #if ENABLED(SDSUPPORT)
271
-    #define SDCARD_SORT_ALPHA           // Using SORT feature to keep one directory level in RAM
272
-                                        // When going up/down directory levels the SD card is
273
-                                        // accessed but the garbage/lines are removed when the
274
-                                        // LCD updates
275
-
276
-    // SD Card Sorting options
277
-    #if ENABLED(SDCARD_SORT_ALPHA)
278
-      #define SDSORT_LIMIT       255    // Maximum number of sorted items (10-256). Costs 27 bytes each.
279
-      #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
280
-      #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
281
-      #define SDSORT_USES_RAM    true   // Pre-allocate a static array for faster pre-sorting.
282
-      #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
283
-      #define SDSORT_CACHE_NAMES true   // Keep sorted items in RAM longer for speedy performance. Most expensive option.
284
-      #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
285
-    #endif
286
-  #endif
270
+    #define SDCARD_SORT_ALPHA         // Using SORT feature to keep one directory level in RAM
271
+                                      // When going up/down directory levels the SD card is
272
+                                      // accessed but the garbage/lines are removed when the
273
+                                      // LCD updates
274
+
275
+    #define SDSORT_LIMIT       256    // Maximum number of sorted items (10-256). Costs 27 bytes each.
276
+    #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
277
+    #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
278
+    #define SDSORT_USES_RAM    true   // Pre-allocate a static array for faster pre-sorting.
279
+    #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
280
+    #define SDSORT_CACHE_NAMES true   // Keep sorted items in RAM longer for speedy performance. Most expensive option.
281
+    #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
287 282
 
288 283
  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
289 284
 //    #define LCD_SCREEN_ROT_180
@@ -307,7 +302,7 @@
307 302
     #undef  LCD_PINS_D5         //59  // J3-8 & AUX-2
308 303
     #define DOGLCD_A0           59  // J3-8 & AUX-2
309 304
     #undef  LCD_PINS_D6         //63  // J5-3 & AUX-2
310
-    #undef  LCD_PINS_D7          //6  // (SERVO1) J5-1 & SERVO connector
305
+    #undef  LCD_PINS_D7         // 6  // (SERVO1) J5-1 & SERVO connector
311 306
     #define DOGLCD_SCK SCK_PIN
312 307
     #define DOGLCD_MOSI MOSI_PIN
313 308
 
@@ -335,17 +330,17 @@
335 330
 // Ethernet pins
336 331
 //
337 332
 #ifndef ULTIPANEL
338
-#define ENET_MDIO   71  // J12-4
339
-#define ENET_RX_ER  73  // J12-6
340
-#define ENET_RXD1   75  // J12-8
333
+  #define ENET_MDIO   71  // J12-4
334
+  #define ENET_RX_ER  73  // J12-6
335
+  #define ENET_RXD1   75  // J12-8
341 336
 #endif
342
-#define ENET_MOC    70  // J12-3
343
-#define REF_CLK     72  // J12-5
344
-#define ENET_RXD0   74  // J12-7
345
-#define ENET_CRS    76  // J12-9
346
-#define ENET_TX_EN  77  // J12-10
347
-#define ENET_TXD0   78  // J12-11
348
-#define ENET_TXD1   79  // J12-12
337
+#define ENET_MOC      70  // J12-3
338
+#define REF_CLK       72  // J12-5
339
+#define ENET_RXD0     74  // J12-7
340
+#define ENET_CRS      76  // J12-9
341
+#define ENET_TX_EN    77  // J12-10
342
+#define ENET_TXD0     78  // J12-11
343
+#define ENET_TXD1     79  // J12-12
349 344
 
350 345
 /**
351 346
  *  PWMS

+ 5
- 5
frameworks/CMSIS/LPC1768/include/lpc_types.h View File

@@ -134,7 +134,7 @@ typedef int32_t(*PFI)();
134 134
 
135 135
 /* NULL pointer */
136 136
 #ifndef NULL
137
-#define NULL ((void*) 0)
137
+  #define NULL ((void*) 0)
138 138
 #endif
139 139
 
140 140
 /* Number of elements in an array */
@@ -145,11 +145,11 @@ typedef int32_t(*PFI)();
145 145
 /* External data/function define */
146 146
 #define EXTERN extern
147 147
 
148
-#if !defined(MAX)
149
-#define MAX(a, b) (((a) > (b)) ? (a) : (b))
148
+#ifndef MAX
149
+  #define MAX(a, b) (((a) > (b)) ? (a) : (b))
150 150
 #endif
151
-#if !defined(MIN)
152
-#define MIN(a, b) (((a) < (b)) ? (a) : (b))
151
+#ifndef MIN
152
+  #define MIN(a, b) (((a) < (b)) ? (a) : (b))
153 153
 #endif
154 154
 
155 155
 /**

Loading…
Cancel
Save