From 83e07b5cdf4dd8ea705fe4a882ab31c9029b058a Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 1 Mar 2019 18:07:19 +0100 Subject: [PATCH] Fix compiler warnings: sketch/ultralcd.cpp: In function 'void mFilamentPrompt()': sketch/ultralcd.cpp:2335:7: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch] switch(eFilamentAction) ^ sketch/ultralcd.cpp:2335:7: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch] sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch] switch(eFilamentAction) ^ sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuLoad' not handled in switch [-Wswitch] sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuUnLoad' not handled in switch [-Wswitch] sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuEject' not handled in switch [-Wswitch] sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch] sketch/ultralcd.cpp: In function 'void mFilamentItem(uint16_t, uint16_t)': sketch/ultralcd.cpp:2513:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch] switch(eFilamentAction) ^ sketch/ultralcd.cpp:2513:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch] sketch/ultralcd.cpp:2562:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch] switch(eFilamentAction) ^ sketch/ultralcd.cpp:2562:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch] --- Firmware/ultralcd.cpp | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 2024bb029..9fd7d6528 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2344,6 +2344,8 @@ switch(eFilamentAction) lcd_puts_P(_i("to unload filament")); ////MSG_ c=20 r=1 break; case e_FILAMENT_ACTION_mmuEject: + case e_FILAMENT_ACTION_mmuCut: + case e_FILAMENT_ACTION_none: break; } if(lcd_clicked()) @@ -2357,38 +2359,23 @@ if(lcd_clicked()) menu_back(nLevel); switch(eFilamentAction) { - case e_FILAMENT_ACTION_Load: case e_FILAMENT_ACTION_autoLoad: + eFilamentAction=e_FILAMENT_ACTION_none; // i.e. non-autoLoad + // no break + case e_FILAMENT_ACTION_Load: loading_flag=true; enquecommand_P(PSTR("M701")); // load filament break; case e_FILAMENT_ACTION_unLoad: enquecommand_P(PSTR("M702")); // unload filament break; -/* case e_FILAMENT_ACTION_mmuLoad: -//./ MYSERIAL.println("mFilamentPrompt - mmuLoad"); - bFilamentAction=true; - menu_submenu(mmu_load_to_nozzle_menu); - break; -*/ -/* case e_FILAMENT_ACTION_mmuUnLoad: -//./ MYSERIAL.println("mFilamentPrompt - mmuUnLoad"); - bFilamentAction=true; - extr_unload(); - break; -*/ -/* case e_FILAMENT_ACTION_mmuEject: - MYSERIAL.println("mFilamentPrompt - mmuEject"); - bFilamentAction=true; -// menu_submenu(mmu_fil_eject_menu); + case e_FILAMENT_ACTION_mmuCut: + case e_FILAMENT_ACTION_none: break; -*/ } - if(eFilamentAction==e_FILAMENT_ACTION_autoLoad) - eFilamentAction=e_FILAMENT_ACTION_none; // i.e. non-autoLoad } }