From ec5e54de25ec8d0c08726b880f0c26be9b4dedf5 Mon Sep 17 00:00:00 2001
From: MRprusa3d <martin.remis@prusa3d.cz>
Date: Mon, 2 Mar 2020 17:52:25 +0100
Subject: [PATCH 1/8] state fixing

---
 Firmware/Marlin_main.cpp | 29 ++++++++++++++++++++++
 Firmware/config.h        |  4 ++--
 Firmware/ultralcd.cpp    | 52 ++++++++++++++++++++++++++++++++++++----
 Firmware/ultralcd.h      |  3 +++
 4 files changed, 81 insertions(+), 7 deletions(-)

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 211384f9..6f74d5a7 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -9439,6 +9439,8 @@ static void handleSafetyTimer()
 }
 #endif //SAFETYTIMER
 
+extern bool bMenuDetect; / -> .h
+extern void lcd_status_screen(); / -> .h & 'static'
 void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument set in Marlin.h
 {
 bool bInhibitFlag;
@@ -9451,11 +9453,38 @@ bool bInhibitFlag;
 #endif // PAT9125
 #ifdef IR_SENSOR
           bInhibitFlag=(menu_menu==lcd_menu_show_sensors_state); // Support::SensorInfo menu active
+//MYSERIAL.print("inhibit :: ");
+//MYSERIAL.println(bInhibitFlag);
+// & IR_SENSOR_ANALOG ???
+//bInhibitFlag|=(menu_menu==lcd_detect_IRsensor); // Settings::HWsetup::FSdetect menu active
+//.bInhibitFlag=bInhibitFlag||(menu_menu==lcd_detect_IRsensor); // Settings::HWsetup::FSdetect menu active
+bInhibitFlag=bInhibitFlag||bMenuDetect; // Settings::HWsetup::FSdetect menu active
+//MYSERIAL.print("        :: ");
+//MYSERIAL.println(bInhibitFlag);
+//MYSERIAL.println(current_voltage_raw_IR);
 #endif // IR_SENSOR
           if ((mcode_in_progress != 600) && (eFilamentAction != FilamentAction::AutoLoad) && (!bInhibitFlag)) //M600 not in progress, preHeat @ autoLoad menu not active, Support::ExtruderInfo/SensorInfo menu not active
 		{
 			if (!moves_planned() && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LcdCommands::Layer1Cal) && ! eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE))
 			{
+// *****
+// & IR_SENSOR_ANALOG ???
+bool bTemp;
+bTemp=current_voltage_raw_IR>14000; // nahradit prumerem @ vicero hodnot
+bTemp=bTemp&&(target_temperature[0]==0); // & bed (& dalsi extrudery)
+bTemp=bTemp&&(menu_menu==lcd_status_screen);
+bTemp=bTemp&&((oFsensorPCB==ClFsensorPCB::_Old)||(oFsensorPCB==ClFsensorPCB::_Undef));
+bTemp=bTemp&&fsensor_enabled;
+if(bTemp)
+     {
+     MYSERIAL.println(current_voltage_raw_IR);
+     MYSERIAL.println("!!!!! -> 03b !!!!!");
+     oFsensorPCB=ClFsensorPCB::_Rev03b;
+     //bTemp=lcd_show_fullscreen_message_yes_no_and_wait_P(_i("?potvrdit?"),false,true);
+     //MYSERIAL.println(bTemp);
+     lcd_setstatuspgm(_i("!!! -> 03b !!!"));
+     }
+// *****
 				if (fsensor_check_autoload())
 				{
 #ifdef PAT9125
diff --git a/Firmware/config.h b/Firmware/config.h
index 241a2f20..e6d81fe9 100644
--- a/Firmware/config.h
+++ b/Firmware/config.h
@@ -55,8 +55,8 @@
 #define W25X20CL_SPSR          SPI_SPSR(W25X20CL_SPI_RATE)
 
 //LANG - Multi-language support
-//define LANG_MODE              0 // primary language only
-#define LANG_MODE              1 // sec. language support
+#define LANG_MODE              0 // primary language only
+//#define LANG_MODE              1 // sec. language support
 
 #define LANG_SIZE_RESERVED     0x3000 // reserved space for secondary language (12288 bytes)
 
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 38471b81..6c5fc3e2 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -114,7 +114,8 @@ static const char* lcd_display_message_fullscreen_nonBlocking_P(const char *msg,
 // void copy_and_scalePID_d();
 
 /* Different menus */
-static void lcd_status_screen();
+//-//static void lcd_status_screen();
+  void lcd_status_screen();
 #if (LANG_MODE != 0)
 static void lcd_language_menu();
 #endif
@@ -236,7 +237,8 @@ static bool lcd_selftest_fsensor();
 #endif //PAT9125
 static bool selftest_irsensor();
 #if IR_SENSOR_ANALOG
-static bool lcd_selftest_IRsensor();
+static bool lcd_selftest_IRsensor(bool bStandalone = false);
+//-//static lcd_detect_IRsensor();
 #endif //IR_SENSOR_ANALOG
 static void lcd_selftest_error(TestError error, const char *_error_1, const char *_error_2);
 static void lcd_colorprint_change();
@@ -2146,6 +2148,23 @@ static void lcd_support_menu()
   MENU_ITEM_BACK_P(_i("Date:"));////MSG_DATE c=17 r=1
   MENU_ITEM_BACK_P(PSTR(__DATE__));
 
+  MENU_ITEM_BACK_P(STR_SEPARATOR);
+  MENU_ITEM_BACK_P(PSTR("Fil. sensor v.:"));
+  switch(oFsensorPCB)
+       {
+       case ClFsensorPCB::_Old:
+            MENU_ITEM_BACK_P(PSTR(" 03 or older"));
+            break;
+       case ClFsensorPCB::_Rev03b:
+            MENU_ITEM_BACK_P(PSTR(" 03b or newer"));
+            break;
+       case ClFsensorPCB::_Undef:
+            MENU_ITEM_BACK_P(PSTR(" N/A"));
+            break;
+       default:
+            MENU_ITEM_BACK_P(PSTR(" unknown"));
+       }
+
 	MENU_ITEM_BACK_P(STR_SEPARATOR);
 	if (mmu_enabled)
 	{
@@ -5697,6 +5716,7 @@ void lcd_hw_setup_menu(void)                      // can not be "static"
 
 #if IR_SENSOR_ANALOG
     FSENSOR_ACTION_NA;
+    MENU_ITEM_FUNCTION_P(PSTR("FS Detect"), lcd_detect_IRsensor);
 #endif //IR_SENSOR_ANALOG
     MENU_END();
 }
@@ -7496,7 +7516,7 @@ void lcd_belttest()
 #endif //TMC2130
 
 #if IR_SENSOR_ANALOG
-static bool lcd_selftest_IRsensor()
+static bool lcd_selftest_IRsensor(bool bStandalone)
 {
 bool bAction;
 bool bPCBrev03b;
@@ -7509,7 +7529,8 @@ volt_IR=VOLT_DIV_REF*((float)volt_IR_int/(1023*OVERSAMPLENR));
 printf_P(PSTR("Measured filament sensor high level: %4.2fV\n"),volt_IR);
 if(volt_IR_int<((int)IRsensor_Hmin_TRESHOLD))
      {
-     lcd_selftest_error(TestError::FsensorLevel,"HIGH","");
+     if(!bStandalone)
+          lcd_selftest_error(TestError::FsensorLevel,"HIGH","");
      return(false);
      }
 lcd_show_fullscreen_message_and_wait_P(_i("Please insert filament (but not load them!) into extruder and then press the knob."));
@@ -7518,7 +7539,8 @@ volt_IR=VOLT_DIV_REF*((float)volt_IR_int/(1023*OVERSAMPLENR));
 printf_P(PSTR("Measured filament sensor low level: %4.2fV\n"),volt_IR);
 if(volt_IR_int>((int)IRsensor_Lmax_TRESHOLD))
      {
-     lcd_selftest_error(TestError::FsensorLevel,"LOW","");
+     if(!bStandalone)
+          lcd_selftest_error(TestError::FsensorLevel,"LOW","");
      return(false);
      }
 if((bPCBrev03b?1:0)!=(uint8_t)oFsensorPCB)        // safer then "(uint8_t)bPCBrev03b"
@@ -7529,6 +7551,26 @@ if((bPCBrev03b?1:0)!=(uint8_t)oFsensorPCB)        // safer then "(uint8_t)bPCBre
      }
 return(true);
 }
+
+bool bMenuDetect=false;
+//static void lcd_detect_IRsensor()
+void lcd_detect_IRsensor()
+{
+bool bAction;
+
+bMenuDetect=true;
+bAction=lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is the filament unloaded?"),false,true);
+if(!bAction)
+     {
+     lcd_show_fullscreen_message_and_wait_P(_i("... vyjmi & opakuj ..."));
+     return;
+     }
+bAction=lcd_selftest_IRsensor(true);
+if(bAction)
+     lcd_show_fullscreen_message_and_wait_P(_i("... povedlo se - VYJMI!!! ..."));
+else lcd_show_fullscreen_message_and_wait_P(_i("... NEpovedlo se - VYJMI!!!..."));
+bMenuDetect=false;
+}
 #endif //IR_SENSOR_ANALOG
 
 static void lcd_selftest_v()
diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h
index 9e0c35b0..c9a9d65d 100755
--- a/Firmware/ultralcd.h
+++ b/Firmware/ultralcd.h
@@ -57,6 +57,9 @@ void lcd_menu_statistics();
 
 void lcd_menu_extruder_info();                    // NOT static due to using inside "Marlin_main" module ("manage_inactivity()")
 void lcd_menu_show_sensors_state();               // NOT static due to using inside "Marlin_main" module ("manage_inactivity()")
+
+   void lcd_detect_IRsensor(); // NOT static due to using inside "Marlin_main" module ("manage_inactivity()")
+
 #ifdef TMC2130
 bool lcd_crash_detect_enabled();
 void lcd_crash_detect_enable();

From 2a9504b20a5a6db30550e8c22cd1b28fe1eed3d6 Mon Sep 17 00:00:00 2001
From: MRprusa3d <martin.remis@prusa3d.cz>
Date: Mon, 2 Mar 2020 19:07:23 +0100
Subject: [PATCH 2/8] !!! for testing only !!!

filament sensor auto-detection
---
 Firmware/Marlin_main.cpp | 49 ++++++++++++++++------------------------
 Firmware/config.h        |  4 ++--
 Firmware/ultralcd.cpp    | 27 +++++++++++-----------
 Firmware/ultralcd.h      |  7 ++++--
 4 files changed, 40 insertions(+), 47 deletions(-)

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 6f74d5a7..7ecbe0e9 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -9439,12 +9439,11 @@ static void handleSafetyTimer()
 }
 #endif //SAFETYTIMER
 
-extern bool bMenuDetect; / -> .h
-extern void lcd_status_screen(); / -> .h & 'static'
 void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument set in Marlin.h
 {
-bool bInhibitFlag;
 #ifdef FILAMENT_SENSOR
+bool bInhibitFlag;
+
 	if (mmu_enabled == false)
 	{
 //-//		if (mcode_in_progress != 600) //M600 not in progress
@@ -9453,38 +9452,28 @@ bool bInhibitFlag;
 #endif // PAT9125
 #ifdef IR_SENSOR
           bInhibitFlag=(menu_menu==lcd_menu_show_sensors_state); // Support::SensorInfo menu active
-//MYSERIAL.print("inhibit :: ");
-//MYSERIAL.println(bInhibitFlag);
-// & IR_SENSOR_ANALOG ???
-//bInhibitFlag|=(menu_menu==lcd_detect_IRsensor); // Settings::HWsetup::FSdetect menu active
-//.bInhibitFlag=bInhibitFlag||(menu_menu==lcd_detect_IRsensor); // Settings::HWsetup::FSdetect menu active
-bInhibitFlag=bInhibitFlag||bMenuDetect; // Settings::HWsetup::FSdetect menu active
-//MYSERIAL.print("        :: ");
-//MYSERIAL.println(bInhibitFlag);
-//MYSERIAL.println(current_voltage_raw_IR);
+#ifdef IR_SENSOR_ANALOG
+          bInhibitFlag=bInhibitFlag||bMenuFSDetect; // Settings::HWsetup::FSdetect menu active
+#endif // IR_SENSOR_ANALOG
 #endif // IR_SENSOR
           if ((mcode_in_progress != 600) && (eFilamentAction != FilamentAction::AutoLoad) && (!bInhibitFlag)) //M600 not in progress, preHeat @ autoLoad menu not active, Support::ExtruderInfo/SensorInfo menu not active
 		{
 			if (!moves_planned() && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LcdCommands::Layer1Cal) && ! eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE))
 			{
-// *****
-// & IR_SENSOR_ANALOG ???
-bool bTemp;
-bTemp=current_voltage_raw_IR>14000; // nahradit prumerem @ vicero hodnot
-bTemp=bTemp&&(target_temperature[0]==0); // & bed (& dalsi extrudery)
-bTemp=bTemp&&(menu_menu==lcd_status_screen);
-bTemp=bTemp&&((oFsensorPCB==ClFsensorPCB::_Old)||(oFsensorPCB==ClFsensorPCB::_Undef));
-bTemp=bTemp&&fsensor_enabled;
-if(bTemp)
-     {
-     MYSERIAL.println(current_voltage_raw_IR);
-     MYSERIAL.println("!!!!! -> 03b !!!!!");
-     oFsensorPCB=ClFsensorPCB::_Rev03b;
-     //bTemp=lcd_show_fullscreen_message_yes_no_and_wait_P(_i("?potvrdit?"),false,true);
-     //MYSERIAL.println(bTemp);
-     lcd_setstatuspgm(_i("!!! -> 03b !!!"));
-     }
-// *****
+#ifdef IR_SENSOR_ANALOG
+                    bool bTemp=current_voltage_raw_IR>14000; // nahradit prumerem @ vicero hodnot
+                    bTemp=bTemp&&(target_temperature[0]==0); // & bed (& dalsi extrudery)
+                    bTemp=bTemp&&(menu_menu==lcd_status_screen);
+                    bTemp=bTemp&&((oFsensorPCB==ClFsensorPCB::_Old)||(oFsensorPCB==ClFsensorPCB::_Undef));
+                    bTemp=bTemp&&fsensor_enabled;
+                    if(bTemp)
+                    {
+                         oFsensorPCB=ClFsensorPCB::_Rev03b;
+//                         eeprom_update_byte((uint8_t*)EEPROM_FSENSOR_PCB,(uint8_t)oFsensorPCB);
+                         printf_P(PSTR("Filament sensor board change detected: revision 03b or newer\n"));
+                         lcd_setstatuspgm(_i("FS rev. 03b or newer"));
+                    }
+#endif // IR_SENSOR_ANALOG
 				if (fsensor_check_autoload())
 				{
 #ifdef PAT9125
diff --git a/Firmware/config.h b/Firmware/config.h
index e6d81fe9..ab93d798 100644
--- a/Firmware/config.h
+++ b/Firmware/config.h
@@ -55,8 +55,8 @@
 #define W25X20CL_SPSR          SPI_SPSR(W25X20CL_SPI_RATE)
 
 //LANG - Multi-language support
-#define LANG_MODE              0 // primary language only
-//#define LANG_MODE              1 // sec. language support
+//#define LANG_MODE              0 // primary language only
+#define LANG_MODE              1 // sec. language support
 
 #define LANG_SIZE_RESERVED     0x3000 // reserved space for secondary language (12288 bytes)
 
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 6c5fc3e2..a2acd1b9 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -68,6 +68,10 @@ uint8_t SilentModeMenu_MMU = 1; //activate mmu unit stealth mode
 
 int8_t FSensorStateMenu = 1;
 
+#if IR_SENSOR_ANALOG
+bool bMenuFSDetect=false;
+#endif //IR_SENSOR_ANALOG
+
 
 #ifdef SDCARD_SORT_ALPHA
 bool presort_flag = false;
@@ -114,8 +118,7 @@ static const char* lcd_display_message_fullscreen_nonBlocking_P(const char *msg,
 // void copy_and_scalePID_d();
 
 /* Different menus */
-//-//static void lcd_status_screen();
-  void lcd_status_screen();
+//static void lcd_status_screen();                // NOT static due to using inside "Marlin_main" module ("manage_inactivity()")
 #if (LANG_MODE != 0)
 static void lcd_language_menu();
 #endif
@@ -237,8 +240,8 @@ static bool lcd_selftest_fsensor();
 #endif //PAT9125
 static bool selftest_irsensor();
 #if IR_SENSOR_ANALOG
-static bool lcd_selftest_IRsensor(bool bStandalone = false);
-//-//static lcd_detect_IRsensor();
+static bool lcd_selftest_IRsensor(bool bStandalone=false);
+static void lcd_detect_IRsensor();
 #endif //IR_SENSOR_ANALOG
 static void lcd_selftest_error(TestError error, const char *_error_1, const char *_error_2);
 static void lcd_colorprint_change();
@@ -977,7 +980,7 @@ void lcdui_print_status_screen(void)
 }
 
 // Main status screen. It's up to the implementation specific part to show what is needed. As this is very display dependent
-static void lcd_status_screen()
+void lcd_status_screen()                          // NOT static due to using inside "Marlin_main" module ("manage_inactivity()")
 {
 	if (firstrun == 1) 
 	{
@@ -7552,24 +7555,22 @@ if((bPCBrev03b?1:0)!=(uint8_t)oFsensorPCB)        // safer then "(uint8_t)bPCBre
 return(true);
 }
 
-bool bMenuDetect=false;
-//static void lcd_detect_IRsensor()
-void lcd_detect_IRsensor()
+static void lcd_detect_IRsensor()
 {
 bool bAction;
 
-bMenuDetect=true;
+bMenuFSDetect=true;                               // inhibits some code inside "manage_inactivity()"
 bAction=lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is the filament unloaded?"),false,true);
 if(!bAction)
      {
-     lcd_show_fullscreen_message_and_wait_P(_i("... vyjmi & opakuj ..."));
+     lcd_show_fullscreen_message_and_wait_P(_i("... so unload the filament and repeat action!"));
      return;
      }
 bAction=lcd_selftest_IRsensor(true);
 if(bAction)
-     lcd_show_fullscreen_message_and_wait_P(_i("... povedlo se - VYJMI!!! ..."));
-else lcd_show_fullscreen_message_and_wait_P(_i("... NEpovedlo se - VYJMI!!!..."));
-bMenuDetect=false;
+     lcd_show_fullscreen_message_and_wait_P(_i("PCB check successful - withdraw the filament now!"));
+else lcd_show_fullscreen_message_and_wait_P(_i("PCB check unsuccessful - withdraw the filament now!"));
+bMenuFSDetect=false;                              // de-inhibits some code inside "manage_inactivity()"
 }
 #endif //IR_SENSOR_ANALOG
 
diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h
index c9a9d65d..ca64659a 100755
--- a/Firmware/ultralcd.h
+++ b/Firmware/ultralcd.h
@@ -55,11 +55,10 @@ extern bool lcd_selftest();
 
 void lcd_menu_statistics(); 
 
+void lcd_status_screen();                         // NOT static due to using inside "Marlin_main" module ("manage_inactivity()")
 void lcd_menu_extruder_info();                    // NOT static due to using inside "Marlin_main" module ("manage_inactivity()")
 void lcd_menu_show_sensors_state();               // NOT static due to using inside "Marlin_main" module ("manage_inactivity()")
 
-   void lcd_detect_IRsensor(); // NOT static due to using inside "Marlin_main" module ("manage_inactivity()")
-
 #ifdef TMC2130
 bool lcd_crash_detect_enabled();
 void lcd_crash_detect_enable();
@@ -141,6 +140,10 @@ extern uint8_t farm_status;
 #define SILENT_MODE_OFF SILENT_MODE_POWER
 #endif
 
+#if IR_SENSOR_ANALOG
+extern bool bMenuFSDetect;
+#endif //IR_SENSOR_ANALOG
+
 extern int8_t SilentModeMenu;
 extern uint8_t SilentModeMenu_MMU;
 

From 0eaa4edfee5ce1b76c279c809cc0f4e02935ace4 Mon Sep 17 00:00:00 2001
From: MRprusa3d <martin.remis@prusa3d.cz>
Date: Mon, 2 Mar 2020 21:18:11 +0100
Subject: [PATCH 3/8] configuration update

---
 Firmware/Marlin_main.cpp | 5 +++--
 Firmware/ultralcd.cpp    | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 7ecbe0e9..cbf42c9a 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -46,6 +46,7 @@
 //-//
 #include "Configuration.h"
 #include "Marlin.h"
+#include "config.h"
   
 #ifdef ENABLE_AUTO_BED_LEVELING
 #include "vector_3.h"
@@ -9452,7 +9453,7 @@ bool bInhibitFlag;
 #endif // PAT9125
 #ifdef IR_SENSOR
           bInhibitFlag=(menu_menu==lcd_menu_show_sensors_state); // Support::SensorInfo menu active
-#ifdef IR_SENSOR_ANALOG
+#if IR_SENSOR_ANALOG
           bInhibitFlag=bInhibitFlag||bMenuFSDetect; // Settings::HWsetup::FSdetect menu active
 #endif // IR_SENSOR_ANALOG
 #endif // IR_SENSOR
@@ -9460,7 +9461,7 @@ bool bInhibitFlag;
 		{
 			if (!moves_planned() && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LcdCommands::Layer1Cal) && ! eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE))
 			{
-#ifdef IR_SENSOR_ANALOG
+#if IR_SENSOR_ANALOG
                     bool bTemp=current_voltage_raw_IR>14000; // nahradit prumerem @ vicero hodnot
                     bTemp=bTemp&&(target_temperature[0]==0); // & bed (& dalsi extrudery)
                     bTemp=bTemp&&(menu_menu==lcd_status_screen);
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index a2acd1b9..845ab3fd 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -2151,6 +2151,7 @@ static void lcd_support_menu()
   MENU_ITEM_BACK_P(_i("Date:"));////MSG_DATE c=17 r=1
   MENU_ITEM_BACK_P(PSTR(__DATE__));
 
+#if IR_SENSOR_ANALOG
   MENU_ITEM_BACK_P(STR_SEPARATOR);
   MENU_ITEM_BACK_P(PSTR("Fil. sensor v.:"));
   switch(oFsensorPCB)
@@ -2167,6 +2168,7 @@ static void lcd_support_menu()
        default:
             MENU_ITEM_BACK_P(PSTR(" unknown"));
        }
+#endif // IR_SENSOR_ANALOG
 
 	MENU_ITEM_BACK_P(STR_SEPARATOR);
 	if (mmu_enabled)

From f09323a78f6c3db246c99c62fef4999e791385c1 Mon Sep 17 00:00:00 2001
From: MRprusa3d <martin.remis@prusa3d.cz>
Date: Tue, 3 Mar 2020 14:57:45 +0100
Subject: [PATCH 4/8] heaters-checking update

---
 Firmware/Marlin_main.cpp | 2 +-
 Firmware/temperature.cpp | 8 ++++++++
 Firmware/temperature.h   | 5 +++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index cbf42c9a..dd1a9e72 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -9463,7 +9463,7 @@ bool bInhibitFlag;
 			{
 #if IR_SENSOR_ANALOG
                     bool bTemp=current_voltage_raw_IR>14000; // nahradit prumerem @ vicero hodnot
-                    bTemp=bTemp&&(target_temperature[0]==0); // & bed (& dalsi extrudery)
+                    bTemp=bTemp&&(!CHECK_ALL_HEATERS);
                     bTemp=bTemp&&(menu_menu==lcd_status_screen);
                     bTemp=bTemp&&((oFsensorPCB==ClFsensorPCB::_Old)||(oFsensorPCB==ClFsensorPCB::_Undef));
                     bTemp=bTemp&&fsensor_enabled;
diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp
index 88674cf9..b8c4fc27 100755
--- a/Firmware/temperature.cpp
+++ b/Firmware/temperature.cpp
@@ -210,6 +210,14 @@ static void temp_runaway_check(int _heater_id, float _target_temperature, float
 static void temp_runaway_stop(bool isPreheat, bool isBed);
 #endif
 
+// return "false", if all extruder-heaters are 'off' (ie. "true", if any heater is 'on')
+bool checkAllHotends(void)
+{
+    bool result=false;
+    for(int i=0;i<EXTRUDERS;i++) result=(result||(target_temperature[i]!=0));
+    return(result);
+}
+
   void PID_autotune(float temp, int extruder, int ncycles)
   {
   pid_number_of_cycles = ncycles;
diff --git a/Firmware/temperature.h b/Firmware/temperature.h
index acbb2793..ba56e681 100755
--- a/Firmware/temperature.h
+++ b/Firmware/temperature.h
@@ -47,6 +47,8 @@
 void tp_init();  //initialize the heating
 void manage_heater(); //it is critical that this is called periodically.
 
+extern bool checkAllHotends(void);
+
 // low level conversion routines
 // do not use these routines and variables outside of temperature.cpp
 extern int target_temperature[EXTRUDERS];  
@@ -220,6 +222,9 @@ FORCE_INLINE bool isCoolingBed() {
 #error Invalid number of extruders
 #endif
 
+// return "false", if all heaters are 'off' (ie. "true", if any heater is 'on')
+#define CHECK_ALL_HEATERS (checkAllHotends()||(target_temperature_bed!=0))
+
 int getHeaterPower(int heater);
 void disable_heater();
 void updatePID();

From f71bbfe95e5eab4d52af21f455a93bdfe2d417ab Mon Sep 17 00:00:00 2001
From: MRprusa3d <martin.remis@prusa3d.cz>
Date: Tue, 10 Mar 2020 00:11:17 +0100
Subject: [PATCH 5/8] tresholds specification, steady delay

---
 Firmware/Marlin_main.cpp | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index dd1a9e72..6b5f2470 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -9440,10 +9440,14 @@ static void handleSafetyTimer()
 }
 #endif //SAFETYTIMER
 
+#define FS_CHECK_COUNT 15
 void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument set in Marlin.h
 {
 #ifdef FILAMENT_SENSOR
 bool bInhibitFlag;
+#if IR_SENSOR_ANALOG
+static uint8_t nFSCheckCount=0;
+#endif // IR_SENSOR_ANALOG
 
 	if (mmu_enabled == false)
 	{
@@ -9462,18 +9466,25 @@ bool bInhibitFlag;
 			if (!moves_planned() && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LcdCommands::Layer1Cal) && ! eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE))
 			{
 #if IR_SENSOR_ANALOG
-                    bool bTemp=current_voltage_raw_IR>14000; // nahradit prumerem @ vicero hodnot
+                    bool bTemp=current_voltage_raw_IR>IRsensor_Hmin_TRESHOLD;
+                    bTemp=bTemp&&current_voltage_raw_IR<IRsensor_Hopen_TRESHOLD;
                     bTemp=bTemp&&(!CHECK_ALL_HEATERS);
                     bTemp=bTemp&&(menu_menu==lcd_status_screen);
                     bTemp=bTemp&&((oFsensorPCB==ClFsensorPCB::_Old)||(oFsensorPCB==ClFsensorPCB::_Undef));
                     bTemp=bTemp&&fsensor_enabled;
                     if(bTemp)
                     {
-                         oFsensorPCB=ClFsensorPCB::_Rev03b;
-//                         eeprom_update_byte((uint8_t*)EEPROM_FSENSOR_PCB,(uint8_t)oFsensorPCB);
-                         printf_P(PSTR("Filament sensor board change detected: revision 03b or newer\n"));
-                         lcd_setstatuspgm(_i("FS rev. 03b or newer"));
+                         nFSCheckCount++;
+                         if(nFSCheckCount>FS_CHECK_COUNT)
+                         {
+                              nFSCheckCount=0;    // not necessary
+                              oFsensorPCB=ClFsensorPCB::_Rev03b;
+//                              eeprom_update_byte((uint8_t*)EEPROM_FSENSOR_PCB,(uint8_t)oFsensorPCB);
+                              printf_P(PSTR("Filament sensor board change detected: revision 03b or newer\n"));
+                              lcd_setstatuspgm(_i("FS rev. 03b or newer"));
+                         }
                     }
+                    else nFSCheckCount=0;
 #endif // IR_SENSOR_ANALOG
 				if (fsensor_check_autoload())
 				{

From ff479afd88ba612db7a5bbfc26c4fa190efc4aa5 Mon Sep 17 00:00:00 2001
From: MRprusa3d <martin.remis@prusa3d.cz>
Date: Tue, 10 Mar 2020 15:51:48 +0100
Subject: [PATCH 6/8] version for testing / final review

---
 Firmware/Marlin_main.cpp | 2 +-
 Firmware/ultralcd.cpp    | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 6b5f2470..d0ee5a3b 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -9479,7 +9479,7 @@ static uint8_t nFSCheckCount=0;
                          {
                               nFSCheckCount=0;    // not necessary
                               oFsensorPCB=ClFsensorPCB::_Rev03b;
-//                              eeprom_update_byte((uint8_t*)EEPROM_FSENSOR_PCB,(uint8_t)oFsensorPCB);
+                              eeprom_update_byte((uint8_t*)EEPROM_FSENSOR_PCB,(uint8_t)oFsensorPCB);
                               printf_P(PSTR("Filament sensor board change detected: revision 03b or newer\n"));
                               lcd_setstatuspgm(_i("FS rev. 03b or newer"));
                          }
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 845ab3fd..c23f2a23 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -7586,7 +7586,8 @@ bool lcd_selftest()
 	int _progress = 0;
 	bool _result = true;
 	bool _swapped_fan = false;
-#if IR_SENSOR_ANALOG
+//#if IR_SENSOR_ANALOG
+#if (0)
      bool bAction;
      bAction=lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is the filament unloaded?"),false,true);
      if(!bAction)
@@ -7598,7 +7599,7 @@ bool lcd_selftest()
 	#ifdef TMC2130
 	  FORCE_HIGH_POWER_START;
 	#endif // TMC2130
-     _delay(2000);
+//     _delay(2000);
     
     FORCE_BL_ON_START;
     
@@ -7795,7 +7796,8 @@ bool lcd_selftest()
 				_progress = lcd_selftest_screen(TestScreen::FsensorOk, _progress, 3, true, 2000); //fil sensor OK
 			}
 #endif //PAT9125
-#if IR_SENSOR_ANALOG
+//#if IR_SENSOR_ANALOG
+#if (0)
 			_progress = lcd_selftest_screen(TestScreen::Fsensor, _progress, 3, true, 2000); //check filament sensor
                _result = lcd_selftest_IRsensor();
 			if (_result)

From 34ac2917ae7d444a8560966eb4f043dd446eaadb Mon Sep 17 00:00:00 2001
From: "D.R.racer" <drracer@drracer.eu>
Date: Thu, 26 Mar 2020 14:40:47 +0100
Subject: [PATCH 7/8] fix. warning "Macro expansion producing 'defined' has
 undefined behavior" update screen layout comments

---
 Firmware/Marlin_main.cpp |  6 +++---
 Firmware/config.h        |  6 ++++--
 Firmware/fsensor.cpp     | 16 +++++++-------
 Firmware/fsensor.h       |  2 +-
 Firmware/temperature.cpp |  4 ++--
 Firmware/temperature.h   |  2 +-
 Firmware/ultralcd.cpp    | 45 +++++++++++++++++++---------------------
 Firmware/ultralcd.h      |  4 ++--
 8 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index d0ee5a3b..95ea92e1 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -9445,7 +9445,7 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s
 {
 #ifdef FILAMENT_SENSOR
 bool bInhibitFlag;
-#if IR_SENSOR_ANALOG
+#ifdef IR_SENSOR_ANALOG
 static uint8_t nFSCheckCount=0;
 #endif // IR_SENSOR_ANALOG
 
@@ -9457,7 +9457,7 @@ static uint8_t nFSCheckCount=0;
 #endif // PAT9125
 #ifdef IR_SENSOR
           bInhibitFlag=(menu_menu==lcd_menu_show_sensors_state); // Support::SensorInfo menu active
-#if IR_SENSOR_ANALOG
+#ifdef IR_SENSOR_ANALOG
           bInhibitFlag=bInhibitFlag||bMenuFSDetect; // Settings::HWsetup::FSdetect menu active
 #endif // IR_SENSOR_ANALOG
 #endif // IR_SENSOR
@@ -9465,7 +9465,7 @@ static uint8_t nFSCheckCount=0;
 		{
 			if (!moves_planned() && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LcdCommands::Layer1Cal) && ! eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE))
 			{
-#if IR_SENSOR_ANALOG
+#ifdef IR_SENSOR_ANALOG
                     bool bTemp=current_voltage_raw_IR>IRsensor_Hmin_TRESHOLD;
                     bTemp=bTemp&&current_voltage_raw_IR<IRsensor_Hopen_TRESHOLD;
                     bTemp=bTemp&&(!CHECK_ALL_HEATERS);
diff --git a/Firmware/config.h b/Firmware/config.h
index ab93d798..c100df62 100644
--- a/Firmware/config.h
+++ b/Firmware/config.h
@@ -5,10 +5,12 @@
 #include "Configuration_prusa.h"
 #include "pins.h"
 
-#define IR_SENSOR_ANALOG (defined(VOLT_IR_PIN) && defined(IR_SENSOR))
+#if (defined(VOLT_IR_PIN) && defined(IR_SENSOR))
+# define IR_SENSOR_ANALOG
+#endif
 
 //ADC configuration
-#if !IR_SENSOR_ANALOG
+#ifndef IR_SENSOR_ANALOG
 #define ADC_CHAN_MSK      0b0000001001011111 //used AD channels bit mask (0,1,2,3,4,6,9)
 #define ADC_DIDR_MSK      0b0000001001011111 //AD channels DIDR mask (1 ~ disabled digital input)
 #define ADC_CHAN_CNT      7         //number of used channels)
diff --git a/Firmware/fsensor.cpp b/Firmware/fsensor.cpp
index 64b46b30..7c9dd856 100755
--- a/Firmware/fsensor.cpp
+++ b/Firmware/fsensor.cpp
@@ -111,7 +111,7 @@ int16_t fsensor_oq_yd_max;
 uint16_t fsensor_oq_sh_sum;
 //! @}
 
-#if IR_SENSOR_ANALOG
+#ifdef IR_SENSOR_ANALOG
 ClFsensorPCB oFsensorPCB;
 ClFsensorActionNA oFsensorActionNA;
 bool bIRsensorStateFlag=false;
@@ -160,7 +160,7 @@ void fsensor_init(void)
 		fsensor_not_responding = true;
 	}
 #endif //PAT9125
-#if IR_SENSOR_ANALOG
+#ifdef IR_SENSOR_ANALOG
      bIRsensorStateFlag=false;
      oFsensorPCB=(ClFsensorPCB)eeprom_read_byte((uint8_t*)EEPROM_FSENSOR_PCB);
      oFsensorActionNA=(ClFsensorActionNA)eeprom_read_byte((uint8_t*)EEPROM_FSENSOR_ACTION_NA);
@@ -170,7 +170,7 @@ void fsensor_init(void)
 	else
 		fsensor_disable(false);                 // (in this case) EEPROM update is not necessary
 	printf_P(PSTR("FSensor %S"), (fsensor_enabled?PSTR("ENABLED"):PSTR("DISABLED")));
-#if IR_SENSOR_ANALOG
+#ifdef IR_SENSOR_ANALOG
      printf_P(PSTR(" (sensor board revision: %S)\n"),(oFsensorPCB==ClFsensorPCB::_Rev03b)?PSTR("03b or newer"):PSTR("03 or older"));
 #else //IR_SENSOR_ANALOG
      printf_P(PSTR("\n"));
@@ -204,7 +204,7 @@ bool fsensor_enable(bool bUpdateEEPROM)
 		FSensorStateMenu = 1;
 	}
 #else // PAT9125
-#if IR_SENSOR_ANALOG
+#ifdef IR_SENSOR_ANALOG
      if(!fsensor_IR_check())
           {
           bUpdateEEPROM=true;
@@ -217,7 +217,7 @@ bool fsensor_enable(bool bUpdateEEPROM)
      fsensor_enabled=true;
      fsensor_not_responding=false;
      FSensorStateMenu=1;
-#if IR_SENSOR_ANALOG
+#ifdef IR_SENSOR_ANALOG
           }
 #endif //IR_SENSOR_ANALOG
      if(bUpdateEEPROM)
@@ -608,7 +608,7 @@ void fsensor_update(void)
         {
                if(digitalRead(IR_SENSOR_PIN))
                {                                  // IR_SENSOR_PIN ~ H
-#if IR_SENSOR_ANALOG
+#ifdef IR_SENSOR_ANALOG
                     if(!bIRsensorStateFlag)
                     {
                          bIRsensorStateFlag=true;
@@ -651,7 +651,7 @@ void fsensor_update(void)
 #endif //IR_SENSOR_ANALOG
                                   fsensor_checkpoint_print();
                                   fsensor_enque_M600();
-#if IR_SENSOR_ANALOG
+#ifdef IR_SENSOR_ANALOG
                               }
                          }
                     }
@@ -665,7 +665,7 @@ void fsensor_update(void)
 #endif //PAT9125
 }
 
-#if IR_SENSOR_ANALOG
+#ifdef IR_SENSOR_ANALOG
 bool fsensor_IR_check()
 {
 uint16_t volt_IR_int;
diff --git a/Firmware/fsensor.h b/Firmware/fsensor.h
index 5ed7f7fc..289bda7c 100755
--- a/Firmware/fsensor.h
+++ b/Firmware/fsensor.h
@@ -72,7 +72,7 @@ extern void fsensor_st_block_chunk(int cnt);
 //! @}
 
 
-#if IR_SENSOR_ANALOG
+#ifdef IR_SENSOR_ANALOG
 #define IR_SENSOR_STEADY 10                       // [ms]
 
 enum class ClFsensorPCB:uint_least8_t
diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp
index b8c4fc27..e6e3f0d7 100755
--- a/Firmware/temperature.cpp
+++ b/Firmware/temperature.cpp
@@ -73,7 +73,7 @@ int current_voltage_raw_pwr = 0;
 int current_voltage_raw_bed = 0;
 #endif
 
-#if IR_SENSOR_ANALOG
+#ifdef IR_SENSOR_ANALOG
 int current_voltage_raw_IR = 0;
 #endif //IR_SENSOR_ANALOG
 
@@ -1595,7 +1595,7 @@ void adc_ready(void) //callback from adc when sampling finished
 #ifdef VOLT_BED_PIN
 	current_voltage_raw_bed = adc_values[ADC_PIN_IDX(VOLT_BED_PIN)]; // 6->9
 #endif
-#if IR_SENSOR_ANALOG
+#ifdef IR_SENSOR_ANALOG
      current_voltage_raw_IR = adc_values[ADC_PIN_IDX(VOLT_IR_PIN)];
 #endif //IR_SENSOR_ANALOG
 	temp_meas_ready = true;
diff --git a/Firmware/temperature.h b/Firmware/temperature.h
index ba56e681..94e11a2f 100755
--- a/Firmware/temperature.h
+++ b/Firmware/temperature.h
@@ -78,7 +78,7 @@ extern int current_voltage_raw_pwr;
 extern int current_voltage_raw_bed;
 #endif
 
-#if IR_SENSOR_ANALOG
+#ifdef IR_SENSOR_ANALOG
 extern int current_voltage_raw_IR;
 #endif //IR_SENSOR_ANALOG
 
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index c23f2a23..dc4fa56b 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -68,7 +68,7 @@ uint8_t SilentModeMenu_MMU = 1; //activate mmu unit stealth mode
 
 int8_t FSensorStateMenu = 1;
 
-#if IR_SENSOR_ANALOG
+#ifdef IR_SENSOR_ANALOG
 bool bMenuFSDetect=false;
 #endif //IR_SENSOR_ANALOG
 
@@ -239,7 +239,7 @@ static FanCheck lcd_selftest_fan_auto(int _fan);
 static bool lcd_selftest_fsensor();
 #endif //PAT9125
 static bool selftest_irsensor();
-#if IR_SENSOR_ANALOG
+#ifdef IR_SENSOR_ANALOG
 static bool lcd_selftest_IRsensor(bool bStandalone=false);
 static void lcd_detect_IRsensor();
 #endif //IR_SENSOR_ANALOG
@@ -1945,7 +1945,7 @@ static void lcd_menu_temperatures()
     menu_back_if_clicked();
 }
 
-#if defined (VOLT_BED_PIN) || defined (VOLT_PWR_PIN) || IR_SENSOR_ANALOG
+#if defined (VOLT_BED_PIN) || defined (VOLT_PWR_PIN) || defined(IR_SENSOR_ANALOG)
 #define VOLT_DIV_R1 10000
 #define VOLT_DIV_R2 2370
 #define VOLT_DIV_FAC ((float)VOLT_DIV_R2 / (VOLT_DIV_R2 + VOLT_DIV_R1))
@@ -1957,27 +1957,24 @@ static void lcd_menu_temperatures()
 //! |                    |
 //! | PWR:         00.0V |	c=12 r=1
 //! | Bed:         00.0V |	c=12 r=1
-//! |                    |
+//! | IR :         00.0V |  c=12 r=1 optional
 //! ----------------------
 //! @endcode
 //! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations.
 static void lcd_menu_voltages()
 {
-	lcd_timeoutToStatus.stop(); //infinite timeout
-	float volt_pwr = VOLT_DIV_REF * ((float)current_voltage_raw_pwr / (1023 * OVERSAMPLENR)) / VOLT_DIV_FAC;
-	float volt_bed = VOLT_DIV_REF * ((float)current_voltage_raw_bed / (1023 * OVERSAMPLENR)) / VOLT_DIV_FAC;
-	lcd_home();
-#if !IR_SENSOR_ANALOG
-	lcd_printf_P(PSTR("\n"));
-#endif //!IR_SENSOR_ANALOG
-     lcd_printf_P(PSTR(" PWR:      %4.1fV\n" " BED:      %4.1fV"), volt_pwr, volt_bed);
-#if IR_SENSOR_ANALOG
-     float volt_IR = VOLT_DIV_REF * ((float)current_voltage_raw_IR / (1023 * OVERSAMPLENR));
-     lcd_printf_P(PSTR("\n IR :       %3.1fV"),volt_IR);
+    lcd_timeoutToStatus.stop(); //infinite timeout
+    float volt_pwr = VOLT_DIV_REF * ((float)current_voltage_raw_pwr / (1023 * OVERSAMPLENR)) / VOLT_DIV_FAC;
+    float volt_bed = VOLT_DIV_REF * ((float)current_voltage_raw_bed / (1023 * OVERSAMPLENR)) / VOLT_DIV_FAC;
+    lcd_home();
+    lcd_printf_P(PSTR(" PWR:      %4.1fV\n" " BED:      %4.1fV"), volt_pwr, volt_bed);
+#ifdef IR_SENSOR_ANALOG
+    float volt_IR = VOLT_DIV_REF * ((float)current_voltage_raw_IR / (1023 * OVERSAMPLENR));
+    lcd_printf_P(PSTR("\n IR :       %3.1fV"),volt_IR);
 #endif //IR_SENSOR_ANALOG
-     menu_back_if_clicked();
+    menu_back_if_clicked();
 }
-#endif //defined (VOLT_BED_PIN) || defined (VOLT_PWR_PIN) || IR_SENSOR_ANALOG
+#endif //defined (VOLT_BED_PIN) || defined (VOLT_PWR_PIN) || defined(IR_SENSOR_ANALOG)
 
 #ifdef TMC2130
 //! @brief Show Belt Status
@@ -2151,7 +2148,7 @@ static void lcd_support_menu()
   MENU_ITEM_BACK_P(_i("Date:"));////MSG_DATE c=17 r=1
   MENU_ITEM_BACK_P(PSTR(__DATE__));
 
-#if IR_SENSOR_ANALOG
+#ifdef IR_SENSOR_ANALOG
   MENU_ITEM_BACK_P(STR_SEPARATOR);
   MENU_ITEM_BACK_P(PSTR("Fil. sensor v.:"));
   switch(oFsensorPCB)
@@ -5653,7 +5650,7 @@ SETTINGS_VERSION;
 MENU_END();
 }
 
-#if IR_SENSOR_ANALOG
+#ifdef IR_SENSOR_ANALOG
 static void lcd_fsensor_actionNA_set(void)
 {
 switch(oFsensorActionNA)
@@ -5719,7 +5716,7 @@ void lcd_hw_setup_menu(void)                      // can not be "static"
     SETTINGS_NOZZLE;
     MENU_ITEM_SUBMENU_P(_i("Checks"), lcd_checking_menu);
 
-#if IR_SENSOR_ANALOG
+#ifdef IR_SENSOR_ANALOG
     FSENSOR_ACTION_NA;
     MENU_ITEM_FUNCTION_P(PSTR("FS Detect"), lcd_detect_IRsensor);
 #endif //IR_SENSOR_ANALOG
@@ -7140,7 +7137,7 @@ static void lcd_tune_menu()
 	else {
 		MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR), _T(MSG_ON), lcd_fsensor_state_set);
 	}
-#if IR_SENSOR_ANALOG
+#ifdef IR_SENSOR_ANALOG
      FSENSOR_ACTION_NA;
 #endif //IR_SENSOR_ANALOG
 #endif //FILAMENT_SENSOR
@@ -7520,7 +7517,7 @@ void lcd_belttest()
 }
 #endif //TMC2130
 
-#if IR_SENSOR_ANALOG
+#ifdef IR_SENSOR_ANALOG
 static bool lcd_selftest_IRsensor(bool bStandalone)
 {
 bool bAction;
@@ -7586,7 +7583,7 @@ bool lcd_selftest()
 	int _progress = 0;
 	bool _result = true;
 	bool _swapped_fan = false;
-//#if IR_SENSOR_ANALOG
+//#ifdef IR_SENSOR_ANALOG
 #if (0)
      bool bAction;
      bAction=lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is the filament unloaded?"),false,true);
@@ -7796,7 +7793,7 @@ bool lcd_selftest()
 				_progress = lcd_selftest_screen(TestScreen::FsensorOk, _progress, 3, true, 2000); //fil sensor OK
 			}
 #endif //PAT9125
-//#if IR_SENSOR_ANALOG
+//#ifdef IR_SENSOR_ANALOG
 #if (0)
 			_progress = lcd_selftest_screen(TestScreen::Fsensor, _progress, 3, true, 2000); //check filament sensor
                _result = lcd_selftest_IRsensor();
diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h
index ca64659a..d82d71d9 100755
--- a/Firmware/ultralcd.h
+++ b/Firmware/ultralcd.h
@@ -140,7 +140,7 @@ extern uint8_t farm_status;
 #define SILENT_MODE_OFF SILENT_MODE_POWER
 #endif
 
-#if IR_SENSOR_ANALOG
+#ifdef IR_SENSOR_ANALOG
 extern bool bMenuFSDetect;
 #endif //IR_SENSOR_ANALOG
 
@@ -257,7 +257,7 @@ enum class WizState : uint8_t
 void lcd_wizard(WizState state);
 
 #define VOLT_DIV_REF 5
-#if IR_SENSOR_ANALOG
+#ifdef IR_SENSOR_ANALOG
 #define IRsensor_Hmin_TRESHOLD (3.0*1023*OVERSAMPLENR/VOLT_DIV_REF) // ~3.0V (0.6*Vcc)
 #define IRsensor_Lmax_TRESHOLD (1.5*1023*OVERSAMPLENR/VOLT_DIV_REF) // ~1.5V (0.3*Vcc)
 #define IRsensor_Hopen_TRESHOLD (4.6*1023*OVERSAMPLENR/VOLT_DIV_REF) // ~4.6V (N.C. @ Ru~20-50k, Rd'=56k, Ru'=10k)

From 818efb4fa203daa731923b0458f2b2800da4e42a Mon Sep 17 00:00:00 2001
From: "D.R.racer" <drracer@drracer.eu>
Date: Thu, 26 Mar 2020 15:07:48 +0100
Subject: [PATCH 8/8] updated messages + slight refactoring to save some bytes

---
 Firmware/Marlin_main.cpp |   2 +-
 Firmware/ultralcd.cpp    | 103 +++++++++++++++++++--------------------
 Firmware/ultralcd.h      |   1 +
 3 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 95ea92e1..ed38dded 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -9480,7 +9480,7 @@ static uint8_t nFSCheckCount=0;
                               nFSCheckCount=0;    // not necessary
                               oFsensorPCB=ClFsensorPCB::_Rev03b;
                               eeprom_update_byte((uint8_t*)EEPROM_FSENSOR_PCB,(uint8_t)oFsensorPCB);
-                              printf_P(PSTR("Filament sensor board change detected: revision 03b or newer\n"));
+                              printf_IRSensorAnalogBoardChange(true);
                               lcd_setstatuspgm(_i("FS rev. 03b or newer"));
                          }
                     }
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index dc4fa56b..78f2df71 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -2160,10 +2160,8 @@ static void lcd_support_menu()
             MENU_ITEM_BACK_P(PSTR(" 03b or newer"));
             break;
        case ClFsensorPCB::_Undef:
-            MENU_ITEM_BACK_P(PSTR(" N/A"));
-            break;
        default:
-            MENU_ITEM_BACK_P(PSTR(" unknown"));
+            MENU_ITEM_BACK_P(PSTR(" state unknown"));
        }
 #endif // IR_SENSOR_ANALOG
 
@@ -5718,7 +5716,7 @@ void lcd_hw_setup_menu(void)                      // can not be "static"
 
 #ifdef IR_SENSOR_ANALOG
     FSENSOR_ACTION_NA;
-    MENU_ITEM_FUNCTION_P(PSTR("FS Detect"), lcd_detect_IRsensor);
+    MENU_ITEM_FUNCTION_P(PSTR("Fsensor Detection"), lcd_detect_IRsensor);
 #endif //IR_SENSOR_ANALOG
     MENU_END();
 }
@@ -7518,58 +7516,59 @@ void lcd_belttest()
 #endif //TMC2130
 
 #ifdef IR_SENSOR_ANALOG
-static bool lcd_selftest_IRsensor(bool bStandalone)
-{
-bool bAction;
-bool bPCBrev03b;
-uint16_t volt_IR_int;
-float volt_IR;
-
-volt_IR_int=current_voltage_raw_IR;
-bPCBrev03b=(volt_IR_int<((int)IRsensor_Hopen_TRESHOLD));
-volt_IR=VOLT_DIV_REF*((float)volt_IR_int/(1023*OVERSAMPLENR));
-printf_P(PSTR("Measured filament sensor high level: %4.2fV\n"),volt_IR);
-if(volt_IR_int<((int)IRsensor_Hmin_TRESHOLD))
-     {
-     if(!bStandalone)
-          lcd_selftest_error(TestError::FsensorLevel,"HIGH","");
-     return(false);
-     }
-lcd_show_fullscreen_message_and_wait_P(_i("Please insert filament (but not load them!) into extruder and then press the knob."));
-volt_IR_int=current_voltage_raw_IR;
-volt_IR=VOLT_DIV_REF*((float)volt_IR_int/(1023*OVERSAMPLENR));
-printf_P(PSTR("Measured filament sensor low level: %4.2fV\n"),volt_IR);
-if(volt_IR_int>((int)IRsensor_Lmax_TRESHOLD))
-     {
-     if(!bStandalone)
-          lcd_selftest_error(TestError::FsensorLevel,"LOW","");
-     return(false);
-     }
-if((bPCBrev03b?1:0)!=(uint8_t)oFsensorPCB)        // safer then "(uint8_t)bPCBrev03b"
-     {
-     printf_P(PSTR("Filament sensor board change detected: revision %S\n"),bPCBrev03b?PSTR("03b or newer"):PSTR("03 or older"));
-     oFsensorPCB=bPCBrev03b?ClFsensorPCB::_Rev03b:ClFsensorPCB::_Old;
-     eeprom_update_byte((uint8_t*)EEPROM_FSENSOR_PCB,(uint8_t)oFsensorPCB);
-     }
-return(true);
+// called also from marlin_main.cpp
+void printf_IRSensorAnalogBoardChange(bool bPCBrev03b){
+    printf_P(PSTR("Filament sensor board change detected: revision %S\n"), bPCBrev03b ? PSTR("03b or newer") : PSTR("03 or older"));
 }
 
-static void lcd_detect_IRsensor()
+static bool lcd_selftest_IRsensor(bool bStandalone)
 {
-bool bAction;
+    bool bAction;
+    bool bPCBrev03b;
+    uint16_t volt_IR_int;
+    float volt_IR;
 
-bMenuFSDetect=true;                               // inhibits some code inside "manage_inactivity()"
-bAction=lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is the filament unloaded?"),false,true);
-if(!bAction)
-     {
-     lcd_show_fullscreen_message_and_wait_P(_i("... so unload the filament and repeat action!"));
-     return;
-     }
-bAction=lcd_selftest_IRsensor(true);
-if(bAction)
-     lcd_show_fullscreen_message_and_wait_P(_i("PCB check successful - withdraw the filament now!"));
-else lcd_show_fullscreen_message_and_wait_P(_i("PCB check unsuccessful - withdraw the filament now!"));
-bMenuFSDetect=false;                              // de-inhibits some code inside "manage_inactivity()"
+    volt_IR_int=current_voltage_raw_IR;
+    bPCBrev03b=(volt_IR_int<((int)IRsensor_Hopen_TRESHOLD));
+    volt_IR=VOLT_DIV_REF*((float)volt_IR_int/(1023*OVERSAMPLENR));
+    printf_P(PSTR("Measured filament sensor high level: %4.2fV\n"),volt_IR);
+    if(volt_IR_int < ((int)IRsensor_Hmin_TRESHOLD)){
+        if(!bStandalone)
+            lcd_selftest_error(TestError::FsensorLevel,"HIGH","");
+        return(false);
+    }
+    lcd_show_fullscreen_message_and_wait_P(_i("Please insert filament (but not load them!) into extruder and then press the knob."));
+    volt_IR_int=current_voltage_raw_IR;
+    volt_IR=VOLT_DIV_REF*((float)volt_IR_int/(1023*OVERSAMPLENR));
+    printf_P(PSTR("Measured filament sensor low level: %4.2fV\n"),volt_IR);
+    if(volt_IR_int > ((int)IRsensor_Lmax_TRESHOLD)){
+        if(!bStandalone)
+            lcd_selftest_error(TestError::FsensorLevel,"LOW","");
+        return(false);
+    }
+    if((bPCBrev03b?1:0)!=(uint8_t)oFsensorPCB){        // safer then "(uint8_t)bPCBrev03b"
+        printf_IRSensorAnalogBoardChange(bPCBrev03b);
+        oFsensorPCB=bPCBrev03b?ClFsensorPCB::_Rev03b:ClFsensorPCB::_Old;
+        eeprom_update_byte((uint8_t*)EEPROM_FSENSOR_PCB,(uint8_t)oFsensorPCB);
+    }
+    return(true);
+}
+
+static void lcd_detect_IRsensor(){
+    bool bAction;
+
+    bMenuFSDetect = true;                               // inhibits some code inside "manage_inactivity()"
+    bAction = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is the filament loaded?"), false, false);
+    if(!bAction){
+        lcd_show_fullscreen_message_and_wait_P(_i("Please unload the filament first, then repeat this action."));
+        return;
+    }
+    bAction = lcd_selftest_IRsensor(true);
+    if(bAction)
+        lcd_show_fullscreen_message_and_wait_P(_i("Sensor verified, remove the filament now."));
+    else
+        lcd_show_fullscreen_message_and_wait_P(_i("Verification failed, remove the filament and try again."));
+    bMenuFSDetect=false;                              // de-inhibits some code inside "manage_inactivity()"
 }
 #endif //IR_SENSOR_ANALOG
 
diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h
index d82d71d9..c183e0a5 100755
--- a/Firmware/ultralcd.h
+++ b/Firmware/ultralcd.h
@@ -142,6 +142,7 @@ extern uint8_t farm_status;
 
 #ifdef IR_SENSOR_ANALOG
 extern bool bMenuFSDetect;
+void printf_IRSensorAnalogBoardChange(bool bPCBrev03b);
 #endif //IR_SENSOR_ANALOG
 
 extern int8_t SilentModeMenu;