Browse Source

🎨 MULTI_MANUAL => MULTI_E_MANUAL

Scott Lahteine 4 years ago
parent
commit
000388b1d9

+ 3
- 3
Marlin/src/lcd/marlinui.cpp View File

681
     xyze_pos_t ManualMove::all_axes_destination = { 0 };
681
     xyze_pos_t ManualMove::all_axes_destination = { 0 };
682
     bool ManualMove::processing = false;
682
     bool ManualMove::processing = false;
683
   #endif
683
   #endif
684
-  #if ENABLED(MULTI_MANUAL)
684
+  #if ENABLED(MULTI_E_MANUAL)
685
     int8_t ManualMove::e_index = 0;
685
     int8_t ManualMove::e_index = 0;
686
   #endif
686
   #endif
687
   AxisEnum ManualMove::axis = NO_AXIS_MASK;
687
   AxisEnum ManualMove::axis = NO_AXIS_MASK;
758
   // Tell ui.update() to start a move to current_position after a short delay.
758
   // Tell ui.update() to start a move to current_position after a short delay.
759
   //
759
   //
760
   void ManualMove::soon(const AxisEnum move_axis
760
   void ManualMove::soon(const AxisEnum move_axis
761
-    #if MULTI_MANUAL
761
+    #if MULTI_E_MANUAL
762
       , const int8_t eindex/*=-1*/
762
       , const int8_t eindex/*=-1*/
763
     #endif
763
     #endif
764
   ) {
764
   ) {
765
-    #if MULTI_MANUAL
765
+    #if MULTI_E_MANUAL
766
       if (move_axis == E_AXIS) e_index = eindex >= 0 ? eindex : active_extruder;
766
       if (move_axis == E_AXIS) e_index = eindex >= 0 ? eindex : active_extruder;
767
     #endif
767
     #endif
768
     start_time = millis() + (menu_scale < 0.99f ? 0UL : 250UL); // delay for bigger moves
768
     start_time = millis() + (menu_scale < 0.99f ? 0UL : 250UL); // delay for bigger moves

+ 3
- 3
Marlin/src/lcd/marlinui.h View File

48
 #endif
48
 #endif
49
 
49
 
50
 #if E_MANUAL > 1
50
 #if E_MANUAL > 1
51
-  #define MULTI_MANUAL 1
51
+  #define MULTI_E_MANUAL 1
52
 #endif
52
 #endif
53
 
53
 
54
 #if HAS_DISPLAY
54
 #if HAS_DISPLAY
129
   class ManualMove {
129
   class ManualMove {
130
   private:
130
   private:
131
     static AxisEnum axis;
131
     static AxisEnum axis;
132
-    #if MULTI_MANUAL
132
+    #if MULTI_E_MANUAL
133
       static int8_t e_index;
133
       static int8_t e_index;
134
     #else
134
     #else
135
       static int8_t constexpr e_index = 0;
135
       static int8_t constexpr e_index = 0;
183
     #endif
183
     #endif
184
     static void task();
184
     static void task();
185
     static void soon(const AxisEnum axis
185
     static void soon(const AxisEnum axis
186
-      #if MULTI_MANUAL
186
+      #if MULTI_E_MANUAL
187
         , const int8_t eindex=-1
187
         , const int8_t eindex=-1
188
       #endif
188
       #endif
189
     );
189
     );

+ 6
- 6
Marlin/src/lcd/menu/menu_motion.cpp View File

94
 
94
 
95
 #if E_MANUAL
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
     if (ui.use_click()) return ui.goto_previous_screen_no_defer();
98
     if (ui.use_click()) return ui.goto_previous_screen_no_defer();
99
     if (ui.encoderPosition) {
99
     if (ui.encoderPosition) {
100
       if (!ui.manual_move.processing) {
100
       if (!ui.manual_move.processing) {
101
         const float diff = float(int32_t(ui.encoderPosition)) * ui.manual_move.menu_scale;
101
         const float diff = float(int32_t(ui.encoderPosition)) * ui.manual_move.menu_scale;
102
         TERN(IS_KINEMATIC, ui.manual_move.offset, current_position.e) += diff;
102
         TERN(IS_KINEMATIC, ui.manual_move.offset, current_position.e) += diff;
103
         ui.manual_move.soon(E_AXIS
103
         ui.manual_move.soon(E_AXIS
104
-          #if MULTI_MANUAL
104
+          #if MULTI_E_MANUAL
105
             , eindex
105
             , eindex
106
           #endif
106
           #endif
107
         );
107
         );
110
       ui.encoderPosition = 0;
110
       ui.encoderPosition = 0;
111
     }
111
     }
112
     if (ui.should_draw()) {
112
     if (ui.should_draw()) {
113
-      TERN_(MULTI_MANUAL, MenuItemBase::init(eindex));
113
+      TERN_(MULTI_E_MANUAL, MenuItemBase::init(eindex));
114
       MenuEditItemBase::draw_edit_screen(
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
         ftostr41sign(current_position.e
116
         ftostr41sign(current_position.e
117
           PLUS_TERN0(IS_KINEMATIC, ui.manual_move.offset)
117
           PLUS_TERN0(IS_KINEMATIC, ui.manual_move.offset)
118
           MINUS_TERN0(MANUAL_E_MOVES_RELATIVE, manual_move_e_origin)
118
           MINUS_TERN0(MANUAL_E_MOVES_RELATIVE, manual_move_e_origin)
188
 #if E_MANUAL
188
 #if E_MANUAL
189
 
189
 
190
   inline void _goto_menu_move_distance_e() {
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
   inline void _menu_move_distance_e_maybe() {
194
   inline void _menu_move_distance_e_maybe() {
283
         SUBMENU_MOVE_E(E_MANUAL - 1);
283
         SUBMENU_MOVE_E(E_MANUAL - 1);
284
       #endif
284
       #endif
285
 
285
 
286
-    #elif MULTI_MANUAL
286
+    #elif MULTI_E_MANUAL
287
 
287
 
288
       // Independent extruders with one E-stepper per hotend
288
       // Independent extruders with one E-stepper per hotend
289
       LOOP_L_N(n, E_MANUAL) SUBMENU_MOVE_E(n);
289
       LOOP_L_N(n, E_MANUAL) SUBMENU_MOVE_E(n);

+ 1
- 1
Marlin/src/lcd/tft/ui_1024x600.cpp View File

725
     #endif
725
     #endif
726
 
726
 
727
     ui.manual_move.soon(axis
727
     ui.manual_move.soon(axis
728
-      #if MULTI_MANUAL
728
+      #if MULTI_E_MANUAL
729
         , motionAxisState.e_selection
729
         , motionAxisState.e_selection
730
       #endif
730
       #endif
731
     );
731
     );

+ 1
- 1
Marlin/src/lcd/tft/ui_320x240.cpp View File

710
     #endif
710
     #endif
711
 
711
 
712
     ui.manual_move.soon(axis
712
     ui.manual_move.soon(axis
713
-      #if MULTI_MANUAL
713
+      #if MULTI_E_MANUAL
714
         , motionAxisState.e_selection
714
         , motionAxisState.e_selection
715
       #endif
715
       #endif
716
     );
716
     );

+ 1
- 1
Marlin/src/lcd/tft/ui_480x320.cpp View File

712
     #endif
712
     #endif
713
 
713
 
714
     ui.manual_move.soon(axis
714
     ui.manual_move.soon(axis
715
-      #if MULTI_MANUAL
715
+      #if MULTI_E_MANUAL
716
         , motionAxisState.e_selection
716
         , motionAxisState.e_selection
717
       #endif
717
       #endif
718
     );
718
     );

Loading…
Cancel
Save