Browse Source

Formatting adjustments

Scott Lahteine 7 years ago
parent
commit
428be27893
3 changed files with 13 additions and 13 deletions
  1. 11
    11
      Marlin/Marlin_main.cpp
  2. 1
    1
      Marlin/pins_SETHI.h
  3. 1
    1
      Marlin/stepper_indirection.cpp

+ 11
- 11
Marlin/Marlin_main.cpp View File

752
   #endif
752
   #endif
753
 
753
 
754
   #define DEBUG_POS(SUFFIX,VAR) do { \
754
   #define DEBUG_POS(SUFFIX,VAR) do { \
755
-    print_xyz(PSTR("  " STRINGIFY(VAR) "="), PSTR(" : " SUFFIX "\n"), VAR); } while(0)
755
+    print_xyz(PSTR("  " STRINGIFY(VAR) "="), PSTR(" : " SUFFIX "\n"), VAR); }while(0)
756
 #endif
756
 #endif
757
 
757
 
758
 /**
758
 /**
3492
       SERIAL_ECHOPAIR("Probe Offset X:", X_PROBE_OFFSET_FROM_EXTRUDER);
3492
       SERIAL_ECHOPAIR("Probe Offset X:", X_PROBE_OFFSET_FROM_EXTRUDER);
3493
       SERIAL_ECHOPAIR(" Y:", Y_PROBE_OFFSET_FROM_EXTRUDER);
3493
       SERIAL_ECHOPAIR(" Y:", Y_PROBE_OFFSET_FROM_EXTRUDER);
3494
       SERIAL_ECHOPAIR(" Z:", zprobe_zoffset);
3494
       SERIAL_ECHOPAIR(" Z:", zprobe_zoffset);
3495
-      #if (X_PROBE_OFFSET_FROM_EXTRUDER > 0)
3495
+      #if X_PROBE_OFFSET_FROM_EXTRUDER > 0
3496
         SERIAL_ECHOPGM(" (Right");
3496
         SERIAL_ECHOPGM(" (Right");
3497
-      #elif (X_PROBE_OFFSET_FROM_EXTRUDER < 0)
3497
+      #elif X_PROBE_OFFSET_FROM_EXTRUDER < 0
3498
         SERIAL_ECHOPGM(" (Left");
3498
         SERIAL_ECHOPGM(" (Left");
3499
-      #elif (Y_PROBE_OFFSET_FROM_EXTRUDER != 0)
3499
+      #elif Y_PROBE_OFFSET_FROM_EXTRUDER != 0
3500
         SERIAL_ECHOPGM(" (Middle");
3500
         SERIAL_ECHOPGM(" (Middle");
3501
       #else
3501
       #else
3502
         SERIAL_ECHOPGM(" (Aligned With");
3502
         SERIAL_ECHOPGM(" (Aligned With");
3503
       #endif
3503
       #endif
3504
-      #if (Y_PROBE_OFFSET_FROM_EXTRUDER > 0)
3504
+      #if Y_PROBE_OFFSET_FROM_EXTRUDER > 0
3505
         SERIAL_ECHOPGM("-Back");
3505
         SERIAL_ECHOPGM("-Back");
3506
-      #elif (Y_PROBE_OFFSET_FROM_EXTRUDER < 0)
3506
+      #elif Y_PROBE_OFFSET_FROM_EXTRUDER < 0
3507
         SERIAL_ECHOPGM("-Front");
3507
         SERIAL_ECHOPGM("-Front");
3508
-      #elif (X_PROBE_OFFSET_FROM_EXTRUDER != 0)
3508
+      #elif X_PROBE_OFFSET_FROM_EXTRUDER != 0
3509
         SERIAL_ECHOPGM("-Center");
3509
         SERIAL_ECHOPGM("-Center");
3510
       #endif
3510
       #endif
3511
       if (zprobe_zoffset < 0)
3511
       if (zprobe_zoffset < 0)
5109
 
5109
 
5110
       const int8_t probe_points = parser.seen('P') ? parser.value_int() : DELTA_CALIBRATION_DEFAULT_POINTS;
5110
       const int8_t probe_points = parser.seen('P') ? parser.value_int() : DELTA_CALIBRATION_DEFAULT_POINTS;
5111
       if (!WITHIN(probe_points, 1, 7)) {
5111
       if (!WITHIN(probe_points, 1, 7)) {
5112
-        SERIAL_PROTOCOLLNPGM("?(P)oints is implausible (1-7).");
5112
+        SERIAL_PROTOCOLLNPGM("?(P)oints is implausible (1 to 7).");
5113
         return;
5113
         return;
5114
       }
5114
       }
5115
 
5115
 
11279
     delta[A_AXIS] = DELTA_Z(A_AXIS); \
11279
     delta[A_AXIS] = DELTA_Z(A_AXIS); \
11280
     delta[B_AXIS] = DELTA_Z(B_AXIS); \
11280
     delta[B_AXIS] = DELTA_Z(B_AXIS); \
11281
     delta[C_AXIS] = DELTA_Z(C_AXIS); \
11281
     delta[C_AXIS] = DELTA_Z(C_AXIS); \
11282
-  } while(0)
11282
+  }while(0)
11283
 
11283
 
11284
   #define DELTA_LOGICAL_IK() do {      \
11284
   #define DELTA_LOGICAL_IK() do {      \
11285
     const float raw[XYZ] = {           \
11285
     const float raw[XYZ] = {           \
11288
       RAW_Z_POSITION(logical[Z_AXIS])  \
11288
       RAW_Z_POSITION(logical[Z_AXIS])  \
11289
     };                                 \
11289
     };                                 \
11290
     DELTA_RAW_IK();                    \
11290
     DELTA_RAW_IK();                    \
11291
-  } while(0)
11291
+  }while(0)
11292
 
11292
 
11293
   #define DELTA_DEBUG() do { \
11293
   #define DELTA_DEBUG() do { \
11294
       SERIAL_ECHOPAIR("cartesian X:", raw[X_AXIS]); \
11294
       SERIAL_ECHOPAIR("cartesian X:", raw[X_AXIS]); \
11297
       SERIAL_ECHOPAIR("delta A:", delta[A_AXIS]);   \
11297
       SERIAL_ECHOPAIR("delta A:", delta[A_AXIS]);   \
11298
       SERIAL_ECHOPAIR(" B:", delta[B_AXIS]);        \
11298
       SERIAL_ECHOPAIR(" B:", delta[B_AXIS]);        \
11299
       SERIAL_ECHOLNPAIR(" C:", delta[C_AXIS]);      \
11299
       SERIAL_ECHOLNPAIR(" C:", delta[C_AXIS]);      \
11300
-    } while(0)
11300
+    }while(0)
11301
 
11301
 
11302
   void inverse_kinematics(const float logical[XYZ]) {
11302
   void inverse_kinematics(const float logical[XYZ]) {
11303
     DELTA_LOGICAL_IK();
11303
     DELTA_LOGICAL_IK();

+ 1
- 1
Marlin/pins_SETHI.h View File

99
 #define HEATER_BED_PIN      3
99
 #define HEATER_BED_PIN      3
100
 
100
 
101
 
101
 
102
-#if (GEN7_VERSION >= 13)
102
+#if GEN7_VERSION >= 13
103
   // Gen7 v1.3 removed the fan pin
103
   // Gen7 v1.3 removed the fan pin
104
   #define FAN_PIN          -1
104
   #define FAN_PIN          -1
105
 #else
105
 #else

+ 1
- 1
Marlin/stepper_indirection.cpp View File

296
     stepper##A.setMicroSteps(A##_MICROSTEPS); \
296
     stepper##A.setMicroSteps(A##_MICROSTEPS); \
297
     stepper##A.setOverCurrent(A##_OVERCURRENT); \
297
     stepper##A.setOverCurrent(A##_OVERCURRENT); \
298
     stepper##A.setStallCurrent(A##_STALLCURRENT); \
298
     stepper##A.setStallCurrent(A##_STALLCURRENT); \
299
-  } while(0)
299
+  }while(0)
300
 
300
 
301
   void L6470_init() {
301
   void L6470_init() {
302
     #if ENABLED(X_IS_L6470)
302
     #if ENABLED(X_IS_L6470)

Loading…
Cancel
Save