浏览代码

Reduce MMU2 code, add test

Scott Lahteine 5 年前
父节点
当前提交
1d150e41b6

+ 1
- 1
Marlin/src/gcode/bedlevel/abl/G29.cpp 查看文件

752
       for (uint8_t i = 0; i < 3; ++i) {
752
       for (uint8_t i = 0; i < 3; ++i) {
753
         if (verbose_level) SERIAL_ECHOLNPAIR("Probing point ", int(i), "/3.");
753
         if (verbose_level) SERIAL_ECHOLNPAIR("Probing point ", int(i), "/3.");
754
         #if HAS_DISPLAY
754
         #if HAS_DISPLAY
755
-          ui.status_printf_P(0, PSTR(S_FMT" %i/3"), GET_TEXT(MSG_PROBING_MESH), int(i));
755
+          ui.status_printf_P(0, PSTR(S_FMT " %i/3"), GET_TEXT(MSG_PROBING_MESH), int(i));
756
         #endif
756
         #endif
757
 
757
 
758
         // Retain the last probe position
758
         // Retain the last probe position

+ 4
- 20
Marlin/src/lcd/menu/menu_mmu2.cpp 查看文件

63
   START_MENU();
63
   START_MENU();
64
   BACK_ITEM(MSG_MMU2_MENU);
64
   BACK_ITEM(MSG_MMU2_MENU);
65
   ACTION_ITEM(MSG_MMU2_ALL, action_mmu2_load_all);
65
   ACTION_ITEM(MSG_MMU2_ALL, action_mmu2_load_all);
66
-  ACTION_ITEM_N(0, MSG_MMU2_FILAMENT_N, []{ _mmu2_load_filament(0); });
67
-  ACTION_ITEM_N(1, MSG_MMU2_FILAMENT_N, []{ _mmu2_load_filament(1); });
68
-  ACTION_ITEM_N(2, MSG_MMU2_FILAMENT_N, []{ _mmu2_load_filament(2); });
69
-  ACTION_ITEM_N(3, MSG_MMU2_FILAMENT_N, []{ _mmu2_load_filament(3); });
70
-  ACTION_ITEM_N(4, MSG_MMU2_FILAMENT_N, []{ _mmu2_load_filament(4); });
66
+  LOOP_L_N(i, 5) ACTION_ITEM_N(i, MSG_MMU2_FILAMENT_N, []{ _mmu2_load_filament(MenuItemBase::itemIndex); });
71
   END_MENU();
67
   END_MENU();
72
 }
68
 }
73
 
69
 
74
 void menu_mmu2_load_to_nozzle() {
70
 void menu_mmu2_load_to_nozzle() {
75
   START_MENU();
71
   START_MENU();
76
   BACK_ITEM(MSG_MMU2_MENU);
72
   BACK_ITEM(MSG_MMU2_MENU);
77
-  ACTION_ITEM_N(0, MSG_MMU2_FILAMENT_N, []{ action_mmu2_load_filament_to_nozzle(0); });
78
-  ACTION_ITEM_N(1, MSG_MMU2_FILAMENT_N, []{ action_mmu2_load_filament_to_nozzle(1); });
79
-  ACTION_ITEM_N(2, MSG_MMU2_FILAMENT_N, []{ action_mmu2_load_filament_to_nozzle(2); });
80
-  ACTION_ITEM_N(3, MSG_MMU2_FILAMENT_N, []{ action_mmu2_load_filament_to_nozzle(3); });
81
-  ACTION_ITEM_N(4, MSG_MMU2_FILAMENT_N, []{ action_mmu2_load_filament_to_nozzle(4); });
73
+  LOOP_L_N(i, 5) ACTION_ITEM_N(i, MSG_MMU2_FILAMENT_N, []{ action_mmu2_load_filament_to_nozzle(MenuItemBase::itemIndex); });
82
   END_MENU();
74
   END_MENU();
83
 }
75
 }
84
 
76
 
104
 void menu_mmu2_eject_filament() {
96
 void menu_mmu2_eject_filament() {
105
   START_MENU();
97
   START_MENU();
106
   BACK_ITEM(MSG_MMU2_MENU);
98
   BACK_ITEM(MSG_MMU2_MENU);
107
-  ACTION_ITEM_N(0, MSG_MMU2_FILAMENT_N, []{ _mmu2_eject_filament(0); });
108
-  ACTION_ITEM_N(1, MSG_MMU2_FILAMENT_N, []{ _mmu2_eject_filament(1); });
109
-  ACTION_ITEM_N(2, MSG_MMU2_FILAMENT_N, []{ _mmu2_eject_filament(2); });
110
-  ACTION_ITEM_N(3, MSG_MMU2_FILAMENT_N, []{ _mmu2_eject_filament(3); });
111
-  ACTION_ITEM_N(4, MSG_MMU2_FILAMENT_N, []{ _mmu2_eject_filament(4); });
99
+  LOOP_L_N(i, 5) ACTION_ITEM_N(i, MSG_MMU2_FILAMENT_N, []{ _mmu2_eject_filament(MenuItemBase::itemIndex); });
112
   END_MENU();
100
   END_MENU();
113
 }
101
 }
114
 
102
 
146
   #if LCD_HEIGHT > 2
134
   #if LCD_HEIGHT > 2
147
     STATIC_ITEM(MSG_MMU2_CHOOSE_FILAMENT_HEADER, SS_CENTER|SS_INVERT);
135
     STATIC_ITEM(MSG_MMU2_CHOOSE_FILAMENT_HEADER, SS_CENTER|SS_INVERT);
148
   #endif
136
   #endif
149
-  ACTION_ITEM_N(0, MSG_MMU2_FILAMENT_N, []{ action_mmu2_choose(0); });
150
-  ACTION_ITEM_N(1, MSG_MMU2_FILAMENT_N, []{ action_mmu2_choose(1); });
151
-  ACTION_ITEM_N(2, MSG_MMU2_FILAMENT_N, []{ action_mmu2_choose(2); });
152
-  ACTION_ITEM_N(3, MSG_MMU2_FILAMENT_N, []{ action_mmu2_choose(3); });
153
-  ACTION_ITEM_N(4, MSG_MMU2_FILAMENT_N, []{ action_mmu2_choose(4); });
137
+  LOOP_L_N(i, 5) ACTION_ITEM_N(i, MSG_MMU2_FILAMENT_N, []{ action_mmu2_choose(MenuItemBase::itemIndex); });
154
   END_MENU();
138
   END_MENU();
155
 }
139
 }
156
 
140
 

+ 4
- 2
buildroot/share/tests/megaatmega2560-tests 查看文件

100
 #
100
 #
101
 restore_configs
101
 restore_configs
102
 opt_set LCD_LANGUAGE zh_CN
102
 opt_set LCD_LANGUAGE zh_CN
103
+opt_set EXTRUDERS 5
103
 opt_set NUM_SERVOS 1
104
 opt_set NUM_SERVOS 1
104
 opt_enable ZONESTAR_LCD Z_PROBE_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE BOOT_MARLIN_LOGO_ANIMATED \
105
 opt_enable ZONESTAR_LCD Z_PROBE_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE BOOT_MARLIN_LOGO_ANIMATED \
105
            AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL \
106
            AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL \
106
-           NO_VOLUMETRICS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP G38_PROBE_TARGET JOYSTICK
107
-exec_test $1 $2 "RAMPS | ZONESTAR_LCD | Servo Probe | ABL 3-Pt | Debug Leveling | EEPROM | G38 ..."
107
+           NO_VOLUMETRICS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP G38_PROBE_TARGET JOYSTICK \
108
+           PRUSA_MMU2 MMU2_MENUS NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE
109
+exec_test $1 $2 "RAMPS | ZONESTAR_LCD | MMU2 | Servo Probe | ABL 3-Pt | Debug Leveling | EEPROM | G38 ..."
108
 
110
 
109
 #
111
 #
110
 # Test MINIRAMBO with PWM_MOTOR_CURRENT and many features
112
 # Test MINIRAMBO with PWM_MOTOR_CURRENT and many features

正在加载...
取消
保存