Skip to content

Commit 927d264

Browse files
sarusanisarusani
committed
Remove lcd_menu_AutoLoadFilament
1 parent d3f9559 commit 927d264

17 files changed

+1
-113
lines changed

‎Firmware/messages.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ extern const char MSG_LOADING_COLOR [] PROGMEM_I1 = ISTR("Loading color"); ////M
254254
extern const char MSG_CORRECTLY [] PROGMEM_I1 = ISTR("Changed correctly"); ////MSG_CORRECTLY c=19
255255
extern const char MSG_NOT_LOADED [] PROGMEM_I1 = ISTR("Filament not loaded"); ////MSG_NOT_LOADED c=19
256256
extern const char MSG_NOT_COLOR [] PROGMEM_I1 = ISTR("Color not correct"); ////MSG_NOT_COLOR c=19
257-
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
258257
extern const char MSG_FILAMENT_USED [] PROGMEM_I1 = ISTR("Filament used"); ////MSG_FILAMENT_USED c=19
259258
extern const char MSG_PRINT_TIME [] PROGMEM_I1 = ISTR("Print time"); ////MSG_PRINT_TIME c=19
260259
extern const char MSG_TOTAL_FILAMENT [] PROGMEM_I1 = ISTR("Total filament"); ////MSG_TOTAL_FILAMENT c=19

‎Firmware/messages.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,6 @@ extern const char MSG_LOADING_COLOR [];
253253
extern const char MSG_CORRECTLY [];
254254
extern const char MSG_NOT_LOADED [];
255255
extern const char MSG_NOT_COLOR [];
256-
extern const char MSG_AUTOLOADING_ENABLED [];
257256
extern const char MSG_FILAMENT_USED [];
258257
extern const char MSG_PRINT_TIME [];
259258
extern const char MSG_TOTAL_FILAMENT [];

‎Firmware/ultralcd.cpp‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2277,14 +2277,6 @@ void lcd_load_filament_color_check()
22772277
}
22782278
}
22792279

2280-
#ifdef FILAMENT_SENSOR
2281-
static void lcd_menu_AutoLoadFilament()
2282-
{
2283-
lcd_display_message_fullscreen_nonBlocking_P(_T(MSG_AUTOLOADING_ENABLED));
2284-
menu_back_if_clicked();
2285-
}
2286-
#endif //FILAMENT_SENSOR
2287-
22882280
static void preheat_or_continue(FilamentAction action) {
22892281

22902282
setFilamentAction(action);
@@ -5321,11 +5313,7 @@ static void lcd_main_menu()
53215313
if (!fsensor.getAutoLoadEnabled()) {
53225314
MENU_ITEM_SUBMENU_P(_T(MSG_LOAD_FILAMENT), lcd_LoadFilament);
53235315
}
5324-
if (!fsensor.getFilamentPresent()) {
5325-
if (fsensor.getAutoLoadEnabled()) {
5326-
MENU_ITEM_SUBMENU_P(_T(MSG_AUTOLOAD_FILAMENT), lcd_menu_AutoLoadFilament);
5327-
}
5328-
} else {
5316+
if (fsensor.getFilamentPresent()) {
53295317
MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), lcd_unLoadFilament);
53305318
}
53315319
} else {

‎lang/po/Firmware.pot‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,6 @@ msgstr ""
9090
msgid "AutoLoad filament"
9191
msgstr ""
9292

93-
#. MSG_AUTOLOADING_ENABLED c=20 r=4
94-
#: ../../Firmware/messages.cpp:257 ../../Firmware/ultralcd.cpp:2289
95-
msgid ""
96-
"Autoloading filament is active, just press the knob and insert filament..."
97-
msgstr ""
98-
9993
#. MSG_PROGRESS_AVOID_GRIND c=20
10094
#: ../../Firmware/mmu2_progress_converter.cpp:16
10195
#: ../../Firmware/mmu2_progress_converter.cpp:42

‎lang/po/Firmware_cs.po‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,6 @@ msgstr "Automat."
9999
msgid "AutoLoad filament"
100100
msgstr "AutoZavedení fil."
101101

102-
#. MSG_AUTOLOADING_ENABLED c=20 r=4
103-
#: ../../Firmware/messages.cpp:257 ../../Firmware/ultralcd.cpp:2289
104-
msgid ""
105-
"Autoloading filament is active, just press the knob and insert filament..."
106-
msgstr ""
107-
"Automatické zavádění filamentu aktivní, stiskněte tlačítko a vložte "
108-
"filament."
109-
110102
#. MSG_PROGRESS_AVOID_GRIND c=20
111103
#: ../../Firmware/mmu2_progress_converter.cpp:16
112104
#: ../../Firmware/mmu2_progress_converter.cpp:42

‎lang/po/Firmware_de.po‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,6 @@ msgstr "Auto Leist"
9999
msgid "AutoLoad filament"
100100
msgstr "AutoLaden Filament"
101101

102-
#. MSG_AUTOLOADING_ENABLED c=20 r=4
103-
#: ../../Firmware/messages.cpp:257 ../../Firmware/ultralcd.cpp:2289
104-
msgid ""
105-
"Autoloading filament is active, just press the knob and insert filament..."
106-
msgstr ""
107-
"Automatisches Fila- ment Laden ist aktiv , Knopf drücken und Filament "
108-
"einlegen..."
109-
110102
#. MSG_PROGRESS_AVOID_GRIND c=20
111103
#: ../../Firmware/mmu2_progress_converter.cpp:16
112104
#: ../../Firmware/mmu2_progress_converter.cpp:42

‎lang/po/Firmware_es.po‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,6 @@ msgstr "Encendido"
9999
msgid "AutoLoad filament"
100100
msgstr "Carga auto. filam."
101101

102-
#. MSG_AUTOLOADING_ENABLED c=20 r=4
103-
#: ../../Firmware/messages.cpp:257 ../../Firmware/ultralcd.cpp:2289
104-
msgid ""
105-
"Autoloading filament is active, just press the knob and insert filament..."
106-
msgstr ""
107-
"La carga automática está activada, pulse el dial e inserte el filamento..."
108-
109102
#. MSG_PROGRESS_AVOID_GRIND c=20
110103
#: ../../Firmware/mmu2_progress_converter.cpp:16
111104
#: ../../Firmware/mmu2_progress_converter.cpp:42

‎lang/po/Firmware_fr.po‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,6 @@ msgstr "Puiss.auto"
9999
msgid "AutoLoad filament"
100100
msgstr "Autocharge du fil."
101101

102-
#. MSG_AUTOLOADING_ENABLED c=20 r=4
103-
#: ../../Firmware/messages.cpp:257 ../../Firmware/ultralcd.cpp:2289
104-
msgid ""
105-
"Autoloading filament is active, just press the knob and insert filament..."
106-
msgstr ""
107-
"Chargement auto. du fil. active, appuyez sur le bouton et insérez le fil."
108-
109102
#. MSG_PROGRESS_AVOID_GRIND c=20
110103
#: ../../Firmware/mmu2_progress_converter.cpp:16
111104
#: ../../Firmware/mmu2_progress_converter.cpp:42

‎lang/po/Firmware_hr.po‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,6 @@ msgstr "Auto napaj"
9999
msgid "AutoLoad filament"
100100
msgstr "Autopunj filamenta"
101101

102-
#. MSG_AUTOLOADING_ENABLED c=20 r=4
103-
#: ../../Firmware/messages.cpp:257 ../../Firmware/ultralcd.cpp:2289
104-
msgid ""
105-
"Autoloading filament is active, just press the knob and insert filament..."
106-
msgstr "Auto punjenje fil. je aktivno, pritisnite gumb i umetnite fil.."
107-
108102
#. MSG_PROGRESS_AVOID_GRIND c=20
109103
#: ../../Firmware/mmu2_progress_converter.cpp:16
110104
#: ../../Firmware/mmu2_progress_converter.cpp:42

‎lang/po/Firmware_hu.po‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,6 @@ msgstr "Auto ero"
9999
msgid "AutoLoad filament"
100100
msgstr "Fil. auto.betolt."
101101

102-
#. MSG_AUTOLOADING_ENABLED c=20 r=4
103-
#: ../../Firmware/messages.cpp:257 ../../Firmware/ultralcd.cpp:2289
104-
msgid ""
105-
"Autoloading filament is active, just press the knob and insert filament..."
106-
msgstr "Autom. betoltes be, nyomd meg a gombot es helyzed be a filamentet."
107-
108102
#. MSG_PROGRESS_AVOID_GRIND c=20
109103
#: ../../Firmware/mmu2_progress_converter.cpp:16
110104
#: ../../Firmware/mmu2_progress_converter.cpp:42

0 commit comments

Comments
 (0)