Skip to content

Commit a174b0f

Browse files
sarusanisarusani
committed
Remove lcd_menu_AutoLoadFilament
1 parent d3f9559 commit a174b0f

29 files changed

+97
-104
lines changed

‎Firmware/messages.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,9 @@ 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+
#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
257258
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
259+
#endif //REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
258260
extern const char MSG_FILAMENT_USED [] PROGMEM_I1 = ISTR("Filament used"); ////MSG_FILAMENT_USED c=19
259261
extern const char MSG_PRINT_TIME [] PROGMEM_I1 = ISTR("Print time"); ////MSG_PRINT_TIME c=19
260262
extern const char MSG_TOTAL_FILAMENT [] PROGMEM_I1 = ISTR("Total filament"); ////MSG_TOTAL_FILAMENT c=19

‎Firmware/messages.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,9 @@ 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+
#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
256257
extern const char MSG_AUTOLOADING_ENABLED [];
258+
#endif //REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
257259
extern const char MSG_FILAMENT_USED [];
258260
extern const char MSG_PRINT_TIME [];
259261
extern const char MSG_TOTAL_FILAMENT [];

‎Firmware/ultralcd.cpp‎

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

2280-
#ifdef FILAMENT_SENSOR
2280+
#if defined(FILAMENT_SENSOR) && !defined(REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY)
22812281
static void lcd_menu_AutoLoadFilament()
22822282
{
22832283
lcd_display_message_fullscreen_nonBlocking_P(_T(MSG_AUTOLOADING_ENABLED));
22842284
menu_back_if_clicked();
22852285
}
2286-
#endif //FILAMENT_SENSOR
2286+
#endif //FILAMENT_SENSOR && REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
22872287

22882288
static void preheat_or_continue(FilamentAction action) {
22892289

@@ -5321,13 +5321,16 @@ static void lcd_main_menu()
53215321
if (!fsensor.getAutoLoadEnabled()) {
53225322
MENU_ITEM_SUBMENU_P(_T(MSG_LOAD_FILAMENT), lcd_LoadFilament);
53235323
}
5324-
if (!fsensor.getFilamentPresent()) {
5324+
if (fsensor.getFilamentPresent()) {
5325+
MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), lcd_unLoadFilament);
5326+
}
5327+
#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
5328+
else {
53255329
if (fsensor.getAutoLoadEnabled()) {
53265330
MENU_ITEM_SUBMENU_P(_T(MSG_AUTOLOAD_FILAMENT), lcd_menu_AutoLoadFilament);
5327-
}
5328-
} else {
5329-
MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), lcd_unLoadFilament);
5331+
}
53305332
}
5333+
#endif //REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
53315334
} else {
53325335
#endif //FILAMENT_SENSOR
53335336
MENU_ITEM_SUBMENU_P(_T(MSG_LOAD_FILAMENT), lcd_LoadFilament);

‎Firmware/variants/MK25-RAMBo10a.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,4 +520,11 @@
520520
#define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable
521521
#define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable
522522

523+
/*------------------------------------
524+
COMMUNITY FEATURES
525+
*------------------------------------*/
526+
527+
//Uncomment to remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
528+
//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
529+
523530
#endif //__CONFIGURATION_PRUSA_H

‎Firmware/variants/MK25-RAMBo13a.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -524,4 +524,11 @@
524524
#define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable
525525
#define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable
526526

527+
/*------------------------------------
528+
COMMUNITY FEATURES
529+
*------------------------------------*/
530+
531+
//Uncomment to remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
532+
//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
533+
527534
#endif //__CONFIGURATION_PRUSA_H

‎Firmware/variants/MK25S-RAMBo10a.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -528,4 +528,11 @@
528528
#define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable
529529
#define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable
530530

531+
/*------------------------------------
532+
COMMUNITY FEATURES
533+
*------------------------------------*/
534+
535+
//Uncomment to remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
536+
//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
537+
531538
#endif //__CONFIGURATION_PRUSA_H

‎Firmware/variants/MK25S-RAMBo13a.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,4 +529,11 @@
529529
#define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable
530530
#define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable
531531

532+
/*------------------------------------
533+
COMMUNITY FEATURES
534+
*------------------------------------*/
535+
536+
//Uncomment to remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
537+
//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
538+
532539
#endif //__CONFIGURATION_PRUSA_H

‎Firmware/variants/MK3-E3DREVO.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -687,4 +687,11 @@
687687
#define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable
688688
#define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable
689689

690+
/*------------------------------------
691+
COMMUNITY FEATURES
692+
*------------------------------------*/
693+
694+
//Uncomment to remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
695+
//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
696+
690697
#endif //__CONFIGURATION_PRUSA_H

‎Firmware/variants/MK3-E3DREVO_HF_60W.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -688,4 +688,11 @@
688688
#define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable
689689
#define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable
690690

691+
/*------------------------------------
692+
COMMUNITY FEATURES
693+
*------------------------------------*/
694+
695+
//Uncomment to remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
696+
//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
697+
691698
#endif //__CONFIGURATION_PRUSA_H

‎Firmware/variants/MK3.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -690,4 +690,11 @@
690690
#define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable
691691
#define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable
692692

693+
/*------------------------------------
694+
COMMUNITY FEATURES
695+
*------------------------------------*/
696+
697+
//Uncomment to remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
698+
//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
699+
693700
#endif //__CONFIGURATION_PRUSA_H

0 commit comments

Comments
 (0)