Merge pull request #6515 from thinkyhead/rc_cleanup_sunday

Some minor cleanups to code formatting

Marlin/Conditionals_post.h

@@ -406,9 +406,9 @@
     #endif
   #endif
 
-  #define IS_Z2_OR_PROBE(P) (PIN_EXISTS(Z2_MIN_PIN)      && (P == Z2_MIN_PIN) \
+  #define IS_Z2_OR_PROBE(P) (   (PIN_EXISTS(Z2_MIN)      && (P) == Z2_MIN_PIN)       \
-                          || PIN_EXISTS(Z2_MAX_PIN)      && (P == Z2_MAX_PIN) \ 
+                             || (PIN_EXISTS(Z2_MAX)      && (P) == Z2_MAX_PIN)       \
-                          || PIN_EXISTS(Z_MIN_PROBE_PIN) && (P == Z_MIN_PROBE_PIN))
+                             || (PIN_EXISTS(Z_MIN_PROBE) && (P) == Z_MIN_PROBE_PIN))
 
   /**
    * Set ENDSTOPPULLUPS for active endstop switches

Marlin/pinsDebug.h

@@ -51,11 +51,8 @@ bool endstop_monitor_flag = false;
 #define REPORT_NAME_DIGITAL(NAME, COUNTER) _ADD_PIN(#NAME, COUNTER)
 #define REPORT_NAME_ANALOG(NAME, COUNTER) _ADD_PIN(#NAME, COUNTER)
 
-#line 0   // set __LINE__ to a known value for the first pass
-
 #include "pinsDebug_list.h"
-
+#line 56
-#line 59   // set __LINE__ to the correct line number or else compiler error messages don't make sense
 
 // manually add pins that have names that are macros which don't play well with these macros
 #if SERIAL_PORT == 0 && (AVR_ATmega2560_FAMILY || AVR_ATmega1284_FAMILY)
@@ -77,7 +74,6 @@ bool endstop_monitor_flag = false;
 #define REPORT_NAME_DIGITAL(NAME, COUNTER) _ADD_PIN(NAME, COUNTER, (uint8_t)1)
 #define REPORT_NAME_ANALOG(NAME, COUNTER) _ADD_PIN(analogInputToDigitalPin(NAME), COUNTER, 0)
 
-
 const char* const pin_array[][3] PROGMEM = {
 
   /**
@@ -100,21 +96,18 @@ const char* const pin_array[][3] PROGMEM = {
     #endif
   #endif
 
-  #line 0   // set __LINE__ to the SAME known value for the second pass
   #include "pinsDebug_list.h"
+  #line 101
 
-};  // done populating the array
+};
 
-#line 109  // set __LINE__ to the correct line number or else compiler error messages don't make sense
+#define n_array (sizeof(pin_array) / sizeof(char*)) / 3
-
-#define n_array (sizeof (pin_array) / sizeof (const char *))/3
 
 #ifndef TIMER1B
   // working with Teensyduino extension so need to re-define some things
   #include "pinsDebug_Teensyduino.h"
 #endif
 
-
 #define PWM_PRINT(V) do{ sprintf(buffer, "PWM:  %4d", V); SERIAL_ECHO(buffer); }while(0)
 #define PWM_CASE(N,Z)                                           \
   case TIMER##N##Z:                                             \
@@ -176,11 +169,10 @@ static bool pwm_status(uint8_t pin) {
     default:
       return false;
   }
-  SERIAL_PROTOCOLPGM("  ");
+  SERIAL_PROTOCOL_SP(2);
 } // pwm_status
 
 
-
 const volatile uint8_t* const PWM_other[][3] PROGMEM = {
     { &TCCR0A, &TCCR0B, &TIMSK0 },
     { &TCCR1A, &TCCR1B, &TIMSK1 },
@@ -247,19 +239,11 @@ const volatile uint8_t* const PWM_OCR[][3] PROGMEM = {
 #define WGM_3      4
 #define TOIE       0
 
-
 #define OCR_VAL(T, L)   pgm_read_word(&PWM_OCR[T][L])
 
-
+static void err_is_counter()     { SERIAL_PROTOCOLPGM("   non-standard PWM mode"); }
-static void err_is_counter() {
+static void err_is_interrupt()   { SERIAL_PROTOCOLPGM("   compare interrupt enabled"); }
-  SERIAL_PROTOCOLPGM("   non-standard PWM mode");
+static void err_prob_interrupt() { SERIAL_PROTOCOLPGM("   overflow interrupt enabled"); }
-}
-static void err_is_interrupt() {
-  SERIAL_PROTOCOLPGM("   compare interrupt enabled");
-}
-static void err_prob_interrupt() {
-  SERIAL_PROTOCOLPGM("   overflow interrupt enabled");
-}
 
 void com_print(uint8_t N, uint8_t Z) {
   uint8_t *TCCRA = (uint8_t*)TCCR_A(N);
@@ -278,8 +262,7 @@ void com_print(uint8_t N, uint8_t Z) {
   }
 }
 
-
+void timer_prefix(uint8_t T, char L, uint8_t N) {  // T - timer    L - pwm  N - WGM bit layout
-void timer_prefix(uint8_t T, char L, uint8_t N) {  // T - timer    L - pwm  n - WGM bit layout
   char buffer[20];   // for the sprintf statements
   uint8_t *TCCRB = (uint8_t*)TCCR_B(T);
   uint8_t *TCCRA = (uint8_t*)TCCR_A(T);
@@ -289,7 +272,7 @@ void timer_prefix(uint8_t T, char L, uint8_t N) {  // T - timer    L - pwm  n -
   SERIAL_PROTOCOLPGM("    TIMER");
   SERIAL_PROTOCOLCHAR(T + '0');
   SERIAL_PROTOCOLCHAR(L);
-  SERIAL_PROTOCOLPGM("   ");
+  SERIAL_PROTOCOL_SP(3);
 
   if (N == 3) {
     uint8_t *OCRVAL8 = (uint8_t*)OCR_VAL(T, L - 'A');
@@ -327,76 +310,43 @@ static void pwm_details(uint8_t pin) {
   switch (digitalPinToTimer(pin)) {
 
     #if defined(TCCR0A) && defined(COM0A1)
-
       #ifdef TIMER0A
-        case TIMER0A:
+        case TIMER0A: timer_prefix(0, 'A', 3); break;
-          timer_prefix(0,'A',3);
-          break;
       #endif
-      case TIMER0B:
+      case TIMER0B: timer_prefix(0, 'B', 3); break;
-        timer_prefix(0,'B',3);
-        break;
     #endif
 
     #if defined(TCCR1A) && defined(COM1A1)
-      case TIMER1A:
+      case TIMER1A: timer_prefix(1, 'A', 4); break;
-        timer_prefix(1,'A',4);
+      case TIMER1B: timer_prefix(1, 'B', 4); break;
-        break;
-      case TIMER1B:
-        timer_prefix(1,'B',4);
-        break;
       #if defined(COM1C1) && defined(TIMER1C)
-        case TIMER1C:
+        case TIMER1C: timer_prefix(1, 'C', 4); break;
-          timer_prefix(1,'C',4);
-          break;
       #endif
     #endif
 
     #if defined(TCCR2A) && defined(COM2A1)
-      case TIMER2A:
+      case TIMER2A: timer_prefix(2, 'A', 3); break;
-        timer_prefix(2,'A',3);
+      case TIMER2B: timer_prefix(2, 'B', 3); break;
-        break;
-      case TIMER2B:
-        timer_prefix(2,'B',3);
-        break;
     #endif
 
     #if defined(TCCR3A) && defined(COM3A1)
-      case TIMER3A:
+      case TIMER3A: timer_prefix(3, 'A', 4); break;
-        timer_prefix(3,'A',4);
+      case TIMER3B: timer_prefix(3, 'B', 4); break;
-        break;
-      case TIMER3B:
-        timer_prefix(3,'B',4);
-        break;
       #ifdef COM3C1
-        case TIMER3C:
+        case TIMER3C: timer_prefix(3, 'C', 4); break;
-          timer_prefix(3,'C',4);
-          break;
       #endif
     #endif
 
     #ifdef TCCR4A
-      case TIMER4A:
+      case TIMER4A: timer_prefix(4, 'A', 4); break;
-        timer_prefix(4,'A',4);
+      case TIMER4B: timer_prefix(4, 'B', 4); break;
-        break;
+      case TIMER4C: timer_prefix(4, 'C', 4); break;
-      case TIMER4B:
-        timer_prefix(4,'B',4);
-        break;
-      case TIMER4C:
-        timer_prefix(4,'C',4);
-        break;
     #endif
 
     #if defined(TCCR5A) && defined(COM5A1)
-      case TIMER5A:
+      case TIMER5A: timer_prefix(5, 'A', 4); break;
-        timer_prefix(5,'A',4);
+      case TIMER5B: timer_prefix(5, 'B', 4); break;
-        break;
+      case TIMER5C: timer_prefix(5, 'C', 4); break;
-      case TIMER5B:
-        timer_prefix(5,'B',4);
-        break;
-      case TIMER5C:
-        timer_prefix(5,'C',4);
-        break;
     #endif
 
     case NOT_ON_TIMER: break;
@@ -409,10 +359,16 @@ static void pwm_details(uint8_t pin) {
     // looking for port B7 - PWMs 0A and 1C
     if ( ('B' == digitalPinToPort(pin) + 64) && (0x80 == digitalPinToBitMask(pin))) {
       #ifndef TEENSYDUINO_IDE
-        SERIAL_PROTOCOLPGM("\n .                  TIMER1C is also tied to this pin             ");
+        SERIAL_PROTOCOLPGM("\n .");
+        SERIAL_PROTOCOL_SP(18);
+        SERIAL_PROTOCOLPGM("TIMER1C is also tied to this pin");
+        SERIAL_PROTOCOL_SP(13);
         timer_prefix(1, 'C', 4);
       #else
-        SERIAL_PROTOCOLPGM("\n .                  TIMER0A is also tied to this pin             ");
+        SERIAL_PROTOCOLPGM("\n .");
+        SERIAL_PROTOCOL_SP(18);
+        SERIAL_PROTOCOLPGM("TIMER0A is also tied to this pin");
+        SERIAL_PROTOCOL_SP(13);
         timer_prefix(0, 'A', 3);
       #endif
     }
@@ -437,7 +393,7 @@ void print_port(int8_t pin) {   // print port number
     for (x = '0'; x < '9' && temp != 1; x++) temp >>= 1;
     SERIAL_CHAR(x);
   #else
-    SERIAL_PROTOCOLPGM("          ");
+    SERIAL_PROTOCOL_SP(10);
   #endif
 }
 
@@ -460,9 +416,12 @@ inline void report_pin_state_extended(int8_t pin, bool ignore, bool extended = t
           sprintf(buffer, " (A%2d)  ", int(pin - analogInputToDigitalPin(0)));    // analog pin number
           SERIAL_ECHO(buffer);
         }
-        else SERIAL_ECHOPGM("        ");   // add padding if not an analog pin
+        else SERIAL_ECHO_SP(8);   // add padding if not an analog pin
+      }
+      else {
+        SERIAL_CHAR('.');
+        SERIAL_ECHO_SP(25);  // add padding if not the first instance found
       }
-      else SERIAL_ECHOPGM(".                         ");  // add padding if not the first instance found
       name_mem_pointer = (char*)pgm_read_word(&pin_array[x][0]);
       for (uint8_t y = 0; y < 28; y++) {                   // always print pin name
         temp_char = pgm_read_byte(name_mem_pointer + y);
@@ -506,17 +465,19 @@ inline void report_pin_state_extended(int8_t pin, bool ignore, bool extended = t
       SERIAL_ECHO(buffer);
     }
     else
-      SERIAL_ECHOPGM("        ");   // add padding if not an analog pin
+      SERIAL_ECHO_SP(8);   // add padding if not an analog pin
     SERIAL_ECHOPGM("<unused/unknown>");
-    if (get_pinMode(pin))
+    if (get_pinMode(pin)) {
+      SERIAL_PROTOCOL_SP(12);
       SERIAL_PROTOCOLPAIR("Output = ", digitalRead_mod(pin));
+    }
     else {
       if (IS_ANALOG(pin)) {
         sprintf(buffer, "   Analog in = %5d", analogRead(pin - analogInputToDigitalPin(0)));
         SERIAL_ECHO(buffer);
       }
       else
-        SERIAL_ECHOPGM("         ");   // add padding if not an analog pin
+        SERIAL_ECHO_SP(9);   // add padding if not an analog pin
 
       SERIAL_PROTOCOLPAIR("   Input  = ", digitalRead_mod(pin));
     }

Marlin/pinsDebug_list.h

@@ -26,6 +26,9 @@
 // If the new pin name is over 28 characters long then pinsDebug.h will need to be modified.
 
 // Pin list updated from 18 FEB 2017 RCBugfix branch   - max length of pin name is 24
+
+#line 0 // set __LINE__ to a known value for both passes
+
 #if defined(__FD) && __FD >= 0
   REPORT_NAME_DIGITAL(__FD, __LINE__ )
 #endif
@@ -224,18 +227,6 @@
 #if PIN_EXISTS(E4_STEP)
   REPORT_NAME_DIGITAL(E4_STEP_PIN, __LINE__ )
 #endif
-#if defined(encrot0) && encrot0 >= 0
-  REPORT_NAME_DIGITAL(encrot0, __LINE__ )
-#endif
-#if defined(encrot1) && encrot1 >= 0
-  REPORT_NAME_DIGITAL(encrot1, __LINE__ )
-#endif
-#if defined(encrot2) && encrot2 >= 0
-  REPORT_NAME_DIGITAL(encrot2, __LINE__ )
-#endif
-#if defined(encrot3) && encrot3 >= 0
-  REPORT_NAME_DIGITAL(encrot3, __LINE__ )
-#endif
 #if defined(EXT_AUX_A0) && EXT_AUX_A0 >= 0 && EXT_AUX_A0 < NUM_ANALOG_INPUTS
   REPORT_NAME_ANALOG(EXT_AUX_A0, __LINE__ )
 #endif
@@ -317,9 +308,6 @@
 #if PIN_EXISTS(FILWIDTH) && FILWIDTH_PIN < NUM_ANALOG_INPUTS
   REPORT_NAME_ANALOG(FILWIDTH_PIN, __LINE__ )
 #endif
-#if defined(GEN7_VERSION) && GEN7_VERSION >= 0
-  REPORT_NAME_DIGITAL(GEN7_VERSION, __LINE__ )
-#endif
 #if PIN_EXISTS(HEATER_0)
   REPORT_NAME_DIGITAL(HEATER_0_PIN, __LINE__ )
 #endif
@@ -350,11 +338,11 @@
 #if PIN_EXISTS(HOME)
   REPORT_NAME_DIGITAL(HOME_PIN, __LINE__ )
 #endif
-#if defined(I2C_SCL) && I2C_SCL >= 0
+#if PIN_EXISTS(I2C_SCL)
-  REPORT_NAME_DIGITAL(I2C_SCL, __LINE__ )
+  REPORT_NAME_DIGITAL(I2C_SCL_PIN, __LINE__ )
 #endif
-#if defined(I2C_SDA) && I2C_SDA >= 0
+#if PIN_EXISTS(I2C_SDA)
-  REPORT_NAME_DIGITAL(I2C_SDA, __LINE__ )
+  REPORT_NAME_DIGITAL(I2C_SDA_PIN, __LINE__ )
 #endif
 #if PIN_EXISTS(KILL)
   REPORT_NAME_DIGITAL(KILL_PIN, __LINE__ )
@@ -422,9 +410,6 @@
 #if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
   REPORT_NAME_DIGITAL(MOTOR_CURRENT_PWM_Z_PIN, __LINE__ )
 #endif
-#if defined(NUM_TLCS) && NUM_TLCS >= 0
-  REPORT_NAME_DIGITAL(NUM_TLCS, __LINE__ )
-#endif
 #if PIN_EXISTS(ORIG_E0_AUTO_FAN)
   REPORT_NAME_DIGITAL(ORIG_E0_AUTO_FAN_PIN, __LINE__ )
 #endif
@@ -545,15 +530,9 @@
 #if PIN_EXISTS(SS)
   REPORT_NAME_DIGITAL(SS_PIN, __LINE__ )
 #endif
-#if defined(STAT_LED_BLUE) && STAT_LED_BLUE >= 0
-  REPORT_NAME_DIGITAL(STAT_LED_BLUE, __LINE__ )
-#endif
 #if PIN_EXISTS(STAT_LED_BLUE)
   REPORT_NAME_DIGITAL(STAT_LED_BLUE_PIN, __LINE__ )
 #endif
-#if defined(STAT_LED_RED) && STAT_LED_RED >= 0
-  REPORT_NAME_DIGITAL(STAT_LED_RED, __LINE__ )
-#endif
 #if PIN_EXISTS(STAT_LED_RED)
   REPORT_NAME_DIGITAL(STAT_LED_RED_PIN, __LINE__ )
 #endif
@@ -599,21 +578,12 @@
 #if PIN_EXISTS(THERMO_SCK)
   REPORT_NAME_DIGITAL(THERMO_SCK_PIN, __LINE__ )
 #endif
-#if defined(TLC_BLANK_BIT) && TLC_BLANK_BIT >= 0
-  REPORT_NAME_DIGITAL(TLC_BLANK_BIT, __LINE__ )
-#endif
 #if PIN_EXISTS(TLC_BLANK)
   REPORT_NAME_DIGITAL(TLC_BLANK_PIN, __LINE__ )
 #endif
-#if defined(TLC_CLOCK_BIT) && TLC_CLOCK_BIT >= 0
-  REPORT_NAME_DIGITAL(TLC_CLOCK_BIT, __LINE__ )
-#endif
 #if PIN_EXISTS(TLC_CLOCK)
   REPORT_NAME_DIGITAL(TLC_CLOCK_PIN, __LINE__ )
 #endif
-#if defined(TLC_DATA_BIT) && TLC_DATA_BIT >= 0
-  REPORT_NAME_DIGITAL(TLC_DATA_BIT, __LINE__ )
-#endif
 #if PIN_EXISTS(TLC_DATA)
   REPORT_NAME_DIGITAL(TLC_DATA_PIN, __LINE__ )
 #endif

Marlin/pins_OMCA.h

@@ -111,8 +111,8 @@
 //
 #define SDSS               11
 
-#define I2C_SCL            16
+#define I2C_SCL_PIN        16
-#define I2C_SDA            17
+#define I2C_SDA_PIN        17
 
 // future proofing
 #define __FS  20

Marlin/stepper.cpp

@@ -1099,7 +1099,7 @@ void Stepper::init() {
   ENABLE_STEPPER_DRIVER_INTERRUPT();
 
   #if ENABLED(ADVANCE) || ENABLED(LIN_ADVANCE)
-    ZERO(e_steps);
+    for (uint8_t i = 0; i < COUNT(e_steps); i++) e_steps[i] = 0;
     #if ENABLED(LIN_ADVANCE)
       ZERO(current_adv_steps);
     #endif

Marlin/ubl.cpp

@@ -52,7 +52,7 @@
 
   static void serial_echo_12x_spaces() {
     for (uint8_t i = GRID_MAX_POINTS_X - 1; --i;) {
-      SERIAL_ECHOPGM("            ");
+      SERIAL_ECHO_SP(12);
       safe_delay(10);
     }
   }
@@ -201,12 +201,12 @@
 
     if (map0) {
       serial_echo_xy(UBL_MESH_MIN_X, UBL_MESH_MIN_Y);
-      SERIAL_ECHOPGM("    ");
+      SERIAL_ECHO_SP(4);
       serial_echo_12x_spaces();
       serial_echo_xy(UBL_MESH_MAX_X, UBL_MESH_MIN_Y);
       SERIAL_EOL;
       serial_echo_xy(0, 0);
-      SERIAL_ECHOPGM("       ");
+      SERIAL_ECHO_SP(7);
       serial_echo_12x_spaces();
       serial_echo_xy(GRID_MAX_POINTS_X - 1, 0);
       SERIAL_EOL;

Marlin/ubl_motion.cpp

@@ -250,9 +250,7 @@
     const float m = dy / dx,
                 c = start[Y_AXIS] - m * start[X_AXIS];
 
-    bool inf_normalized_flag, inf_m_flag; 
+    const bool inf_normalized_flag = isinf(e_normalized_dist),
-
-    inf_normalized_flag = isinf(e_normalized_dist);
                inf_m_flag = isinf(m);
 
     /**