zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

🎨 Rename all/no axis enums

Browse source
This commit is contained in:
Scott Lahteine 2021-05-21 08:25:54 -05:00
parent 3220c49f1b
commit cdbd438a04
7 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/core/types.h
View file

@ -54,7 +54,7 @@ enum AxisEnum : uint8_t {
X_HEAD, Y_HEAD, Z_HEAD, X_HEAD, Y_HEAD, Z_HEAD,
E0_AXIS = E_AXIS, E0_AXIS = E_AXIS,
E1_AXIS, E2_AXIS, E3_AXIS, E4_AXIS, E5_AXIS, E6_AXIS, E7_AXIS, E1_AXIS, E2_AXIS, E3_AXIS, E4_AXIS, E5_AXIS, E6_AXIS, E7_AXIS,
ALL_AXES_MASK = 0xFE, NO_AXIS_MASK = 0xFF ALL_AXES_ENUM = 0xFE, NO_AXIS_ENUM = 0xFF
}; };
// //

2
Marlin/src/gcode/calibrate/M852.cpp
View file

@ -86,7 +86,7 @@ void GcodeSuite::M852() {
// When skew is changed the current position changes // When skew is changed the current position changes
if (setval) { if (setval) {
set_current_from_steppers_for_axis(ALL_AXES_MASK); set_current_from_steppers_for_axis(ALL_AXES_ENUM);
sync_plan_position(); sync_plan_position();
report_current_position(); report_current_position();
} }

2
Marlin/src/gcode/probe/G38.cpp
View file

@ -38,7 +38,7 @@ inline void G38_single_probe(const uint8_t move_value) {
planner.synchronize(); planner.synchronize();
G38_move = 0; G38_move = 0;
endstops.hit_on_purpose(); endstops.hit_on_purpose();
set_current_from_steppers_for_axis(ALL_AXES_MASK); set_current_from_steppers_for_axis(ALL_AXES_ENUM);
sync_plan_position(); sync_plan_position();
} }

12
Marlin/src/lcd/marlinui.cpp
View file

@ -684,7 +684,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
#if ENABLED(MULTI_E_MANUAL) #if ENABLED(MULTI_E_MANUAL)
int8_t ManualMove::e_index = 0; int8_t ManualMove::e_index = 0;
#endif #endif
AxisEnum ManualMove::axis = NO_AXIS_MASK; AxisEnum ManualMove::axis = NO_AXIS_ENUM;
/** /**
* If a manual move has been posted and its time has arrived, and if the planner * If a manual move has been posted and its time has arrived, and if the planner
@ -695,7 +695,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
* *
* To post a manual move: * To post a manual move:
* - Update current_position to the new place you want to go. * - Update current_position to the new place you want to go.
* - Set manual_move.axis to an axis like X_AXIS. Use ALL_AXES_MASK for diagonal moves. * - Set manual_move.axis to an axis like X_AXIS. Use ALL_AXES_ENUM for diagonal moves.
* - Set manual_move.start_time to a point in the future (in ms) when the move should be done. * - Set manual_move.start_time to a point in the future (in ms) when the move should be done.
* *
* For kinematic machines: * For kinematic machines:
@ -710,7 +710,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
if (processing) return; // Prevent re-entry from idle() calls if (processing) return; // Prevent re-entry from idle() calls
// Add a manual move to the queue? // Add a manual move to the queue?
if (axis != NO_AXIS_MASK && ELAPSED(millis(), start_time) && !planner.is_full()) { if (axis != NO_AXIS_ENUM && ELAPSED(millis(), start_time) && !planner.is_full()) {
const feedRate_t fr_mm_s = (axis <= E_AXIS) ? manual_feedrate_mm_s[axis] : XY_PROBE_FEEDRATE_MM_S; const feedRate_t fr_mm_s = (axis <= E_AXIS) ? manual_feedrate_mm_s[axis] : XY_PROBE_FEEDRATE_MM_S;
@ -722,7 +722,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
#endif #endif
// Apply a linear offset to a single axis // Apply a linear offset to a single axis
if (axis == ALL_AXES_MASK) if (axis == ALL_AXES_ENUM)
destination = all_axes_destination; destination = all_axes_destination;
else if (axis <= XYZE) { else if (axis <= XYZE) {
destination = current_position; destination = current_position;
@ -731,7 +731,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
// Reset for the next move // Reset for the next move
offset = 0; offset = 0;
axis = NO_AXIS_MASK; axis = NO_AXIS_ENUM;
// DELTA and SCARA machines use segmented moves, which could fill the planner during the call to // DELTA and SCARA machines use segmented moves, which could fill the planner during the call to
// move_to_destination. This will cause idle() to be called, which can then call this function while the // move_to_destination. This will cause idle() to be called, which can then call this function while the
@ -748,7 +748,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
//SERIAL_ECHOLNPAIR("Add planner.move with Axis ", AS_CHAR(axis_codes[axis]), " at FR ", fr_mm_s); //SERIAL_ECHOLNPAIR("Add planner.move with Axis ", AS_CHAR(axis_codes[axis]), " at FR ", fr_mm_s);
axis = NO_AXIS_MASK; axis = NO_AXIS_ENUM;
#endif #endif
} }

2
Marlin/src/lcd/menu/menu_bed_leveling.cpp
View file

@ -206,7 +206,7 @@
#if ENABLED(MESH_EDIT_MENU) #if ENABLED(MESH_EDIT_MENU)
inline void refresh_planner() { inline void refresh_planner() {
set_current_from_steppers_for_axis(ALL_AXES_MASK); set_current_from_steppers_for_axis(ALL_AXES_ENUM);
sync_plan_position(); sync_plan_position();
} }

2
Marlin/src/lcd/menu/menu_ubl.cpp
View file

@ -430,7 +430,7 @@ void ubl_map_move_to_xy() {
// Use the built-in manual move handler to move to the mesh point. // Use the built-in manual move handler to move to the mesh point.
ui.manual_move.set_destination(xy); ui.manual_move.set_destination(xy);
ui.manual_move.soon(ALL_AXES_MASK); ui.manual_move.soon(ALL_AXES_ENUM);
} }
inline int32_t grid_index(const uint8_t x, const uint8_t y) { inline int32_t grid_index(const uint8_t x, const uint8_t y) {

4
Marlin/src/module/motion.cpp
View file

@ -282,7 +282,7 @@ void report_current_position_projected() {
void quickstop_stepper() { void quickstop_stepper() {
planner.quick_stop(); planner.quick_stop();
planner.synchronize(); planner.synchronize();
set_current_from_steppers_for_axis(ALL_AXES_MASK); set_current_from_steppers_for_axis(ALL_AXES_ENUM);
sync_plan_position(); sync_plan_position();
} }
@ -360,7 +360,7 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) {
planner.unapply_modifiers(pos, true); planner.unapply_modifiers(pos, true);
#endif #endif
if (axis == ALL_AXES_MASK) if (axis == ALL_AXES_ENUM)
current_position = pos; current_position = pos;
else else
current_position[axis] = pos[axis]; current_position[axis] = pos[axis];