Remove lcd_menu_AutoLoadFilament

prusa3d · Aug 30, 2024 · f3f8141 · f3f8141
1 parent 923f926
commit f3f8141
Show file tree

Hide file tree

Showing 17 changed files with 4 additions and 115 deletions.
diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp
@@ -253,7 +253,6 @@ extern const char MSG_LOADING_COLOR [] PROGMEM_I1 = ISTR("Loading color"); ////M
 extern const char MSG_CORRECTLY [] PROGMEM_I1 = ISTR("Changed correctly"); ////MSG_CORRECTLY c=19
 extern const char MSG_NOT_LOADED [] PROGMEM_I1 = ISTR("Filament not loaded"); ////MSG_NOT_LOADED c=19
 extern const char MSG_NOT_COLOR [] PROGMEM_I1 = ISTR("Color not correct"); ////MSG_NOT_COLOR c=19
-extern const char MSG_AUTOLOADING_ENABLED [] PROGMEM_I1 = ISTR("Autoloading filament is active, just press the knob and insert filament..."); ////MSG_AUTOLOADING_ENABLED c=20 r=4
 extern const char MSG_FILAMENT_USED [] PROGMEM_I1 = ISTR("Filament used"); ////MSG_FILAMENT_USED c=19
 extern const char MSG_PRINT_TIME [] PROGMEM_I1 = ISTR("Print time"); ////MSG_PRINT_TIME c=19
 extern const char MSG_TOTAL_FILAMENT [] PROGMEM_I1 = ISTR("Total filament"); ////MSG_TOTAL_FILAMENT c=19

diff --git a/Firmware/messages.h b/Firmware/messages.h
@@ -252,7 +252,6 @@ extern const char MSG_LOADING_COLOR [];
 extern const char MSG_CORRECTLY [];
 extern const char MSG_NOT_LOADED [];
 extern const char MSG_NOT_COLOR [];
-extern const char MSG_AUTOLOADING_ENABLED [];
 extern const char MSG_FILAMENT_USED [];
 extern const char MSG_PRINT_TIME [];
 extern const char MSG_TOTAL_FILAMENT [];

diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
@@ -2283,14 +2283,6 @@ void lcd_load_filament_color_check()
     }
 }
 
-#ifdef FILAMENT_SENSOR
-static void lcd_menu_AutoLoadFilament()
-{
-    lcd_display_message_fullscreen_nonBlocking_P(_T(MSG_AUTOLOADING_ENABLED));
-    menu_back_if_clicked();
-}
-#endif //FILAMENT_SENSOR
-
 static void preheat_or_continue(FilamentAction action) {
 
     setFilamentAction(action);
@@ -5319,13 +5311,10 @@ static void lcd_main_menu()
             } else {
 #ifdef FILAMENT_SENSOR
                 if (fsensor.isEnabled()) {
-                    if (!fsensor.getFilamentPresent()) {
-                        if (fsensor.getAutoLoadEnabled()) {
-                            MENU_ITEM_SUBMENU_P(_T(MSG_AUTOLOAD_FILAMENT), lcd_menu_AutoLoadFilament);
-                        } else {
-                            MENU_ITEM_SUBMENU_P(_T(MSG_LOAD_FILAMENT), lcd_LoadFilament);
-                        }
-                    } else {
+                    if (!fsensor.getAutoLoadEnabled()) {
+                        MENU_ITEM_SUBMENU_P(_T(MSG_LOAD_FILAMENT), lcd_LoadFilament);
+                    }
+                    if (fsensor.getFilamentPresent()) {
                         MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), lcd_unLoadFilament);
                     }
                 } else {

diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot
@@ -90,12 +90,6 @@ msgstr ""
 msgid "AutoLoad filament"
 msgstr ""
 
-#. MSG_AUTOLOADING_ENABLED c=20 r=4
-#: ../../Firmware/messages.cpp:245 ../../Firmware/ultralcd.cpp:2272
-msgid ""
-"Autoloading filament is active, just press the knob and insert filament..."
-msgstr ""
-
 #. MSG_PROGRESS_AVOID_GRIND c=20
 #: ../../Firmware/mmu2_progress_converter.cpp:16
 #: ../../Firmware/mmu2_progress_converter.cpp:42

diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po
@@ -99,14 +99,6 @@ msgstr "Automat."
 msgid "AutoLoad filament"
 msgstr "AutoZavedení fil."
 
-#. MSG_AUTOLOADING_ENABLED c=20 r=4
-#: ../../Firmware/messages.cpp:245 ../../Firmware/ultralcd.cpp:2272
-msgid ""
-"Autoloading filament is active, just press the knob and insert filament..."
-msgstr ""
-"Automatické zavádění filamentu aktivní, stiskněte tlačítko a vložte "
-"filament."
-
 #. MSG_PROGRESS_AVOID_GRIND c=20
 #: ../../Firmware/mmu2_progress_converter.cpp:16
 #: ../../Firmware/mmu2_progress_converter.cpp:42

diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po
@@ -99,14 +99,6 @@ msgstr "Auto Leist"
 msgid "AutoLoad filament"
 msgstr "AutoLaden Filament"
 
-#. MSG_AUTOLOADING_ENABLED c=20 r=4
-#: ../../Firmware/messages.cpp:245 ../../Firmware/ultralcd.cpp:2272
-msgid ""
-"Autoloading filament is active, just press the knob and insert filament..."
-msgstr ""
-"Automatisches Fila- ment Laden ist aktiv , Knopf drücken und Filament "
-"einlegen..."
-
 #. MSG_PROGRESS_AVOID_GRIND c=20
 #: ../../Firmware/mmu2_progress_converter.cpp:16
 #: ../../Firmware/mmu2_progress_converter.cpp:42

diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po
@@ -99,13 +99,6 @@ msgstr "Encendido"
 msgid "AutoLoad filament"
 msgstr "Carga auto. filam."
 
-#. MSG_AUTOLOADING_ENABLED c=20 r=4
-#: ../../Firmware/messages.cpp:245 ../../Firmware/ultralcd.cpp:2272
-msgid ""
-"Autoloading filament is active, just press the knob and insert filament..."
-msgstr ""
-"La carga automática está activada, pulse el dial e inserte el filamento..."
-
 #. MSG_PROGRESS_AVOID_GRIND c=20
 #: ../../Firmware/mmu2_progress_converter.cpp:16
 #: ../../Firmware/mmu2_progress_converter.cpp:42

diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po
@@ -99,13 +99,6 @@ msgstr "Puiss.auto"
 msgid "AutoLoad filament"
 msgstr "Autocharge du fil."
 
-#. MSG_AUTOLOADING_ENABLED c=20 r=4
-#: ../../Firmware/messages.cpp:245 ../../Firmware/ultralcd.cpp:2272
-msgid ""
-"Autoloading filament is active, just press the knob and insert filament..."
-msgstr ""
-"Chargement auto. du fil. active, appuyez sur le bouton et insérez le fil."
-
 #. MSG_PROGRESS_AVOID_GRIND c=20
 #: ../../Firmware/mmu2_progress_converter.cpp:16
 #: ../../Firmware/mmu2_progress_converter.cpp:42

diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po
@@ -99,12 +99,6 @@ msgstr "Auto napaj"
 msgid "AutoLoad filament"
 msgstr "Autopunj filamenta"
 
-#. MSG_AUTOLOADING_ENABLED c=20 r=4
-#: ../../Firmware/messages.cpp:245 ../../Firmware/ultralcd.cpp:2272
-msgid ""
-"Autoloading filament is active, just press the knob and insert filament..."
-msgstr "Auto punjenje fil. je aktivno, pritisnite gumb i umetnite fil.."
-
 #. MSG_PROGRESS_AVOID_GRIND c=20
 #: ../../Firmware/mmu2_progress_converter.cpp:16
 #: ../../Firmware/mmu2_progress_converter.cpp:42

diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po
@@ -99,12 +99,6 @@ msgstr "Auto ero"
 msgid "AutoLoad filament"
 msgstr "Fil. auto.betolt."
 
-#. MSG_AUTOLOADING_ENABLED c=20 r=4
-#: ../../Firmware/messages.cpp:245 ../../Firmware/ultralcd.cpp:2272
-msgid ""
-"Autoloading filament is active, just press the knob and insert filament..."
-msgstr "Autom. betoltes be, nyomd meg a gombot es helyzed be a filamentet."
-
 #. MSG_PROGRESS_AVOID_GRIND c=20
 #: ../../Firmware/mmu2_progress_converter.cpp:16
 #: ../../Firmware/mmu2_progress_converter.cpp:42

diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po
@@ -99,13 +99,6 @@ msgstr "Automatico"
 msgid "AutoLoad filament"
 msgstr "Autocaric. filam."
 
-#. MSG_AUTOLOADING_ENABLED c=20 r=4
-#: ../../Firmware/messages.cpp:245 ../../Firmware/ultralcd.cpp:2272
-msgid ""
-"Autoloading filament is active, just press the knob and insert filament..."
-msgstr ""
-"Caricamento automatico attivo, premi la manopola e inserisci il filam."
-
 #. MSG_PROGRESS_AVOID_GRIND c=20
 #: ../../Firmware/mmu2_progress_converter.cpp:16
 #: ../../Firmware/mmu2_progress_converter.cpp:42

diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po
@@ -99,13 +99,6 @@ msgstr "Auto power"
 msgid "AutoLoad filament"
 msgstr "Autoladen filament"
 
-#. MSG_AUTOLOADING_ENABLED c=20 r=4
-#: ../../Firmware/messages.cpp:245 ../../Firmware/ultralcd.cpp:2272
-msgid ""
-"Autoloading filament is active, just press the knob and insert filament..."
-msgstr ""
-"Automatisch laden van flament is actief, druk de knop en laad filament..."
-
 #. MSG_PROGRESS_AVOID_GRIND c=20
 #: ../../Firmware/mmu2_progress_converter.cpp:16
 #: ../../Firmware/mmu2_progress_converter.cpp:42

diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po
@@ -99,13 +99,6 @@ msgstr "Autostyrke"
 msgid "AutoLoad filament"
 msgstr "AutoLast filament"
 
-#. MSG_AUTOLOADING_ENABLED c=20 r=4
-#: ../../Firmware/messages.cpp:245 ../../Firmware/ultralcd.cpp:2272
-msgid ""
-"Autoloading filament is active, just press the knob and insert filament..."
-msgstr ""
-"Autolasting av fil. er aktivert. Trykk på knappen og sett inn filament..."
-
 #. MSG_PROGRESS_AVOID_GRIND c=20
 #: ../../Firmware/mmu2_progress_converter.cpp:16
 #: ../../Firmware/mmu2_progress_converter.cpp:42

diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po
@@ -99,13 +99,6 @@ msgstr "Automatycz"
 msgid "AutoLoad filament"
 msgstr "Autoładowanie fil."
 
-#. MSG_AUTOLOADING_ENABLED c=20 r=4
-#: ../../Firmware/messages.cpp:245 ../../Firmware/ultralcd.cpp:2272
-msgid ""
-"Autoloading filament is active, just press the knob and insert filament..."
-msgstr ""
-"Autoładowanie filamentu włączone, naciśnij pokrętło i wsuń filament..."
-
 #. MSG_PROGRESS_AVOID_GRIND c=20
 #: ../../Firmware/mmu2_progress_converter.cpp:16
 #: ../../Firmware/mmu2_progress_converter.cpp:42

diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po
@@ -99,14 +99,6 @@ msgstr "Put. auto"
 msgid "AutoLoad filament"
 msgstr "Înc.auto filament"
 
-#. MSG_AUTOLOADING_ENABLED c=20 r=4
-#: ../../Firmware/messages.cpp:245 ../../Firmware/ultralcd.cpp:2272
-msgid ""
-"Autoloading filament is active, just press the knob and insert filament..."
-msgstr ""
-"Încărcarea automată de filament pornită; apăsați butonul și încărcați "
-"filamentul"
-
 #. MSG_PROGRESS_AVOID_GRIND c=20
 #: ../../Firmware/mmu2_progress_converter.cpp:16
 #: ../../Firmware/mmu2_progress_converter.cpp:42

diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po
@@ -99,13 +99,6 @@ msgstr "Automat."
 msgid "AutoLoad filament"
 msgstr "Autozav. filamentu"
 
-#. MSG_AUTOLOADING_ENABLED c=20 r=4
-#: ../../Firmware/messages.cpp:245 ../../Firmware/ultralcd.cpp:2272
-msgid ""
-"Autoloading filament is active, just press the knob and insert filament..."
-msgstr ""
-"Autom. zavedenie filamentu aktívne, stlačte tlačidlo a vložte filament..."
-
 #. MSG_PROGRESS_AVOID_GRIND c=20
 #: ../../Firmware/mmu2_progress_converter.cpp:16
 #: ../../Firmware/mmu2_progress_converter.cpp:42

diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po
@@ -99,13 +99,6 @@ msgstr "Auto kraft"
 msgid "AutoLoad filament"
 msgstr "Autoladda filament"
 
-#. MSG_AUTOLOADING_ENABLED c=20 r=4
-#: ../../Firmware/messages.cpp:245 ../../Firmware/ultralcd.cpp:2272
-msgid ""
-"Autoloading filament is active, just press the knob and insert filament..."
-msgstr ""
-"Autoladdning av filament är aktiv, tryck på knappen och sätt i filament."
-
 #. MSG_PROGRESS_AVOID_GRIND c=20
 #: ../../Firmware/mmu2_progress_converter.cpp:16
 #: ../../Firmware/mmu2_progress_converter.cpp:42