correction

Author: thinkyhead

Marlin/Configuration.h

@@ -2044,7 +2044,8 @@
  */
 //#define FILAMENT_RUNOUT_SENSOR
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
-  #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500.
+  #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable sensor monitoring on startup. Override with M412 followed by M500.
+  #define FIL_RUNOUT_ENABLED { true }     // Individual runout sensors default enabled state. Override with M591 followed by M500.
   #define NUM_RUNOUT_SENSORS   1          // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each.
 
   #define FIL_RUNOUT_STATE     LOW        // Pin state indicating that filament is NOT present.

Marlin/src/feature/runout.cpp

@@ -32,10 +32,9 @@
 
 FilamentMonitor runout;
 
-// enabled[] and monitoring are initialized by settings.load() / settings defaults.
 // Default: master monitoring on, all sensors individually enabled, mode RM_NONE.
-bool FilamentMonitorBase::enabled[NUM_RUNOUT_SENSORS],   // initialized by settings
-     FilamentMonitorBase::monitoring,                    // initialized by settings
+bool FilamentMonitorBase::monitoring,                    // initialized by settings
+     FilamentMonitorBase::enabled[NUM_RUNOUT_SENSORS],   // initialized by settings
      FilamentMonitorBase::filament_ran_out;              // = false
 
 RunoutMode FilamentMonitorBase::mode[NUM_RUNOUT_SENSORS]; // initialized by settings

Marlin/src/inc/Changes.h

@@ -765,48 +765,6 @@
   #error "MP_SCARA is now just SCARA."
 #elif defined(HAS_PIN_27_BOARD)
   #error "HAS_PIN_27_BOARD is now USE_PIN_27_BOARD."
-#elif defined(FIL_RUNOUT2_STATE)
-  #if FIL_RUNOUT2_STATE
-    #error "FIL_RUNOUT2_STATE HIGH is replaced by FIL_RUNOUT_MODE { n, 2, ... }."
-  #else
-    #error "FIL_RUNOUT2_STATE LOW is replaced by FIL_RUNOUT_MODE { n, 1, ... }."
-  #endif
-#elif defined(FIL_RUNOUT3_STATE)
-  #if FIL_RUNOUT3_STATE
-    #error "FIL_RUNOUT3_STATE HIGH is replaced by FIL_RUNOUT_MODE { n, n, 2, ... }."
-  #else
-    #error "FIL_RUNOUT3_STATE LOW is replaced by FIL_RUNOUT_MODE { n, n, 1, ... }."
-  #endif
-#elif defined(FIL_RUNOUT4_STATE)
-  #if FIL_RUNOUT4_STATE
-    #error "FIL_RUNOUT4_STATE HIGH is replaced by FIL_RUNOUT_MODE { n, n, n, 2, ... }."
-  #else
-    #error "FIL_RUNOUT4_STATE LOW is replaced by FIL_RUNOUT_MODE { n, n, n, 1, ... }."
-  #endif
-#elif defined(FIL_RUNOUT5_STATE)
-  #if FIL_RUNOUT5_STATE
-    #error "FIL_RUNOUT5_STATE HIGH is replaced by FIL_RUNOUT_MODE { n, n, n, n, 2, ... }."
-  #else
-    #error "FIL_RUNOUT5_STATE LOW is replaced by FIL_RUNOUT_MODE { n, n, n, n, 1, ... }."
-  #endif
-#elif defined(FIL_RUNOUT6_STATE)
-  #if FIL_RUNOUT6_STATE
-    #error "FIL_RUNOUT6_STATE HIGH is replaced by FIL_RUNOUT_MODE { n, n, n, n, n, 2, ... }."
-  #else
-    #error "FIL_RUNOUT6_STATE LOW is replaced by FIL_RUNOUT_MODE { n, n, n, n, n, 1, ... }."
-  #endif
-#elif defined(FIL_RUNOUT7_STATE)
-  #if FIL_RUNOUT7_STATE
-    #error "FIL_RUNOUT7_STATE HIGH is replaced by FIL_RUNOUT_MODE { n, n, n, n, n, n, 2, ... }."
-  #else
-    #error "FIL_RUNOUT7_STATE LOW is replaced by FIL_RUNOUT_MODE { n, n, n, n, n, n, 1, ... }."
-  #endif
-#elif defined(FIL_RUNOUT8_STATE)
-  #if FIL_RUNOUT8_STATE
-    #error "FIL_RUNOUT8_STATE HIGH is replaced by FIL_RUNOUT_MODE { n, n, n, n, n, n, n, 2 }."
-  #else
-    #error "FIL_RUNOUT8_STATE LOW is replaced by FIL_RUNOUT_MODE { n, n, n, n, n, n, n, 1 }."
-  #endif
 #endif
 
 // SDSS renamed to SD_SS_PIN

Marlin/src/inc/Conditionals-4-adv.h

@@ -989,7 +989,7 @@
   #if NUM_RUNOUT_SENSORS > 1
     #define MULTI_FILAMENT_SENSOR 1
   #endif
-  #if FILAMENT_RUNOUT_DISTANCE_MM
+  #ifdef FILAMENT_RUNOUT_DISTANCE_MM
     #define HAS_FILAMENT_RUNOUT_DISTANCE 1
   #endif
   #if ENABLED(MIXING_EXTRUDER)

Marlin/src/inc/SanityCheck.h

@@ -533,6 +533,8 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
     #error "You can't enable FIL_RUNOUT7_PULLUP and FIL_RUNOUT7_PULLDOWN at the same time."
   #elif ALL(FIL_RUNOUT8_PULLUP, FIL_RUNOUT8_PULLDOWN)
     #error "You can't enable FIL_RUNOUT8_PULLUP and FIL_RUNOUT8_PULLDOWN at the same time."
+  #elif FILAMENT_RUNOUT_DISTANCE_MM < 0
+    #error "FILAMENT_RUNOUT_DISTANCE_MM must be >= 0."
   #elif DISABLED(ADVANCED_PAUSE_FEATURE) && defined(FILAMENT_RUNOUT_SCRIPT)
     static_assert(nullptr == strstr(FILAMENT_RUNOUT_SCRIPT, "M600"), "FILAMENT_RUNOUT_SCRIPT cannot make use of M600 unless ADVANCED_PAUSE_FEATURE is enabled");
   #elif DGUS_LCD_UI_MKS
@@ -803,8 +805,6 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
   #elif HAS_FILAMENT_RUNOUT_DISTANCE
     #error "MIXING_EXTRUDER is incompatible with FILAMENT_RUNOUT_DISTANCE_MM."
   #endif
-#elif defined(FILAMENT_RUNOUT_DISTANCE_MM) && FILAMENT_RUNOUT_DISTANCE_MM < 0
-  #error "FILAMENT_RUNOUT_DISTANCE_MM must be >= 0."
 #endif
 
 /**

Marlin/src/lcd/dwin/jyersui/dwin.cpp

@@ -2955,7 +2955,7 @@ void JyersDWIN::menuItemHandler(const uint8_t menu, const uint8_t item, bool dra
               drawCheckbox(row, runout.monitoring);
             }
             else {
-              runout.monitoring = !runout.monitoring;
+              FLIP(runout.monitoring)
               drawCheckbox(row, runout.monitoring);
             }
             break;
@@ -3952,7 +3952,7 @@ void JyersDWIN::menuItemHandler(const uint8_t menu, const uint8_t item, bool dra
               drawCheckbox(row, runout.monitoring);
             }
             else {
-              runout.monitoring = !runout.monitoring;
+              FLIP(runout.monitoring);
               drawCheckbox(row, runout.monitoring);
             }
             break;

Marlin/src/lcd/dwin/proui/dwin.cpp

@@ -2302,7 +2302,7 @@ void setMoveZ() { hmiValue.axis = Z_AXIS; setPFloatOnClick(Z_MIN_POS, Z_MAX_POS,
 #if HAS_FILAMENT_SENSOR
   void setRunoutEnable() {
     runout.reset();
-    runout.monitoring = !runout.monitoring;
+    FLIP(runout.monitoring);
     showCheckboxLine(runout.monitoring);
   }
   #if HAS_FILAMENT_RUNOUT_DISTANCE

Marlin/src/module/settings.cpp

@@ -262,8 +262,6 @@ typedef struct SettingsDataStruct {
     #if ENABLED(FILAMENT_SWITCH_AND_MOTION)
       float  runout_motion_distance_mm;                 // M412 L
     #endif
-  #else
-    uint8_t  runout_placeholder[3];                     // Keeps layout stable when sensor disabled
   #endif
 
   //
@@ -984,10 +982,10 @@ void MarlinSettings::postprocess() {
     //
     #if HAS_FILAMENT_SENSOR
     {
-      bool    runout_enabled[NUM_RUNOUT_SENSORS];
-      bool    runout_monitoring;
+      bool runout_monitoring;
+      bool runout_enabled[NUM_RUNOUT_SENSORS];
       #if HAS_FILAMENT_RUNOUT_DISTANCE
-        float   runout_distance_mm[NUM_RUNOUT_SENSORS];
+        float runout_distance_mm[NUM_RUNOUT_SENSORS];
       #endif
       uint8_t runout_mode[NUM_RUNOUT_SENSORS];
       for (uint8_t e = 0; e < NUM_RUNOUT_SENSORS; ++e) {
@@ -1009,12 +1007,6 @@ void MarlinSettings::postprocess() {
         EEPROM_WRITE(runout.motion_distance());
       #endif
     }
-    #else
-    {
-      uint8_t runout_placeholder[3] = { 0 };
-      _FIELD_TEST(runout_placeholder);
-      EEPROM_WRITE(runout_placeholder);
-    }
     #endif
 
     //
@@ -2095,12 +2087,6 @@ void MarlinSettings::postprocess() {
           runout.reset();
         }
       }
-      #else
-      {
-        uint8_t runout_placeholder[3];
-        _FIELD_TEST(runout_placeholder);
-        EEPROM_READ(runout_placeholder);
-      }
       #endif
 
       //
@@ -3419,21 +3405,21 @@ void MarlinSettings::reset() {
   //
 
   #if HAS_FILAMENT_SENSOR
-    {
-      constexpr bool    runout_enabled_defaults[] = FIL_RUNOUT_ENABLED;
-      constexpr uint8_t runout_mode_defaults[]    = FIL_RUNOUT_MODE;
-      static_assert(COUNT(runout_enabled_defaults) == NUM_RUNOUT_SENSORS, "FIL_RUNOUT_ENABLED must have NUM_RUNOUT_SENSORS entries.");
-      static_assert(COUNT(runout_mode_defaults)  == NUM_RUNOUT_SENSORS, "FIL_RUNOUT_MODE must have NUM_RUNOUT_SENSORS entries.");
-      COPY(runout.enabled, runout_enabled_defaults);
-      runout.monitoring = true;
-      for (uint8_t e = 0; e < NUM_RUNOUT_SENSORS; ++e) {
-        runout.mode[e] = (RunoutMode)runout_mode_defaults[e];
-        #if HAS_FILAMENT_RUNOUT_DISTANCE
-          runout.set_runout_distance(FILAMENT_RUNOUT_DISTANCE_MM, e);
-        #endif
-      }
+  {
+    constexpr bool    runout_enabled_defaults[] = FIL_RUNOUT_ENABLED;
+    constexpr uint8_t runout_mode_defaults[]    = FIL_RUNOUT_MODE;
+    static_assert(COUNT(runout_enabled_defaults) == NUM_RUNOUT_SENSORS, "FIL_RUNOUT_ENABLED must have NUM_RUNOUT_SENSORS entries.");
+    static_assert(COUNT(runout_mode_defaults)  == NUM_RUNOUT_SENSORS, "FIL_RUNOUT_MODE must have NUM_RUNOUT_SENSORS entries.");
+    COPY(runout.enabled, runout_enabled_defaults);
+    runout.monitoring = true;
+    for (uint8_t e = 0; e < NUM_RUNOUT_SENSORS; ++e) {
+      runout.mode[e] = (RunoutMode)runout_mode_defaults[e];
+      #if HAS_FILAMENT_RUNOUT_DISTANCE
+        runout.set_runout_distance(FILAMENT_RUNOUT_DISTANCE_MM, e);
+      #endif
     }
     runout.reset();
+  }
   #endif
 
   //
@@ -4204,7 +4190,10 @@ void MarlinSettings::reset() {
     //
     // Filament Runout Sensor
     //
-    TERN_(HAS_FILAMENT_SENSOR, gcode.M591_report(forReplay));
+    #if HAS_FILAMENT_SENSOR
+      gcode.M412_report(forReplay);
+      gcode.M591_report(forReplay);
+    #endif
 
     #if HAS_ETHERNET
       CONFIG_ECHO_HEADING("Ethernet");