From 4ed227d91d8056326319b35fad05aad9ed66509b Mon Sep 17 00:00:00 2001
From: Michael Greene <michael.greene@system1.com>
Date: Tue, 12 May 2020 13:30:29 -0700
Subject: [PATCH 1/3] reprocess patch so I don't have 1200 lines of whitespace
 changes to review

---
 Firmware/Marlin_main.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 982fd413cc..97c330f3b0 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -7447,6 +7447,20 @@ SERIAL_PROTOCOLPGM("\n\n");
 	}
 	break;
 
+#ifdef FILAMENT_SENSOR
+    case 405: // M405 Enable Filament Sensor
+    {
+        fsensor_enable();
+    }
+    break;
+
+    case 406: // M406 Disable Filament Sensor
+    {
+        fsensor_disable();
+    }
+	break;
+#endif
+
     /*!
 	### M500 - Store settings in EEPROM <a href="https://reprap.org/wiki/G-code#M500:_Store_parameters_in_non-volatile_storage">M500: Store parameters in non-volatile storage</a>
 	Save current parameters to EEPROM.

From 4db2998165b8feea496a9e93d2235c38644a6488 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Thu, 10 Aug 2023 15:09:13 +0200
Subject: [PATCH 2/3] Rebase, fix and update doxygen

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

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 97c330f3b0..7a633894a5 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -7448,15 +7448,32 @@ SERIAL_PROTOCOLPGM("\n\n");
 	break;
 
 #ifdef FILAMENT_SENSOR
+    /*!
+    ### M405 - Filament Sensor on <a href="https://reprap.org/wiki/G-code#M405:_Filament_Sensor_on">M405: Filament Sensor on</a>
+    Turn on Filament Sensor extrusion control.
+    #### Usage
+
+        M405
+
+    */
+
     case 405: // M405 Enable Filament Sensor
     {
-        fsensor_enable();
+        fsensor.setEnabled(1);
     }
     break;
+    /*!
+    ### M406 - Filament Sensor off <a href="https://reprap.org/wiki/G-code#M406:_Filament_Sensor_off">M406: Filament Sensor off</a>
+    Turn off Filament Sensor extrusion control.
+    #### Usage
+
+        M406
+
+    */
 
     case 406: // M406 Disable Filament Sensor
     {
-        fsensor_disable();
+        fsensor.setEnabled(0);
     }
 	break;
 #endif

From 0fb0e6e3d376fcdb6ce8237fdcf5d04dcfeb84ac Mon Sep 17 00:00:00 2001
From: Alex Voinea <voinea.dragos.alexandru@gmail.com>
Date: Fri, 11 Aug 2023 08:41:56 +0200
Subject: [PATCH 3/3] Remove unimplemented M407 from list of gcodes

---
 Firmware/Marlin_main.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 7a633894a5..c08cc3d2e0 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -3941,7 +3941,6 @@ extern uint8_t st_backlash_y;
 //!@n M404 - N<dia in mm> Enter the nominal filament width (3mm, 1.75mm ) or will display nominal filament width without parameters
 //!@n M405 - Turn on Filament Sensor extrusion control.  Optional D<delay in cm> to set delay in centimeters between sensor and extruder
 //!@n M406 - Turn off Filament Sensor extrusion control
-//!@n M407 - Displays measured filament diameter
 //!@n M500 - stores parameters in EEPROM
 //!@n M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily).
 //!@n M502 - reverts to the default "factory settings".  You still need to store them in EEPROM afterwards if you want to.