🎨 Misc. 9-axis cleanup

rwoelk · Apr 10, 2022 · 6567e0e · 6567e0e
1 parent fc50018
commit 6567e0e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
@@ -375,7 +375,7 @@ void GcodeSuite::G28() {
                  homeZZ = homeZ,
                  homeI = needI || parser.seen_test(AXIS4_NAME), homeJ = needJ || parser.seen_test(AXIS5_NAME),
                  homeK = needK || parser.seen_test(AXIS6_NAME), homeU = needU || parser.seen_test(AXIS7_NAME),
-                 homeV = needV || parser.seen_test(AXIS8_NAME), homeW = needW || parser.seen_test(AXIS9_NAME),
+                 homeV = needV || parser.seen_test(AXIS8_NAME), homeW = needW || parser.seen_test(AXIS9_NAME)
                ),
                home_all = NUM_AXIS_GANG(   // Home-all if all or none are flagged
                     homeX == homeX, && homeY == homeX, && homeZ == homeX,

diff --git a/Marlin/src/gcode/config/M217.cpp b/Marlin/src/gcode/config/M217.cpp
@@ -192,7 +192,7 @@ void GcodeSuite::M217_report(const bool forReplay/*=true*/) {
               PSTR(" K"), K_AXIS_UNIT(toolchange_settings.change_point.k),
               SP_C_STR,   U_AXIS_UNIT(toolchange_settings.change_point.u),
               PSTR(" H"), V_AXIS_UNIT(toolchange_settings.change_point.v),
-              PSTR(" O"), W_AXIS_UNIT(toolchange_settings.change_point.w),
+              PSTR(" O"), W_AXIS_UNIT(toolchange_settings.change_point.w)
             )
         #endif
       );

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screen_data.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screen_data.h
@@ -45,7 +45,7 @@
  */
 #define __DECL_DATA_IF_INCLUDED(CLASS) struct CLASS ## Data CLASS ;
 #define _DECL_DATA_IF_INCLUDED(CLASS) __DECL_DATA_IF_INCLUDED(CLASS)
-#define DECL_DATA_IF_INCLUDED(HEADER) TERN(HEADER, _DECL_DATA_IF_INCLUDED(HEADER ## _CLASS), )
+#define DECL_DATA_IF_INCLUDED(HEADER) TERN_(HEADER, _DECL_DATA_IF_INCLUDED(HEADER ## _CLASS))
 
 union screen_data_t {
   DECL_DATA_IF_INCLUDED(FTDI_INTERFACE_SETTINGS_SCREEN)

diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
@@ -933,7 +933,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
               current_position.k = toolchange_settings.change_point.k,
               current_position.u = toolchange_settings.change_point.u,
               current_position.v = toolchange_settings.change_point.v,
-              current_position.w = toolchange_settings.change_point.w,
+              current_position.w = toolchange_settings.change_point.w
             );
           #endif
           planner.buffer_line(current_position, MMM_TO_MMS(TOOLCHANGE_PARK_XY_FEEDRATE), active_extruder);
@@ -1138,7 +1138,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
               current_position.k = toolchange_settings.change_point.k,
               current_position.u = toolchange_settings.change_point.u,
               current_position.v = toolchange_settings.change_point.v,
-              current_position.w = toolchange_settings.change_point.w,
+              current_position.w = toolchange_settings.change_point.w
             );
           #endif
           planner.buffer_line(current_position, MMM_TO_MMS(TOOLCHANGE_PARK_XY_FEEDRATE), old_tool);