|
@@ -684,7 +684,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
|
684
|
684
|
#if ENABLED(MULTI_E_MANUAL)
|
685
|
685
|
int8_t ManualMove::e_index = 0;
|
686
|
686
|
#endif
|
687
|
|
- AxisEnum ManualMove::axis = NO_AXIS_MASK;
|
|
687
|
+ AxisEnum ManualMove::axis = NO_AXIS_ENUM;
|
688
|
688
|
|
689
|
689
|
/**
|
690
|
690
|
* 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*/) {
|
695
|
695
|
*
|
696
|
696
|
* To post a manual move:
|
697
|
697
|
* - Update current_position to the new place you want to go.
|
698
|
|
- * - Set manual_move.axis to an axis like X_AXIS. Use ALL_AXES_MASK for diagonal moves.
|
|
698
|
+ * - Set manual_move.axis to an axis like X_AXIS. Use ALL_AXES_ENUM for diagonal moves.
|
699
|
699
|
* - Set manual_move.start_time to a point in the future (in ms) when the move should be done.
|
700
|
700
|
*
|
701
|
701
|
* For kinematic machines:
|
|
@@ -710,7 +710,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
|
710
|
710
|
if (processing) return; // Prevent re-entry from idle() calls
|
711
|
711
|
|
712
|
712
|
// Add a manual move to the queue?
|
713
|
|
- if (axis != NO_AXIS_MASK && ELAPSED(millis(), start_time) && !planner.is_full()) {
|
|
713
|
+ if (axis != NO_AXIS_ENUM && ELAPSED(millis(), start_time) && !planner.is_full()) {
|
714
|
714
|
|
715
|
715
|
const feedRate_t fr_mm_s = (axis <= E_AXIS) ? manual_feedrate_mm_s[axis] : XY_PROBE_FEEDRATE_MM_S;
|
716
|
716
|
|
|
@@ -722,7 +722,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
|
722
|
722
|
#endif
|
723
|
723
|
|
724
|
724
|
// Apply a linear offset to a single axis
|
725
|
|
- if (axis == ALL_AXES_MASK)
|
|
725
|
+ if (axis == ALL_AXES_ENUM)
|
726
|
726
|
destination = all_axes_destination;
|
727
|
727
|
else if (axis <= XYZE) {
|
728
|
728
|
destination = current_position;
|
|
@@ -731,7 +731,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
|
731
|
731
|
|
732
|
732
|
// Reset for the next move
|
733
|
733
|
offset = 0;
|
734
|
|
- axis = NO_AXIS_MASK;
|
|
734
|
+ axis = NO_AXIS_ENUM;
|
735
|
735
|
|
736
|
736
|
// DELTA and SCARA machines use segmented moves, which could fill the planner during the call to
|
737
|
737
|
// 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*/) {
|
748
|
748
|
|
749
|
749
|
//SERIAL_ECHOLNPAIR("Add planner.move with Axis ", AS_CHAR(axis_codes[axis]), " at FR ", fr_mm_s);
|
750
|
750
|
|
751
|
|
- axis = NO_AXIS_MASK;
|
|
751
|
+ axis = NO_AXIS_ENUM;
|
752
|
752
|
|
753
|
753
|
#endif
|
754
|
754
|
}
|