Skip to content

Commit 103f7c6

Browse files
thinkyheadLCh-77
authored andcommitted
🎨 Misc. 9-axis cleanup
1 parent c9731ce commit 103f7c6

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

Marlin/src/gcode/calibrate/G28.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ void GcodeSuite::G28() {
375375
homeZZ = homeZ,
376376
homeI = needI || parser.seen_test(AXIS4_NAME), homeJ = needJ || parser.seen_test(AXIS5_NAME),
377377
homeK = needK || parser.seen_test(AXIS6_NAME), homeU = needU || parser.seen_test(AXIS7_NAME),
378-
homeV = needV || parser.seen_test(AXIS8_NAME), homeW = needW || parser.seen_test(AXIS9_NAME),
378+
homeV = needV || parser.seen_test(AXIS8_NAME), homeW = needW || parser.seen_test(AXIS9_NAME)
379379
),
380380
home_all = NUM_AXIS_GANG( // Home-all if all or none are flagged
381381
homeX == homeX, && homeY == homeX, && homeZ == homeX,

Marlin/src/gcode/config/M217.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ void GcodeSuite::M217_report(const bool forReplay/*=true*/) {
192192
PSTR(" K"), K_AXIS_UNIT(toolchange_settings.change_point.k),
193193
SP_C_STR, U_AXIS_UNIT(toolchange_settings.change_point.u),
194194
PSTR(" H"), V_AXIS_UNIT(toolchange_settings.change_point.v),
195-
PSTR(" O"), W_AXIS_UNIT(toolchange_settings.change_point.w),
195+
PSTR(" O"), W_AXIS_UNIT(toolchange_settings.change_point.w)
196196
)
197197
#endif
198198
);

Marlin/src/lcd/extui/ftdi_eve_touch_ui/screen_data.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
*/
4646
#define __DECL_DATA_IF_INCLUDED(CLASS) struct CLASS ## Data CLASS ;
4747
#define _DECL_DATA_IF_INCLUDED(CLASS) __DECL_DATA_IF_INCLUDED(CLASS)
48-
#define DECL_DATA_IF_INCLUDED(HEADER) TERN(HEADER, _DECL_DATA_IF_INCLUDED(HEADER ## _CLASS), )
48+
#define DECL_DATA_IF_INCLUDED(HEADER) TERN_(HEADER, _DECL_DATA_IF_INCLUDED(HEADER ## _CLASS))
4949

5050
union screen_data_t {
5151
DECL_DATA_IF_INCLUDED(FTDI_INTERFACE_SETTINGS_SCREEN)

Marlin/src/module/tool_change.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -933,7 +933,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
933933
current_position.k = toolchange_settings.change_point.k,
934934
current_position.u = toolchange_settings.change_point.u,
935935
current_position.v = toolchange_settings.change_point.v,
936-
current_position.w = toolchange_settings.change_point.w,
936+
current_position.w = toolchange_settings.change_point.w
937937
);
938938
#endif
939939
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*/) {
11381138
current_position.k = toolchange_settings.change_point.k,
11391139
current_position.u = toolchange_settings.change_point.u,
11401140
current_position.v = toolchange_settings.change_point.v,
1141-
current_position.w = toolchange_settings.change_point.w,
1141+
current_position.w = toolchange_settings.change_point.w
11421142
);
11431143
#endif
11441144
planner.buffer_line(current_position, MMM_TO_MMS(TOOLCHANGE_PARK_XY_FEEDRATE), old_tool);

0 commit comments

Comments
 (0)