Browse Source

Fix some serial echos of pin states

Scott Lahteine 6 years ago
parent
commit
6cf8d40f41
2 changed files with 31 additions and 31 deletions
  1. 27
    27
      Marlin/src/module/stepper.cpp
  2. 4
    4
      Marlin/src/pins/pinsDebug.h

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

@@ -2820,74 +2820,74 @@ void Stepper::report_positions() {
2820 2820
   void Stepper::microstep_readings() {
2821 2821
     SERIAL_ECHOPGM("MS1,MS2,MS3 Pins\nX: ");
2822 2822
     #if HAS_X_MICROSTEPS
2823
-      SERIAL_ECHO(READ(X_MS1_PIN));
2824
-      SERIAL_ECHO(READ(X_MS2_PIN));
2823
+      SERIAL_CHAR('0' + READ(X_MS1_PIN));
2824
+      SERIAL_CHAR('0' + READ(X_MS2_PIN));
2825 2825
       #if PIN_EXISTS(X_MS3)
2826
-        SERIAL_ECHOLN(READ(X_MS3_PIN));
2826
+        SERIAL_ECHOLN((int)READ(X_MS3_PIN));
2827 2827
       #endif
2828 2828
     #endif
2829 2829
     #if HAS_Y_MICROSTEPS
2830 2830
       SERIAL_ECHOPGM("Y: ");
2831
-      SERIAL_ECHO(READ(Y_MS1_PIN));
2832
-      SERIAL_ECHO(READ(Y_MS2_PIN));
2831
+      SERIAL_CHAR('0' + READ(Y_MS1_PIN));
2832
+      SERIAL_CHAR('0' + READ(Y_MS2_PIN));
2833 2833
       #if PIN_EXISTS(Y_MS3)
2834
-        SERIAL_ECHOLN(READ(Y_MS3_PIN));
2834
+        SERIAL_ECHOLN((int)READ(Y_MS3_PIN));
2835 2835
       #endif
2836 2836
     #endif
2837 2837
     #if HAS_Z_MICROSTEPS
2838 2838
       SERIAL_ECHOPGM("Z: ");
2839
-      SERIAL_ECHO(READ(Z_MS1_PIN));
2840
-      SERIAL_ECHO(READ(Z_MS2_PIN));
2839
+      SERIAL_CHAR('0' + READ(Z_MS1_PIN));
2840
+      SERIAL_CHAR('0' + READ(Z_MS2_PIN));
2841 2841
       #if PIN_EXISTS(Z_MS3)
2842
-        SERIAL_ECHOLN(READ(Z_MS3_PIN));
2842
+        SERIAL_ECHOLN((int)READ(Z_MS3_PIN));
2843 2843
       #endif
2844 2844
     #endif
2845 2845
     #if HAS_E0_MICROSTEPS
2846 2846
       SERIAL_ECHOPGM("E0: ");
2847
-      SERIAL_ECHO(READ(E0_MS1_PIN));
2848
-      SERIAL_ECHO(READ(E0_MS2_PIN));
2847
+      SERIAL_CHAR('0' + READ(E0_MS1_PIN));
2848
+      SERIAL_CHAR('0' + READ(E0_MS2_PIN));
2849 2849
       #if PIN_EXISTS(E0_MS3)
2850
-        SERIAL_ECHOLN(READ(E0_MS3_PIN));
2850
+        SERIAL_ECHOLN((int)READ(E0_MS3_PIN));
2851 2851
       #endif
2852 2852
     #endif
2853 2853
     #if HAS_E1_MICROSTEPS
2854 2854
       SERIAL_ECHOPGM("E1: ");
2855
-      SERIAL_ECHO(READ(E1_MS1_PIN));
2856
-      SERIAL_ECHO(READ(E1_MS2_PIN));
2855
+      SERIAL_CHAR('0' + READ(E1_MS1_PIN));
2856
+      SERIAL_CHAR('0' + READ(E1_MS2_PIN));
2857 2857
       #if PIN_EXISTS(E1_MS3)
2858
-        SERIAL_ECHOLN(READ(E1_MS3_PIN));
2858
+        SERIAL_ECHOLN((int)READ(E1_MS3_PIN));
2859 2859
       #endif
2860 2860
     #endif
2861 2861
     #if HAS_E2_MICROSTEPS
2862 2862
       SERIAL_ECHOPGM("E2: ");
2863
-      SERIAL_ECHO(READ(E2_MS1_PIN));
2864
-      SERIAL_ECHO(READ(E2_MS2_PIN));
2863
+      SERIAL_CHAR('0' + READ(E2_MS1_PIN));
2864
+      SERIAL_CHAR('0' + READ(E2_MS2_PIN));
2865 2865
       #if PIN_EXISTS(E2_MS3)
2866
-        SERIAL_ECHOLN(READ(E2_MS3_PIN));
2866
+        SERIAL_ECHOLN((int)READ(E2_MS3_PIN));
2867 2867
       #endif
2868 2868
     #endif
2869 2869
     #if HAS_E3_MICROSTEPS
2870 2870
       SERIAL_ECHOPGM("E3: ");
2871
-      SERIAL_ECHO(READ(E3_MS1_PIN));
2872
-      SERIAL_ECHO(READ(E3_MS2_PIN));
2871
+      SERIAL_CHAR('0' + READ(E3_MS1_PIN));
2872
+      SERIAL_CHAR('0' + READ(E3_MS2_PIN));
2873 2873
       #if PIN_EXISTS(E3_MS3)
2874
-        SERIAL_ECHOLN(READ(E3_MS3_PIN));
2874
+        SERIAL_ECHOLN((int)READ(E3_MS3_PIN));
2875 2875
       #endif
2876 2876
     #endif
2877 2877
     #if HAS_E4_MICROSTEPS
2878 2878
       SERIAL_ECHOPGM("E4: ");
2879
-      SERIAL_ECHO(READ(E4_MS1_PIN));
2880
-      SERIAL_ECHO(READ(E4_MS2_PIN));
2879
+      SERIAL_CHAR('0' + READ(E4_MS1_PIN));
2880
+      SERIAL_CHAR('0' + READ(E4_MS2_PIN));
2881 2881
       #if PIN_EXISTS(E4_MS3)
2882
-        SERIAL_ECHOLN(READ(E4_MS3_PIN));
2882
+        SERIAL_ECHOLN((int)READ(E4_MS3_PIN));
2883 2883
       #endif
2884 2884
     #endif
2885 2885
     #if HAS_E5_MICROSTEPS
2886 2886
       SERIAL_ECHOPGM("E5: ");
2887
-      SERIAL_ECHO(READ(E5_MS1_PIN));
2888
-      SERIAL_ECHOLN(READ(E5_MS2_PIN));
2887
+      SERIAL_CHAR('0' + READ(E5_MS1_PIN));
2888
+      SERIAL_ECHOLN((int)READ(E5_MS2_PIN));
2889 2889
       #if PIN_EXISTS(E5_MS3)
2890
-        SERIAL_ECHOLN(READ(E5_MS3_PIN));
2890
+        SERIAL_ECHOLN((int)READ(E5_MS3_PIN));
2891 2891
       #endif
2892 2892
     #endif
2893 2893
   }

+ 4
- 4
Marlin/src/pins/pinsDebug.h View File

@@ -140,11 +140,11 @@ inline void report_pin_state_extended(pin_t pin, bool ignore, bool extended = fa
140 140
             if (pin == 46 || pin == 47) {
141 141
               if (pin == 46) {
142 142
                 print_input_or_output(GET_OUTPUT(46));
143
-                SERIAL_ECHO(READ(46));
143
+                SERIAL_CHAR('0' + READ(46));
144 144
               }
145 145
               else if (pin == 47) {
146 146
                 print_input_or_output(GET_OUTPUT(47));
147
-                SERIAL_ECHO(READ(47));
147
+                SERIAL_CHAR('0' + READ(47));
148 148
               }
149 149
             }
150 150
             else
@@ -196,11 +196,11 @@ inline void report_pin_state_extended(pin_t pin, bool ignore, bool extended = fa
196 196
           SERIAL_ECHO_SP(12);
197 197
           if (pin == 46) {
198 198
             print_input_or_output(GET_OUTPUT(46));
199
-            SERIAL_ECHO(READ(46));
199
+            SERIAL_CHAR('0' + READ(46));
200 200
           }
201 201
           else {
202 202
             print_input_or_output(GET_OUTPUT(47));
203
-            SERIAL_ECHO(READ(47));
203
+            SERIAL_CHAR('0' + READ(47));
204 204
           }
205 205
         }
206 206
         else

Loading…
Cancel
Save