Quellcode durchsuchen

🎨 Misc. 9-axis cleanup

Scott Lahteine vor 2 Jahren
Ursprung
Commit
6567e0e0aa

+ 1
- 1
Marlin/src/gcode/calibrate/G28.cpp Datei anzeigen

375
                  homeZZ = homeZ,
375
                  homeZZ = homeZ,
376
                  homeI = needI || parser.seen_test(AXIS4_NAME), homeJ = needJ || parser.seen_test(AXIS5_NAME),
376
                  homeI = needI || parser.seen_test(AXIS4_NAME), homeJ = needJ || parser.seen_test(AXIS5_NAME),
377
                  homeK = needK || parser.seen_test(AXIS6_NAME), homeU = needU || parser.seen_test(AXIS7_NAME),
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
                home_all = NUM_AXIS_GANG(   // Home-all if all or none are flagged
380
                home_all = NUM_AXIS_GANG(   // Home-all if all or none are flagged
381
                     homeX == homeX, && homeY == homeX, && homeZ == homeX,
381
                     homeX == homeX, && homeY == homeX, && homeZ == homeX,

+ 1
- 1
Marlin/src/gcode/config/M217.cpp Datei anzeigen

192
               PSTR(" K"), K_AXIS_UNIT(toolchange_settings.change_point.k),
192
               PSTR(" K"), K_AXIS_UNIT(toolchange_settings.change_point.k),
193
               SP_C_STR,   U_AXIS_UNIT(toolchange_settings.change_point.u),
193
               SP_C_STR,   U_AXIS_UNIT(toolchange_settings.change_point.u),
194
               PSTR(" H"), V_AXIS_UNIT(toolchange_settings.change_point.v),
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
         #endif
197
         #endif
198
       );
198
       );

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/screen_data.h Datei anzeigen

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

+ 2
- 2
Marlin/src/module/tool_change.cpp Datei anzeigen

933
               current_position.k = toolchange_settings.change_point.k,
933
               current_position.k = toolchange_settings.change_point.k,
934
               current_position.u = toolchange_settings.change_point.u,
934
               current_position.u = toolchange_settings.change_point.u,
935
               current_position.v = toolchange_settings.change_point.v,
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
           #endif
938
           #endif
939
           planner.buffer_line(current_position, MMM_TO_MMS(TOOLCHANGE_PARK_XY_FEEDRATE), active_extruder);
939
           planner.buffer_line(current_position, MMM_TO_MMS(TOOLCHANGE_PARK_XY_FEEDRATE), active_extruder);
1138
               current_position.k = toolchange_settings.change_point.k,
1138
               current_position.k = toolchange_settings.change_point.k,
1139
               current_position.u = toolchange_settings.change_point.u,
1139
               current_position.u = toolchange_settings.change_point.u,
1140
               current_position.v = toolchange_settings.change_point.v,
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
           #endif
1143
           #endif
1144
           planner.buffer_line(current_position, MMM_TO_MMS(TOOLCHANGE_PARK_XY_FEEDRATE), old_tool);
1144
           planner.buffer_line(current_position, MMM_TO_MMS(TOOLCHANGE_PARK_XY_FEEDRATE), old_tool);

Laden…
Abbrechen
Speichern