Przeglądaj źródła

🎨 Misc. 9-axis cleanup

Scott Lahteine 2 lat temu
rodzic
commit
6567e0e0aa

+ 1
- 1
Marlin/src/gcode/calibrate/G28.cpp Wyświetl plik

@@ -375,7 +375,7 @@ void GcodeSuite::G28() {
375 375
                  homeZZ = homeZ,
376 376
                  homeI = needI || parser.seen_test(AXIS4_NAME), homeJ = needJ || parser.seen_test(AXIS5_NAME),
377 377
                  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)
379 379
                ),
380 380
                home_all = NUM_AXIS_GANG(   // Home-all if all or none are flagged
381 381
                     homeX == homeX, && homeY == homeX, && homeZ == homeX,

+ 1
- 1
Marlin/src/gcode/config/M217.cpp Wyświetl plik

@@ -192,7 +192,7 @@ void GcodeSuite::M217_report(const bool forReplay/*=true*/) {
192 192
               PSTR(" K"), K_AXIS_UNIT(toolchange_settings.change_point.k),
193 193
               SP_C_STR,   U_AXIS_UNIT(toolchange_settings.change_point.u),
194 194
               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)
196 196
             )
197 197
         #endif
198 198
       );

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/screen_data.h Wyświetl plik

@@ -45,7 +45,7 @@
45 45
  */
46 46
 #define __DECL_DATA_IF_INCLUDED(CLASS) struct CLASS ## Data CLASS ;
47 47
 #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))
49 49
 
50 50
 union screen_data_t {
51 51
   DECL_DATA_IF_INCLUDED(FTDI_INTERFACE_SETTINGS_SCREEN)

+ 2
- 2
Marlin/src/module/tool_change.cpp Wyświetl plik

@@ -933,7 +933,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
933 933
               current_position.k = toolchange_settings.change_point.k,
934 934
               current_position.u = toolchange_settings.change_point.u,
935 935
               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
937 937
             );
938 938
           #endif
939 939
           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*/) {
1138 1138
               current_position.k = toolchange_settings.change_point.k,
1139 1139
               current_position.u = toolchange_settings.change_point.u,
1140 1140
               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
1142 1142
             );
1143 1143
           #endif
1144 1144
           planner.buffer_line(current_position, MMM_TO_MMS(TOOLCHANGE_PARK_XY_FEEDRATE), old_tool);

Ładowanie…
Anuluj
Zapisz