Skip to content

Commit 983724b

Browse files
committed
[MMU3] Updated MMU menu item order to better match Prusa documentation.
1 parent bd565dc commit 983724b

File tree

1 file changed

+19
-15
lines changed

1 file changed

+19
-15
lines changed

Marlin/src/lcd/menu/menu_mmu2.cpp

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,8 @@ void menu_mmu2() {
305305

306306
START_MENU();
307307
BACK_ITEM(MSG_MAIN_MENU);
308+
309+
// MMU2/MMU3 Commands
308310
if (!busy && TERN1(HAS_PRUSA_MMU3, MMU2::mmu2.mmu_hw_enabled)){
309311
SUBMENU(MSG_MMU2_LOAD_FILAMENT, menu_mmu2_load_filament);
310312
SUBMENU(MSG_MMU2_LOAD_TO_NOZZLE, menu_mmu2_load_to_nozzle);
@@ -313,7 +315,22 @@ void menu_mmu2() {
313315
}
314316

315317
#if HAS_PRUSA_MMU3
316-
// SUBMENU(MSG_MMU_CUTTER_MODE, menu_mmu2_cutter);
318+
// MMU3 Enable/Disable
319+
#ifndef __AVR__
320+
editable.state = MMU2::mmu2.mmu_hw_enabled;
321+
EDIT_ITEM_F(bool, F("MMU"), &MMU2::mmu2.mmu_hw_enabled, []{
322+
if(editable.state){
323+
MMU2::mmu2.Stop();
324+
} else {
325+
MMU2::mmu2.Start();
326+
}
327+
});
328+
#endif
329+
330+
// SpoolJoin Enable/Disable
331+
EDIT_ITEM(bool, MSG_MMU_SPOOL_JOIN, &SpoolJoin::spooljoin.enabled, spool_join_status);
332+
333+
// Cutter Enable/Disable
317334
bool cutter_enabled = MMU2::mmu2.cutter_mode != 0;
318335
editable.state = cutter_enabled;
319336
EDIT_ITEM(bool, MSG_MMU_CUTTER, &cutter_enabled, []{
@@ -322,28 +339,15 @@ void menu_mmu2() {
322339
if (!busy && MMU2::cutter_enabled() && MMU2::mmu2.mmu_hw_enabled){
323340
SUBMENU(MSG_MMU2_CUT_FILAMENT, menu_mmu2_cut_filament);
324341
}
325-
EDIT_ITEM(bool, MSG_MMU_SPOOL_JOIN, &SpoolJoin::spooljoin.enabled, spool_join_status);
326342

343+
// Statistics
327344
SUBMENU(MSG_MMU_STATISTICS, menu_mmu2_statistics);
328345
#endif
329346

330347
if (TERN1(HAS_PRUSA_MMU3, MMU2::mmu2.mmu_hw_enabled)){
331348
ACTION_ITEM(MSG_MMU2_RESET, action_mmu2_reset);
332349
}
333350

334-
#if HAS_PRUSA_MMU3
335-
#ifndef __AVR__
336-
editable.state = MMU2::mmu2.mmu_hw_enabled;
337-
EDIT_ITEM_F(bool, F("MMU"), &MMU2::mmu2.mmu_hw_enabled, []{
338-
if(editable.state){
339-
MMU2::mmu2.Stop();
340-
} else {
341-
MMU2::mmu2.Start();
342-
}
343-
});
344-
#endif
345-
#endif
346-
347351
END_MENU();
348352
}
349353

0 commit comments

Comments
 (0)