From 2b38f120b759e97fd0ebf6b3f633b0f90e791416 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Mon, 23 Dec 2024 09:37:55 +0100
Subject: [PATCH 1/3] IFNDEF more code that is releated to Filament Autoload

---
 Firmware/Filament_sensor.cpp |  4 ++++
 Firmware/Filament_sensor.h   |  2 ++
 Firmware/Marlin_main.cpp     |  4 ++++
 Firmware/Prusa_farm.cpp      |  2 ++
 Firmware/ultralcd.cpp        | 29 ++++++++++++++++++-----------
 5 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/Firmware/Filament_sensor.cpp b/Firmware/Filament_sensor.cpp
index 0420b9114f..2e7f9a8007 100644
--- a/Firmware/Filament_sensor.cpp
+++ b/Firmware/Filament_sensor.cpp
@@ -16,7 +16,9 @@
 #ifdef FILAMENT_SENSOR
 FSensorBlockRunout::FSensorBlockRunout() {
     fsensor.setRunoutEnabled(false); //suppress filament runouts while loading filament.
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
     fsensor.setAutoLoadEnabled(false); //suppress filament autoloads while loading filament.
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 #if (FILAMENT_SENSOR_TYPE == FSENSOR_PAT9125)
     fsensor.setJamDetectionEnabled(false); //suppress filament jam detection while loading filament.
 #endif //(FILAMENT_SENSOR_TYPE == FSENSOR_PAT9125)
@@ -50,12 +52,14 @@ void Filament_sensor::setEnabled(bool enabled) {
     }
 }
 
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 void Filament_sensor::setAutoLoadEnabled(bool state, bool updateEEPROM) {
     autoLoadEnabled = state;
     if (updateEEPROM) {
         eeprom_update_byte_notify((uint8_t *)EEPROM_FSENS_AUTOLOAD_ENABLED, state);
     }
 }
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 
 void Filament_sensor::setRunoutEnabled(bool state, bool updateEEPROM) {
     runoutEnabled = state;
diff --git a/Firmware/Filament_sensor.h b/Firmware/Filament_sensor.h
index 6d39a69d1b..905b1eec92 100644
--- a/Firmware/Filament_sensor.h
+++ b/Firmware/Filament_sensor.h
@@ -46,8 +46,10 @@ class Filament_sensor {
 
     static void setEnabled(bool enabled);
 
+    #ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
     void setAutoLoadEnabled(bool state, bool updateEEPROM = false);
     bool getAutoLoadEnabled() const { return autoLoadEnabled; }
+    #endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 
     void setRunoutEnabled(bool state, bool updateEEPROM = false);
     bool getRunoutEnabled() const { return runoutEnabled; }
diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index ad9860012b..ec14bd4310 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -535,7 +535,9 @@ void debug_printer_states()
     printf_P(PSTR("DBG:fsensor.getFilamentPresent() = %d\n"), (int)fsensor.getFilamentPresent());
     printf_P(PSTR("DBG:MMU CUTTER ENABLED = %d\n"), (int)eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED));
     printf_P(PSTR("DBG:fsensor.isEnabled() = %d\n"), (int)fsensor.isEnabled());
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
     printf_P(PSTR("DBG:fsensor.getAutoLoadEnabled() = %d\n"), (int)fsensor.getAutoLoadEnabled());
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
     printf_P(PSTR("DBG:custom_message_type = %d\n"), (int)custom_message_type);
     printf_P(PSTR("DBG:uvlo_auto_recovery_ready = %d\n"), (int)uvlo_auto_recovery_ready);
     SERIAL_ECHOLN("");
@@ -769,7 +771,9 @@ static void factory_reset(char level)
 
 #ifdef FILAMENT_SENSOR
 		fsensor.setEnabled(true);
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 		fsensor.setAutoLoadEnabled(true, true);
+#endif //REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 		fsensor.setRunoutEnabled(true, true);
 #if (FILAMENT_SENSOR_TYPE == FSENSOR_PAT9125)
 		fsensor.setJamDetectionEnabled(true, true);
diff --git a/Firmware/Prusa_farm.cpp b/Firmware/Prusa_farm.cpp
index 7233f39d79..44aeb03f4a 100644
--- a/Firmware/Prusa_farm.cpp
+++ b/Firmware/Prusa_farm.cpp
@@ -401,7 +401,9 @@ void farm_mode_init() {
 #ifdef FILAMENT_SENSOR
         //to be converted to Filament_sensor.h...
         //disabled filament autoload (PFW360)
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
         fsensor.setAutoLoadEnabled(false);
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 #endif //FILAMENT_SENSOR
         // ~ FanCheck -> on
         eeprom_update_byte_notify((uint8_t*)EEPROM_FAN_CHECK_ENABLED, true);
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 1f8798d85a..7f17431905 100644
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -2145,9 +2145,9 @@ void lcd_wait_interact(const char* filament_name) {
       lcd_print(filament_name);
       lcd_set_cursor(0, 2);
   }
-#ifdef FILAMENT_SENSOR
+#if defined FILAMENT_SENSOR && !defined(REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY)
   if (!fsensor.getAutoLoadEnabled())
-#endif //FILAMENT_SENSOR
+#endif //FILAMENT_SENSOR AND NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
   {
     lcd_puts_P(_T(MSG_PRESS));
   }
@@ -4024,9 +4024,11 @@ static void lcd_fsensor_runout_set() {
     fsensor.setRunoutEnabled(!fsensor.getRunoutEnabled(), true);
 }
 
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 static void lcd_fsensor_autoload_set() {
     fsensor.setAutoLoadEnabled(!fsensor.getAutoLoadEnabled(), true);
 }
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 
 #if FILAMENT_SENSOR_TYPE == FSENSOR_PAT9125
 static void lcd_fsensor_jam_detection_set() {
@@ -4066,7 +4068,9 @@ static void lcd_fsensor_settings_menu() {
         }
         else {
             MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR_RUNOUT), fsensor.getRunoutEnabled() ? _T(MSG_ON) : _T(MSG_OFF), lcd_fsensor_runout_set);
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
             MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR_AUTOLOAD), fsensor.getAutoLoadEnabled() ? _T(MSG_ON) : _T(MSG_OFF), lcd_fsensor_autoload_set);
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 #if defined(FILAMENT_SENSOR) && (FILAMENT_SENSOR_TYPE == FSENSOR_PAT9125)
             MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR_JAM_DETECTION), fsensor.getJamDetectionEnabled() ? _T(MSG_ON) : _T(MSG_OFF), lcd_fsensor_jam_detection_set);
 #endif //defined(FILAMENT_SENSOR) && (FILAMENT_SENSOR_TYPE == FSENSOR_PAT9125)
@@ -5318,19 +5322,22 @@ static void lcd_main_menu()
             } else {
 #ifdef FILAMENT_SENSOR
                 if (fsensor.isEnabled()) {
-                    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);
-                    }
+//                    if (!fsensor.getAutoLoadEnabled()) {
+//                        MENU_ITEM_SUBMENU_P(_T(MSG_LOAD_FILAMENT), lcd_LoadFilament);
+//                    }
+                    if (!fsensor.getFilamentPresent()) {
 #ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
-                    else {
                         if (fsensor.getAutoLoadEnabled()) {
                             MENU_ITEM_SUBMENU_P(_T(MSG_AUTOLOAD_FILAMENT), lcd_menu_AutoLoadFilament);
-                        }                        
+                        } else {
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
+                            MENU_ITEM_SUBMENU_P(_T(MSG_LOAD_FILAMENT), lcd_LoadFilament);
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
+                        }
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
+                    } 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);

From 427eac90b4e0d6fb511ea0125eb9fc97d4efa3f2 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Mon, 23 Dec 2024 09:43:36 +0100
Subject: [PATCH 2/3] Update endif //NOT

---
 Firmware/Marlin_main.cpp | 2 +-
 Firmware/messages.cpp    | 2 +-
 Firmware/messages.h      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index ec14bd4310..acae7fb44e 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -773,7 +773,7 @@ static void factory_reset(char level)
 		fsensor.setEnabled(true);
 #ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 		fsensor.setAutoLoadEnabled(true, true);
-#endif //REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 		fsensor.setRunoutEnabled(true, true);
 #if (FILAMENT_SENSOR_TYPE == FSENSOR_PAT9125)
 		fsensor.setJamDetectionEnabled(true, true);
diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp
index 0dc91b4900..86624fa1d3 100644
--- a/Firmware/messages.cpp
+++ b/Firmware/messages.cpp
@@ -256,7 +256,7 @@ extern const char MSG_NOT_LOADED [] PROGMEM_I1 = ISTR("Filament not loaded"); //
 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
+#endif //NOT 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
diff --git a/Firmware/messages.h b/Firmware/messages.h
index 63ed2bec92..2b199acb50 100644
--- a/Firmware/messages.h
+++ b/Firmware/messages.h
@@ -255,7 +255,7 @@ 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
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 extern const char MSG_FILAMENT_USED [];
 extern const char MSG_PRINT_TIME [];
 extern const char MSG_TOTAL_FILAMENT [];

From e97409a6da12f4405492f1db9ea618d16e311663 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Mon, 30 Dec 2024 13:53:06 +0100
Subject: [PATCH 3/3] More to exclude

---
 Firmware/Filament_sensor.cpp | 18 ++++++++++++++----
 Firmware/Filament_sensor.h   |  4 ++++
 Firmware/ultralcd.cpp        | 25 +++++++++++++++++++------
 Firmware/ultralcd.h          |  5 ++++-
 Firmware/variants/MK3S.h     |  2 +-
 5 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/Firmware/Filament_sensor.cpp b/Firmware/Filament_sensor.cpp
index 2e7f9a8007..73253c9688 100644
--- a/Firmware/Filament_sensor.cpp
+++ b/Firmware/Filament_sensor.cpp
@@ -81,7 +81,9 @@ void Filament_sensor::settings_init_common() {
         state = enabled ? State::initializing : State::disabled;
     }
 
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
     autoLoadEnabled = eeprom_read_byte((uint8_t *)EEPROM_FSENS_AUTOLOAD_ENABLED);
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
     runoutEnabled = eeprom_read_byte((uint8_t *)EEPROM_FSENS_RUNOUT_ENABLED);
     sensorActionOnError = (SensorActionOnError)eeprom_read_byte((uint8_t *)EEPROM_FSENSOR_ACTION_NA);
     if (sensorActionOnError == SensorActionOnError::_Undef) {
@@ -100,19 +102,22 @@ bool Filament_sensor::checkFilamentEvents() {
     if (oldFilamentPresent != newFilamentPresent) {
         oldFilamentPresent = newFilamentPresent;
         eventBlankingTimer.start();
-        if (newFilamentPresent) { // filament insertion
+        if (!newFilamentPresent) { // filament removed
+//            puts_P(PSTR("filament removed"));
+            triggerFilamentRemoved();
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
+        } else { // filament removal
 //            puts_P(PSTR("filament inserted"));
             triggerFilamentInserted();
             postponedLoadEvent = true;
-        } else { // filament removal
-//            puts_P(PSTR("filament removed"));
-            triggerFilamentRemoved();
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
         }
         return true;
     }
     return false;
 }
 
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 void Filament_sensor::triggerFilamentInserted() {
     if (autoLoadEnabled
         && (eFilamentAction == FilamentAction::None)
@@ -127,6 +132,7 @@ void Filament_sensor::triggerFilamentInserted() {
         menu_submenu(lcd_AutoLoadFilament, true);
     }
 }
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 
 void Filament_sensor::triggerFilamentRemoved() {
 //    SERIAL_ECHOLNPGM("triggerFilamentRemoved");
@@ -155,7 +161,9 @@ void Filament_sensor::filRunout() {
 //    SERIAL_ECHOLNPGM("filRunout");
     sendHostNotification_P(MSG_FILAMENT_RUNOUT_DETECTED);
     runoutEnabled = false;
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
     autoLoadEnabled = false;
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
     stop_and_save_print_to_ram(0, 0);
     restore_print_from_ram_and_continue(0);
     eeprom_increment_byte((uint8_t *)EEPROM_FERROR_COUNT);
@@ -459,7 +467,9 @@ void PAT9125_sensor::resetStepCount() {
 
 void PAT9125_sensor::filJam() {
     runoutEnabled = false;
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
     autoLoadEnabled = false;
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
     jamDetection = false;
     stop_and_save_print_to_ram(0, 0);
     restore_print_from_ram_and_continue(0);
diff --git a/Firmware/Filament_sensor.h b/Firmware/Filament_sensor.h
index 905b1eec92..ec624171cf 100644
--- a/Firmware/Filament_sensor.h
+++ b/Firmware/Filament_sensor.h
@@ -68,7 +68,9 @@ class Filament_sensor {
 
     bool checkFilamentEvents();
 
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
     void triggerFilamentInserted();
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 
     void triggerFilamentRemoved();
 
@@ -77,7 +79,9 @@ class Filament_sensor {
     void triggerError();
 
     State state;
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
     bool autoLoadEnabled;
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
     bool runoutEnabled;
     bool oldFilamentPresent; //for creating filament presence switching events.
     bool postponedLoadEvent; //this event lasts exactly one update cycle. It is long enough to be able to do polling for load event.
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 7f17431905..475abfd21b 100644
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -1772,7 +1772,9 @@ bool shouldPreheatOnlyNozzle() {
 
     switch(eFilamentAction) {
         case FilamentAction::Load:
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
         case FilamentAction::AutoLoad:
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
         case FilamentAction::UnLoad:
         case FilamentAction::MmuLoad:
         case FilamentAction::MmuUnLoad:
@@ -1804,7 +1806,9 @@ static void mFilamentPrompt() {
     lcd_set_cursor(0,2);
     switch(eFilamentAction) {
         case FilamentAction::Load:
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
         case FilamentAction::AutoLoad:
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
         case FilamentAction::MmuLoad:
         case FilamentAction::MmuLoadingTest:
             lcd_puts_P(_T(MSG_TO_LOAD_FIL));
@@ -1824,15 +1828,21 @@ static void mFilamentPrompt() {
     if(lcd_clicked()
 #ifdef FILAMENT_SENSOR
 /// @todo leptun - add this as a specific retest item
-        || (((eFilamentAction == FilamentAction::Load) || (eFilamentAction == FilamentAction::AutoLoad)) && fsensor.getFilamentLoadEvent())
+        || (((eFilamentAction == FilamentAction::Load)
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
+        || (eFilamentAction == FilamentAction::AutoLoad)
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
+        ) && fsensor.getFilamentLoadEvent())
 #endif //FILAMENT_SENSOR
     ) {
         menu_back(bFilamentPreheatState ? 2 : 3);
         switch(eFilamentAction) {
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
             case FilamentAction::AutoLoad:
                 // loading no longer cancellable
                 eFilamentAction = FilamentAction::Load;
                 [[fallthrough]];
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
             case FilamentAction::Load:
                 enquecommand_P(MSG_M701);      // load filament
                 break;
@@ -1901,17 +1911,20 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed)
         switch (eFilamentAction)
         {
         case FilamentAction::Load:
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
         case FilamentAction::AutoLoad:
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
         case FilamentAction::UnLoad:
             if (bFilamentWaitingFlag) menu_submenu(mFilamentPrompt, true);
             else
             {
                 mFilamentResetMenuStack();
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
                 if (eFilamentAction == FilamentAction::AutoLoad) {
                     // loading no longer cancellable
                     eFilamentAction = FilamentAction::Load;
                 }
-
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
                 if (eFilamentAction == FilamentAction::Load)
                     enquecommand_P(MSG_M701); // load filament
                 else if (eFilamentAction == FilamentAction::UnLoad)
@@ -1983,7 +1996,9 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed)
             switch (eFilamentAction)
             {
             case FilamentAction::Load:
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
             case FilamentAction::AutoLoad:
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
             case FilamentAction::MmuLoad:
             case FilamentAction::MmuLoadingTest:
                 lcd_puts_P(_T(MSG_PREHEATING_TO_LOAD));
@@ -2308,10 +2323,11 @@ static void lcd_LoadFilament()
     preheat_or_continue(FilamentAction::Load);
 }
 
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 void lcd_AutoLoadFilament() {
     preheat_or_continue(FilamentAction::AutoLoad);
 }
-
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 
 //! @brief Show filament used a print time
 //!
@@ -5322,9 +5338,6 @@ static void lcd_main_menu()
             } else {
 #ifdef FILAMENT_SENSOR
                 if (fsensor.isEnabled()) {
-//                    if (!fsensor.getAutoLoadEnabled()) {
-//                        MENU_ITEM_SUBMENU_P(_T(MSG_LOAD_FILAMENT), lcd_LoadFilament);
-//                    }
                     if (!fsensor.getFilamentPresent()) {
 #ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
                         if (fsensor.getAutoLoadEnabled()) {
diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h
index f2446110cf..a0b462de4c 100755
--- a/Firmware/ultralcd.h
+++ b/Firmware/ultralcd.h
@@ -182,7 +182,9 @@ enum class FilamentAction : uint_least8_t
 {
     None, // no filament action is taking place
     Load,
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
     AutoLoad, // triggered by insertion, cancellable until it transitions to Load
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
     UnLoad,
     MmuLoad,
     MmuUnLoad,
@@ -197,8 +199,9 @@ extern FilamentAction eFilamentAction;
 void mFilamentItem(uint16_t nTemp,uint16_t nTempBed);
 void lcd_generic_preheat_menu();
 void unload_filament(float unloadLength);
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 void lcd_AutoLoadFilament();
-
+#endif //NOT REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 
 void lcd_wait_for_heater();
 void lcd_wait_for_cool_down();
diff --git a/Firmware/variants/MK3S.h b/Firmware/variants/MK3S.h
index 113df38eb3..1d61a6efcd 100644
--- a/Firmware/variants/MK3S.h
+++ b/Firmware/variants/MK3S.h
@@ -707,6 +707,6 @@
  *------------------------------------*/
 
 //Uncomment to remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
-//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
+#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 
 #endif //__CONFIGURATION_PRUSA_H