Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove lcd_menu_AutoLoadFilament #4763

Open
wants to merge 1 commit into
base: MK3
Choose a base branch
from
Open

Remove lcd_menu_AutoLoadFilament #4763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Firmware/messages.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions Firmware/messages.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 [];
Expand Down
15 changes: 9 additions & 6 deletions Firmware/ultralcd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {

Expand Down Expand Up @@ -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.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);
}
} else {
MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), lcd_unLoadFilament);
}
}
#endif //REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
} else {
#endif //FILAMENT_SENSOR
MENU_ITEM_SUBMENU_P(_T(MSG_LOAD_FILAMENT), lcd_LoadFilament);
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/MK25-RAMBo10a.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 3 additions & 0 deletions Firmware/variants/MK25-RAMBo13a.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 3 additions & 0 deletions Firmware/variants/MK25S-RAMBo10a.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 3 additions & 0 deletions Firmware/variants/MK25S-RAMBo13a.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 3 additions & 0 deletions Firmware/variants/MK3-E3DREVO.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 3 additions & 0 deletions Firmware/variants/MK3-E3DREVO_HF_60W.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 3 additions & 0 deletions Firmware/variants/MK3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 3 additions & 0 deletions Firmware/variants/MK3S-E3DREVO.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 3 additions & 0 deletions Firmware/variants/MK3S-E3DREVO_HF_60W.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 3 additions & 0 deletions Firmware/variants/MK3S.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 3 additions & 0 deletions Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 3 additions & 0 deletions Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading