|
@@ -94,14 +94,14 @@ void lcd_move_z() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_Z), Z_AXIS); }
|
94
|
94
|
|
95
|
95
|
#if E_MANUAL
|
96
|
96
|
|
97
|
|
- static void lcd_move_e(TERN_(MULTI_MANUAL, const int8_t eindex=-1)) {
|
|
97
|
+ static void lcd_move_e(TERN_(MULTI_E_MANUAL, const int8_t eindex=-1)) {
|
98
|
98
|
if (ui.use_click()) return ui.goto_previous_screen_no_defer();
|
99
|
99
|
if (ui.encoderPosition) {
|
100
|
100
|
if (!ui.manual_move.processing) {
|
101
|
101
|
const float diff = float(int32_t(ui.encoderPosition)) * ui.manual_move.menu_scale;
|
102
|
102
|
TERN(IS_KINEMATIC, ui.manual_move.offset, current_position.e) += diff;
|
103
|
103
|
ui.manual_move.soon(E_AXIS
|
104
|
|
- #if MULTI_MANUAL
|
|
104
|
+ #if MULTI_E_MANUAL
|
105
|
105
|
, eindex
|
106
|
106
|
#endif
|
107
|
107
|
);
|
|
@@ -110,9 +110,9 @@ void lcd_move_z() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_Z), Z_AXIS); }
|
110
|
110
|
ui.encoderPosition = 0;
|
111
|
111
|
}
|
112
|
112
|
if (ui.should_draw()) {
|
113
|
|
- TERN_(MULTI_MANUAL, MenuItemBase::init(eindex));
|
|
113
|
+ TERN_(MULTI_E_MANUAL, MenuItemBase::init(eindex));
|
114
|
114
|
MenuEditItemBase::draw_edit_screen(
|
115
|
|
- GET_TEXT(TERN(MULTI_MANUAL, MSG_MOVE_EN, MSG_MOVE_E)),
|
|
115
|
+ GET_TEXT(TERN(MULTI_E_MANUAL, MSG_MOVE_EN, MSG_MOVE_E)),
|
116
|
116
|
ftostr41sign(current_position.e
|
117
|
117
|
PLUS_TERN0(IS_KINEMATIC, ui.manual_move.offset)
|
118
|
118
|
MINUS_TERN0(MANUAL_E_MOVES_RELATIVE, manual_move_e_origin)
|
|
@@ -188,7 +188,7 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
|
188
|
188
|
#if E_MANUAL
|
189
|
189
|
|
190
|
190
|
inline void _goto_menu_move_distance_e() {
|
191
|
|
- ui.goto_screen([]{ _menu_move_distance(E_AXIS, []{ lcd_move_e(TERN_(MULTI_MANUAL, active_extruder)); }, -1); });
|
|
191
|
+ ui.goto_screen([]{ _menu_move_distance(E_AXIS, []{ lcd_move_e(TERN_(MULTI_E_MANUAL, active_extruder)); }, -1); });
|
192
|
192
|
}
|
193
|
193
|
|
194
|
194
|
inline void _menu_move_distance_e_maybe() {
|
|
@@ -283,7 +283,7 @@ void menu_move() {
|
283
|
283
|
SUBMENU_MOVE_E(E_MANUAL - 1);
|
284
|
284
|
#endif
|
285
|
285
|
|
286
|
|
- #elif MULTI_MANUAL
|
|
286
|
+ #elif MULTI_E_MANUAL
|
287
|
287
|
|
288
|
288
|
// Independent extruders with one E-stepper per hotend
|
289
|
289
|
LOOP_L_N(n, E_MANUAL) SUBMENU_MOVE_E(n);
|