josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove lcd_menu_AutoLoadFilament

This commit is contained in:
sarusani 2024-08-20 10:40:35 +02:00 committed by sarusani
parent 9fb034a985
commit 29907639ae
15 changed files with 50 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/messages.cpp
View File

@ -253,7 +253,9 @@ 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
#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
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
#endif //REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
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

2
Firmware/messages.h
View File

@ -252,7 +252,9 @@ extern const char MSG_LOADING_COLOR [];
extern const char MSG_CORRECTLY [];
extern const char MSG_NOT_LOADED [];
extern const char MSG_NOT_COLOR [];
#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
extern const char MSG_AUTOLOADING_ENABLED [];
#endif //REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
extern const char MSG_FILAMENT_USED [];
extern const char MSG_PRINT_TIME [];
extern const char MSG_TOTAL_FILAMENT [];

17
Firmware/ultralcd.cpp
View File

@ -2296,13 +2296,13 @@ void lcd_load_filament_color_check()
}
}
#ifdef FILAMENT_SENSOR
#if defined(FILAMENT_SENSOR) && !defined(REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY)
static void lcd_menu_AutoLoadFilament()
{
lcd_display_message_fullscreen_nonBlocking_P(_T(MSG_AUTOLOADING_ENABLED));
menu_back_if_clicked();
}
#endif //FILAMENT_SENSOR
#endif //FILAMENT_SENSOR && REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
static void preheat_or_continue(FilamentAction action) {
@ -5351,13 +5351,16 @@ static void lcd_main_menu()
if (!fsensor.getAutoLoadEnabled()) {
MENU_ITEM_SUBMENU_P(_T(MSG_LOAD_FILAMENT), lcd_LoadFilament);
}
if (!fsensor.getFilamentPresent()) {
if (fsensor.getAutoLoadEnabled()) {
MENU_ITEM_SUBMENU_P(_T(MSG_AUTOLOAD_FILAMENT), lcd_menu_AutoLoadFilament);
}
} else {
if (fsensor.getFilamentPresent()) {
MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), lcd_unLoadFilament);
}
#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
else {
if (fsensor.getAutoLoadEnabled()) {
MENU_ITEM_SUBMENU_P(_T(MSG_AUTOLOAD_FILAMENT), lcd_menu_AutoLoadFilament);
}
}
#endif //REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
} else {
#endif //FILAMENT_SENSOR
MENU_ITEM_SUBMENU_P(_T(MSG_LOAD_FILAMENT), lcd_LoadFilament);

3
Firmware/variants/MK25-RAMBo10a.h
View File

@ -527,4 +527,7 @@
//Show filename instead of print time after SD card print finished
//#define SHOW_FILENAME_AFTER_FINISH
//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
#endif //__CONFIGURATION_PRUSA_H

3
Firmware/variants/MK25-RAMBo13a.h
View File

@ -531,4 +531,7 @@
//Show filename instead of print time after SD card print finished
//#define SHOW_FILENAME_AFTER_FINISH
//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
#endif //__CONFIGURATION_PRUSA_H

3
Firmware/variants/MK25S-RAMBo10a.h
View File

@ -535,4 +535,7 @@
//Show filename instead of print time after SD card print finished
//#define SHOW_FILENAME_AFTER_FINISH
//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
#endif //__CONFIGURATION_PRUSA_H

3
Firmware/variants/MK25S-RAMBo13a.h
View File

@ -536,4 +536,7 @@
//Show filename instead of print time after SD card print finished
//#define SHOW_FILENAME_AFTER_FINISH
//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
#endif //__CONFIGURATION_PRUSA_H

3
Firmware/variants/MK3-E3DREVO.h
View File

@ -694,4 +694,7 @@
//Show filename instead of print time after SD card print finished
//#define SHOW_FILENAME_AFTER_FINISH
//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
#endif //__CONFIGURATION_PRUSA_H

3
Firmware/variants/MK3-E3DREVO_HF_60W.h
View File

@ -695,4 +695,7 @@
//Show filename instead of print time after SD card print finished
//#define SHOW_FILENAME_AFTER_FINISH
//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
#endif //__CONFIGURATION_PRUSA_H

3
Firmware/variants/MK3.h
View File

@ -697,4 +697,7 @@
//Show filename instead of print time after SD card print finished
//#define SHOW_FILENAME_AFTER_FINISH
//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
#endif //__CONFIGURATION_PRUSA_H

3
Firmware/variants/MK3S-E3DREVO.h
View File

@ -706,4 +706,7 @@
//Show filename instead of print time after SD card print finished
//#define SHOW_FILENAME_AFTER_FINISH
//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
#endif //__CONFIGURATION_PRUSA_H

3
Firmware/variants/MK3S-E3DREVO_HF_60W.h
View File

@ -707,4 +707,7 @@
//Show filename instead of print time after SD card print finished
//#define SHOW_FILENAME_AFTER_FINISH
//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
#endif //__CONFIGURATION_PRUSA_H

3
Firmware/variants/MK3S.h
View File

@ -709,4 +709,7 @@
//Show filename instead of print time after SD card print finished
//#define SHOW_FILENAME_AFTER_FINISH
//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
#endif //__CONFIGURATION_PRUSA_H

3
Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h
View File

@ -437,4 +437,7 @@ THERMISTORS SETTINGS
//Show filename instead of print time after SD card print finished
//#define SHOW_FILENAME_AFTER_FINISH
//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
#endif //__CONFIGURATION_PRUSA_H

3
Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h
View File

@ -436,4 +436,7 @@ THERMISTORS SETTINGS
//Show filename instead of print time after SD card print finished
//#define SHOW_FILENAME_AFTER_FINISH
//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
#endif //__CONFIGURATION_PRUSA_H