Browse Source

Fix axis char printing

Scott Lahteine 4 years ago
parent
commit
1879eede0d

+ 1
- 0
Marlin/src/core/serial.h View File

144
 typedef struct SerialChar { char c; SerialChar(char n) : c(n) { } } serial_char_t;
144
 typedef struct SerialChar { char c; SerialChar(char n) : c(n) { } } serial_char_t;
145
 inline void SERIAL_ECHO(serial_char_t x) { SERIAL_IMPL.write(x.c); }
145
 inline void SERIAL_ECHO(serial_char_t x) { SERIAL_IMPL.write(x.c); }
146
 #define AS_CHAR(C) serial_char_t(C)
146
 #define AS_CHAR(C) serial_char_t(C)
147
+#define AS_DIGIT(C) AS_CHAR('0' + (C))
147
 
148
 
148
 // SERIAL_ECHO_F prints a floating point value with optional precision
149
 // SERIAL_ECHO_F prints a floating point value with optional precision
149
 inline void SERIAL_ECHO_F(EnsureDouble x, int digit=2) { SERIAL_IMPL.print(x, digit); }
150
 inline void SERIAL_ECHO_F(EnsureDouble x, int digit=2) { SERIAL_IMPL.print(x, digit); }

+ 8
- 8
Marlin/src/feature/fwretract.cpp View File

111
 
111
 
112
   /* // debugging
112
   /* // debugging
113
     SERIAL_ECHOLNPAIR(
113
     SERIAL_ECHOLNPAIR(
114
-      "retracting ", retracting,
114
+      "retracting ", AS_DIGIT(retracting),
115
       " swapping ", swapping,
115
       " swapping ", swapping,
116
       " active extruder ", active_extruder
116
       " active extruder ", active_extruder
117
     );
117
     );
118
     LOOP_L_N(i, EXTRUDERS) {
118
     LOOP_L_N(i, EXTRUDERS) {
119
-      SERIAL_ECHOLNPAIR("retracted[", i, "] ", retracted[i]);
119
+      SERIAL_ECHOLNPAIR("retracted[", i, "] ", AS_DIGIT(retracted[i]));
120
       #if HAS_MULTI_EXTRUDER
120
       #if HAS_MULTI_EXTRUDER
121
-        SERIAL_ECHOLNPAIR("retracted_swap[", i, "] ", retracted_swap[i]);
121
+        SERIAL_ECHOLNPAIR("retracted_swap[", i, "] ", AS_DIGIT(retracted_swap[i]));
122
       #endif
122
       #endif
123
     }
123
     }
124
     SERIAL_ECHOLNPAIR("current_position.z ", current_position.z);
124
     SERIAL_ECHOLNPAIR("current_position.z ", current_position.z);
185
   #endif
185
   #endif
186
 
186
 
187
   /* // debugging
187
   /* // debugging
188
-    SERIAL_ECHOLNPAIR("retracting ", retracting);
189
-    SERIAL_ECHOLNPAIR("swapping ", swapping);
188
+    SERIAL_ECHOLNPAIR("retracting ", AS_DIGIT(retracting));
189
+    SERIAL_ECHOLNPAIR("swapping ", AS_DIGIT(swapping));
190
     SERIAL_ECHOLNPAIR("active_extruder ", active_extruder);
190
     SERIAL_ECHOLNPAIR("active_extruder ", active_extruder);
191
     LOOP_L_N(i, EXTRUDERS) {
191
     LOOP_L_N(i, EXTRUDERS) {
192
-      SERIAL_ECHOLNPAIR("retracted[", i, "] ", retracted[i]);
192
+      SERIAL_ECHOLNPAIR("retracted[", i, "] ", AS_DIGIT(retracted[i]));
193
       #if HAS_MULTI_EXTRUDER
193
       #if HAS_MULTI_EXTRUDER
194
-        SERIAL_ECHOLNPAIR("retracted_swap[", i, "] ", retracted_swap[i]);
194
+        SERIAL_ECHOLNPAIR("retracted_swap[", i, "] ", AS_DIGIT(retracted_swap[i]));
195
       #endif
195
       #endif
196
     }
196
     }
197
     SERIAL_ECHOLNPAIR("current_position.z ", current_position.z);
197
     SERIAL_ECHOLNPAIR("current_position.z ", current_position.z);
268
 
268
 
269
   void FWRetract::M209_report(const bool forReplay/*=false*/) {
269
   void FWRetract::M209_report(const bool forReplay/*=false*/) {
270
     if (!forReplay) { SERIAL_ECHO_MSG("; Auto-Retract: S=0 to disable, 1 to interpret E-only moves as retract/recover"); SERIAL_ECHO_START(); }
270
     if (!forReplay) { SERIAL_ECHO_MSG("; Auto-Retract: S=0 to disable, 1 to interpret E-only moves as retract/recover"); SERIAL_ECHO_START(); }
271
-    SERIAL_ECHOLNPAIR("  M209 S", autoretract_enabled);
271
+    SERIAL_ECHOLNPAIR("  M209 S", AS_DIGIT(autoretract_enabled));
272
   }
272
   }
273
 
273
 
274
 #endif // FWRETRACT_AUTORETRACT
274
 #endif // FWRETRACT_AUTORETRACT

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

612
         DEBUG_ECHOLNPAIR("sd_filename: ", info.sd_filename);
612
         DEBUG_ECHOLNPAIR("sd_filename: ", info.sd_filename);
613
         DEBUG_ECHOLNPAIR("sdpos: ", info.sdpos);
613
         DEBUG_ECHOLNPAIR("sdpos: ", info.sdpos);
614
         DEBUG_ECHOLNPAIR("print_job_elapsed: ", info.print_job_elapsed);
614
         DEBUG_ECHOLNPAIR("print_job_elapsed: ", info.print_job_elapsed);
615
-        DEBUG_ECHOLNPAIR("dryrun: ", info.flag.dryrun);
615
+        DEBUG_ECHOLNPAIR("dryrun: ", AS_DIGIT(info.flag.dryrun));
616
         DEBUG_ECHOLNPAIR("allow_cold_extrusion: ", info.flag.allow_cold_extrusion);
616
         DEBUG_ECHOLNPAIR("allow_cold_extrusion: ", info.flag.allow_cold_extrusion);
617
       }
617
       }
618
       else
618
       else

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

43
       if (parser.seen(XYZ_CHAR(i))) {
43
       if (parser.seen(XYZ_CHAR(i))) {
44
         const float v = parser.value_linear_units();
44
         const float v = parser.value_linear_units();
45
         if (v * Z_HOME_DIR <= 0) delta_endstop_adj[i] = v;
45
         if (v * Z_HOME_DIR <= 0) delta_endstop_adj[i] = v;
46
-        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("delta_endstop_adj[", XYZ_CHAR(i), "] = ", delta_endstop_adj[i]);
46
+        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("delta_endstop_adj[", AS_CHAR(XYZ_CHAR(i)), "] = ", delta_endstop_adj[i]);
47
       }
47
       }
48
     }
48
     }
49
   }
49
   }

+ 1
- 1
Marlin/src/gcode/control/M605.cpp View File

141
 
141
 
142
         HOTEND_LOOP() {
142
         HOTEND_LOOP() {
143
           DEBUG_ECHOPAIR_P(SP_T_STR, e);
143
           DEBUG_ECHOPAIR_P(SP_T_STR, e);
144
-          LOOP_XYZ(a) DEBUG_ECHOPAIR("  hotend_offset[", e, "].", XYZ_CHAR(a) | 0x20, "=", hotend_offset[e][a]);
144
+          LOOP_XYZ(a) DEBUG_ECHOPAIR("  hotend_offset[", e, "].", AS_CHAR(XYZ_CHAR(a) | 0x20), "=", hotend_offset[e][a]);
145
           DEBUG_EOL();
145
           DEBUG_EOL();
146
         }
146
         }
147
         DEBUG_EOL();
147
         DEBUG_EOL();

+ 1
- 1
Marlin/src/gcode/parser.cpp View File

307
 
307
 
308
       #if ENABLED(DEBUG_GCODE_PARSER)
308
       #if ENABLED(DEBUG_GCODE_PARSER)
309
         if (debug) {
309
         if (debug) {
310
-          SERIAL_ECHOPAIR("Got param ", param, " at index ", p - command_ptr - 1);
310
+          SERIAL_ECHOPAIR("Got param ", AS_CHAR(param), " at index ", p - command_ptr - 1);
311
           if (has_val) SERIAL_ECHOPGM(" (has_val)");
311
           if (has_val) SERIAL_ECHOPGM(" (has_val)");
312
         }
312
         }
313
       #endif
313
       #endif

+ 1
- 1
Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.cpp View File

639
           float newposition = atof(&panel_command[6]);
639
           float newposition = atof(&panel_command[6]);
640
 
640
 
641
           #if ACDEBUG(AC_ACTION)
641
           #if ACDEBUG(AC_ACTION)
642
-            SERIAL_ECHOLNPAIR("Nudge ", panel_command[4], " axis ", newposition);
642
+            SERIAL_ECHOLNPAIR("Nudge ", AS_CHAR(panel_command[4]), " axis ", newposition);
643
           #endif
643
           #endif
644
 
644
 
645
           switch (panel_command[4]) {
645
           switch (panel_command[4]) {

+ 3
- 3
Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSScreenHandler.cpp View File

188
 
188
 
189
   if (!movevalue) {
189
   if (!movevalue) {
190
     // homing
190
     // homing
191
-    DEBUG_ECHOPAIR(" homing ", axiscode);
191
+    DEBUG_ECHOPAIR(" homing ", AS_CHAR(axiscode));
192
     char buf[6] = "G28 X";
192
     char buf[6] = "G28 X";
193
     buf[4] = axiscode;
193
     buf[4] = axiscode;
194
     //DEBUG_ECHOPAIR(" ", buf);
194
     //DEBUG_ECHOPAIR(" ", buf);
199
   }
199
   }
200
   else {
200
   else {
201
     // movement
201
     // movement
202
-    DEBUG_ECHOPAIR(" move ", axiscode);
202
+    DEBUG_ECHOPAIR(" move ", AS_CHAR(axiscode));
203
     bool old_relative_mode = relative_mode;
203
     bool old_relative_mode = relative_mode;
204
     if (!relative_mode) {
204
     if (!relative_mode) {
205
       //DEBUG_ECHOPGM(" G91");
205
       //DEBUG_ECHOPGM(" G91");
235
   return;
235
   return;
236
 
236
 
237
   cannotmove:
237
   cannotmove:
238
-    DEBUG_ECHOLNPAIR(" cannot move ", axiscode);
238
+    DEBUG_ECHOLNPAIR(" cannot move ", AS_CHAR(axiscode));
239
     return;
239
     return;
240
 }
240
 }
241
 
241
 

+ 3
- 3
Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSScreenHandler.cpp View File

188
 
188
 
189
   if (!movevalue) {
189
   if (!movevalue) {
190
     // homing
190
     // homing
191
-    DEBUG_ECHOPAIR(" homing ", axiscode);
191
+    DEBUG_ECHOPAIR(" homing ", AS_CHAR(axiscode));
192
     char buf[6] = "G28 X";
192
     char buf[6] = "G28 X";
193
     buf[4] = axiscode;
193
     buf[4] = axiscode;
194
     //DEBUG_ECHOPAIR(" ", buf);
194
     //DEBUG_ECHOPAIR(" ", buf);
199
   }
199
   }
200
   else {
200
   else {
201
     // movement
201
     // movement
202
-    DEBUG_ECHOPAIR(" move ", axiscode);
202
+    DEBUG_ECHOPAIR(" move ", AS_CHAR(axiscode));
203
     bool old_relative_mode = relative_mode;
203
     bool old_relative_mode = relative_mode;
204
     if (!relative_mode) {
204
     if (!relative_mode) {
205
       //DEBUG_ECHOPGM(" G91");
205
       //DEBUG_ECHOPGM(" G91");
235
   return;
235
   return;
236
 
236
 
237
   cannotmove:
237
   cannotmove:
238
-    DEBUG_ECHOLNPAIR(" cannot move ", axiscode);
238
+    DEBUG_ECHOLNPAIR(" cannot move ", AS_CHAR(axiscode));
239
     return;
239
     return;
240
 }
240
 }
241
 
241
 

+ 4
- 4
Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.cpp View File

835
 
835
 
836
   if (!movevalue) {
836
   if (!movevalue) {
837
     // homing
837
     // homing
838
-    DEBUG_ECHOPAIR(" homing ", axiscode);
838
+    DEBUG_ECHOPAIR(" homing ", AS_CHAR(axiscode));
839
     // char buf[6] = "G28 X";
839
     // char buf[6] = "G28 X";
840
     // buf[4] = axiscode;
840
     // buf[4] = axiscode;
841
 
841
 
850
   else if (movevalue == 5) {
850
   else if (movevalue == 5) {
851
     DEBUG_ECHOPAIR("send M84");
851
     DEBUG_ECHOPAIR("send M84");
852
     char buf[6];
852
     char buf[6];
853
-    snprintf_P(buf,6,PSTR("M84 %c"),axiscode);
853
+    snprintf_P(buf,6,PSTR("M84 %c"), axiscode);
854
     queue.enqueue_one_now(buf);
854
     queue.enqueue_one_now(buf);
855
     ForceCompleteUpdate();
855
     ForceCompleteUpdate();
856
     return;
856
     return;
857
   }
857
   }
858
   else {
858
   else {
859
     // movement
859
     // movement
860
-    DEBUG_ECHOPAIR(" move ", axiscode);
860
+    DEBUG_ECHOPAIR(" move ", AS_CHAR(axiscode));
861
     bool old_relative_mode = relative_mode;
861
     bool old_relative_mode = relative_mode;
862
 
862
 
863
     if (!relative_mode) {
863
     if (!relative_mode) {
895
   return;
895
   return;
896
 
896
 
897
   cannotmove:
897
   cannotmove:
898
-    DEBUG_ECHOLNPAIR(" cannot move ", axiscode);
898
+    DEBUG_ECHOLNPAIR(" cannot move ", AS_CHAR(axiscode));
899
     return;
899
     return;
900
 }
900
 }
901
 
901
 

+ 3
- 3
Marlin/src/lcd/extui/lib/dgus/origin/DGUSScreenHandler.cpp View File

188
 
188
 
189
   if (!movevalue) {
189
   if (!movevalue) {
190
     // homing
190
     // homing
191
-    DEBUG_ECHOPAIR(" homing ", axiscode);
191
+    DEBUG_ECHOPAIR(" homing ", AS_CHAR(axiscode));
192
     char buf[6] = "G28 X";
192
     char buf[6] = "G28 X";
193
     buf[4] = axiscode;
193
     buf[4] = axiscode;
194
     //DEBUG_ECHOPAIR(" ", buf);
194
     //DEBUG_ECHOPAIR(" ", buf);
199
   }
199
   }
200
   else {
200
   else {
201
     // movement
201
     // movement
202
-    DEBUG_ECHOPAIR(" move ", axiscode);
202
+    DEBUG_ECHOPAIR(" move ", AS_CHAR(axiscode));
203
     bool old_relative_mode = relative_mode;
203
     bool old_relative_mode = relative_mode;
204
     if (!relative_mode) {
204
     if (!relative_mode) {
205
       //DEBUG_ECHOPGM(" G91");
205
       //DEBUG_ECHOPGM(" G91");
235
   return;
235
   return;
236
 
236
 
237
   cannotmove:
237
   cannotmove:
238
-    DEBUG_ECHOLNPAIR(" cannot move ", axiscode);
238
+    DEBUG_ECHOLNPAIR(" cannot move ", AS_CHAR(axiscode));
239
     return;
239
     return;
240
 }
240
 }
241
 
241
 

+ 4
- 4
Marlin/src/lcd/extui/lib/nextion/nextion_tft.cpp View File

144
     #if NEXDEBUG(N_SOME)
144
     #if NEXDEBUG(N_SOME)
145
       uint8_t req = atoi(&nextion_command[1]);
145
       uint8_t req = atoi(&nextion_command[1]);
146
       if (req > 7 && req != 20)
146
       if (req > 7 && req != 20)
147
-        DEBUG_ECHOLNPAIR(  "> ", nextion_command[0],
148
-                         "\n> ", nextion_command[1],
149
-                         "\n> ", nextion_command[2],
150
-                         "\n> ", nextion_command[3],
147
+        DEBUG_ECHOLNPAIR(  "> ", AS_CHAR(nextion_command[0]),
148
+                         "\n> ", AS_CHAR(nextion_command[1]),
149
+                         "\n> ", AS_CHAR(nextion_command[2]),
150
+                         "\n> ", AS_CHAR(nextion_command[3]),
151
                          "\nprinter_state:", printer_state);
151
                          "\nprinter_state:", printer_state);
152
     #endif
152
     #endif
153
   }
153
   }

+ 2
- 2
Marlin/src/lcd/marlinui.cpp View File

761
         // For Cartesian / Core motion simply move to the current_position
761
         // For Cartesian / Core motion simply move to the current_position
762
         planner.buffer_line(current_position, fr_mm_s, axis == E_AXIS ? e_index : active_extruder);
762
         planner.buffer_line(current_position, fr_mm_s, axis == E_AXIS ? e_index : active_extruder);
763
 
763
 
764
-        //SERIAL_ECHOLNPAIR("Add planner.move with Axis ", axis, " at FR ", fr_mm_s);
764
+        //SERIAL_ECHOLNPAIR("Add planner.move with Axis ", AS_CHAR(axis_codes[axis]), " at FR ", fr_mm_s);
765
 
765
 
766
         axis = NO_AXIS;
766
         axis = NO_AXIS;
767
 
767
 
782
     #endif
782
     #endif
783
     start_time = millis() + (menu_scale < 0.99f ? 0UL : 250UL); // delay for bigger moves
783
     start_time = millis() + (menu_scale < 0.99f ? 0UL : 250UL); // delay for bigger moves
784
     axis = move_axis;
784
     axis = move_axis;
785
-    //SERIAL_ECHOLNPAIR("Post Move with Axis ", axis, " soon.");
785
+    //SERIAL_ECHOLNPAIR("Post Move with Axis ", AS_CHAR(axis_codes[axis]), " soon.");
786
   }
786
   }
787
 
787
 
788
   #if ENABLED(AUTO_BED_LEVELING_UBL)
788
   #if ENABLED(AUTO_BED_LEVELING_UBL)

+ 10
- 10
Marlin/src/module/motion.cpp View File

622
     #endif
622
     #endif
623
 
623
 
624
     if (DEBUGGING(LEVELING))
624
     if (DEBUGGING(LEVELING))
625
-      SERIAL_ECHOLNPAIR("Axis ", XYZ_CHAR(axis), " min:", soft_endstop.min[axis], " max:", soft_endstop.max[axis]);
625
+      SERIAL_ECHOLNPAIR("Axis ", AS_CHAR(XYZ_CHAR(axis)), " min:", soft_endstop.min[axis], " max:", soft_endstop.max[axis]);
626
   }
626
   }
627
 
627
 
628
   /**
628
   /**
1392
    * "trusted" position).
1392
    * "trusted" position).
1393
    */
1393
    */
1394
   void set_axis_never_homed(const AxisEnum axis) {
1394
   void set_axis_never_homed(const AxisEnum axis) {
1395
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(">>> set_axis_never_homed(", axis_codes[axis], ")");
1395
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(">>> set_axis_never_homed(", AS_CHAR(axis_codes[axis]), ")");
1396
 
1396
 
1397
     set_axis_untrusted(axis);
1397
     set_axis_untrusted(axis);
1398
     set_axis_unhomed(axis);
1398
     set_axis_unhomed(axis);
1399
 
1399
 
1400
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("<<< set_axis_never_homed(", axis_codes[axis], ")");
1400
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("<<< set_axis_never_homed(", AS_CHAR(axis_codes[axis]), ")");
1401
 
1401
 
1402
     TERN_(I2C_POSITION_ENCODERS, I2CPEM.unhomed(axis));
1402
     TERN_(I2C_POSITION_ENCODERS, I2CPEM.unhomed(axis));
1403
   }
1403
   }
1458
       if (ABS(phaseDelta) * planner.steps_to_mm[axis] / phasePerUStep < 0.05f)
1458
       if (ABS(phaseDelta) * planner.steps_to_mm[axis] / phasePerUStep < 0.05f)
1459
         SERIAL_ECHOLNPAIR("Selected home phase ", home_phase[axis],
1459
         SERIAL_ECHOLNPAIR("Selected home phase ", home_phase[axis],
1460
                          " too close to endstop trigger phase ", phaseCurrent,
1460
                          " too close to endstop trigger phase ", phaseCurrent,
1461
-                         ". Pick a different phase for ", axis_codes[axis]);
1461
+                         ". Pick a different phase for ", AS_CHAR(axis_codes[axis]));
1462
 
1462
 
1463
       // Skip to next if target position is behind current. So it only moves away from endstop.
1463
       // Skip to next if target position is behind current. So it only moves away from endstop.
1464
       if (phaseDelta < 0) phaseDelta += 1024;
1464
       if (phaseDelta < 0) phaseDelta += 1024;
1469
       // Optional debug messages
1469
       // Optional debug messages
1470
       if (DEBUGGING(LEVELING)) {
1470
       if (DEBUGGING(LEVELING)) {
1471
         DEBUG_ECHOLNPAIR(
1471
         DEBUG_ECHOLNPAIR(
1472
-          "Endstop ", axis_codes[axis], " hit at Phase:", phaseCurrent,
1472
+          "Endstop ", AS_CHAR(axis_codes[axis]), " hit at Phase:", phaseCurrent,
1473
           " Delta:", phaseDelta, " Distance:", mmDelta
1473
           " Delta:", phaseDelta, " Distance:", mmDelta
1474
         );
1474
         );
1475
       }
1475
       }
1507
       if (!_CAN_HOME(X) && !_CAN_HOME(Y) && !_CAN_HOME(Z)) return;
1507
       if (!_CAN_HOME(X) && !_CAN_HOME(Y) && !_CAN_HOME(Z)) return;
1508
     #endif
1508
     #endif
1509
 
1509
 
1510
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(">>> homeaxis(", axis_codes[axis], ")");
1510
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(">>> homeaxis(", AS_CHAR(axis_codes[axis]), ")");
1511
 
1511
 
1512
     const int axis_home_dir = TERN0(DUAL_X_CARRIAGE, axis == X_AXIS)
1512
     const int axis_home_dir = TERN0(DUAL_X_CARRIAGE, axis == X_AXIS)
1513
                 ? x_home_dir(active_extruder) : home_dir(axis);
1513
                 ? x_home_dir(active_extruder) : home_dir(axis);
1585
           case Z_AXIS: es = Z_ENDSTOP; break;
1585
           case Z_AXIS: es = Z_ENDSTOP; break;
1586
         }
1586
         }
1587
         if (TEST(endstops.state(), es)) {
1587
         if (TEST(endstops.state(), es)) {
1588
-          SERIAL_ECHO_MSG("Bad ", axis_codes[axis], " Endstop?");
1588
+          SERIAL_ECHO_MSG("Bad ", AS_CHAR(axis_codes[axis]), " Endstop?");
1589
           kill(GET_TEXT(MSG_KILL_HOMING_FAILED));
1589
           kill(GET_TEXT(MSG_KILL_HOMING_FAILED));
1590
         }
1590
         }
1591
       #endif
1591
       #endif
1807
       if (axis == Z_AXIS) fwretract.current_hop = 0.0;
1807
       if (axis == Z_AXIS) fwretract.current_hop = 0.0;
1808
     #endif
1808
     #endif
1809
 
1809
 
1810
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("<<< homeaxis(", axis_codes[axis], ")");
1810
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("<<< homeaxis(", AS_CHAR(axis_codes[axis]), ")");
1811
 
1811
 
1812
   } // homeaxis()
1812
   } // homeaxis()
1813
 
1813
 
1885
       DEBUG_ECHOLNPAIR("> home_offset[", AS_CHAR(axis_codes[axis]), "] = ", home_offset[axis]);
1885
       DEBUG_ECHOLNPAIR("> home_offset[", AS_CHAR(axis_codes[axis]), "] = ", home_offset[axis]);
1886
     #endif
1886
     #endif
1887
     DEBUG_POS("", current_position);
1887
     DEBUG_POS("", current_position);
1888
-    DEBUG_ECHOLNPAIR("<<< set_axis_is_at_home(", axis_codes[axis], ")");
1888
+    DEBUG_ECHOLNPAIR("<<< set_axis_is_at_home(", AS_CHAR(axis_codes[axis]), ")");
1889
   }
1889
   }
1890
 }
1890
 }
1891
 
1891
 
1892
 #if HAS_WORKSPACE_OFFSET
1892
 #if HAS_WORKSPACE_OFFSET
1893
   void update_workspace_offset(const AxisEnum axis) {
1893
   void update_workspace_offset(const AxisEnum axis) {
1894
     workspace_offset[axis] = home_offset[axis] + position_shift[axis];
1894
     workspace_offset[axis] = home_offset[axis] + position_shift[axis];
1895
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Axis ", XYZ_CHAR(axis), " home_offset = ", home_offset[axis], " position_shift = ", position_shift[axis]);
1895
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Axis ", AS_CHAR(XYZ_CHAR(axis)), " home_offset = ", home_offset[axis], " position_shift = ", position_shift[axis]);
1896
   }
1896
   }
1897
 #endif
1897
 #endif
1898
 
1898
 

Loading…
Cancel
Save