Add REPROBE, REWIPE, and REPROBE_FAIL_PANIC preprocessor definitions …

…to each example configuration header

Marlin/example_configurations/Felix/Configuration.h

@@ -555,6 +555,22 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
     // You probably don't need more than 3 (squared=9).
     #define AUTO_BED_LEVELING_GRID_POINTS 2
 
+    //#define REPROBE // Re-attempts probing
+
+    #ifdef REPROBE
+      #define Z_RETRY_PT 15 // Z height to move the hotend after failed probe
+      #define NUM_ATTEMPTS 3 // Number of attempts to make before quiting
+      //#define PROBE_FAIL_PANIC // Completely give up printing if the final attempt fails (use G26 to get out of failed state)
+      //#define REWIPE // Re-attempts wiping
+      #ifdef REWIPE
+        #define NUM_REWIPES 6 // Number of (back-and-forth) re-wipe attemps to make, e.g. 6 would produce 12 strokes
+        // Re-wipe line from REWIPE_FIRST_PT to REWIPE_SECOND_PT
+        #define REWIPE_FIRST_PT {45, 173}
+        #define REWIPE_SECOND_PT {115, 173}
+        #define Z_REWIPE_PT (Z_MIN_POS + 1) // Depth to re-wipe at
+      #endif
+    #endif
+
   #else  // !AUTO_BED_LEVELING_GRID
 
     // Arbitrary points to probe.
@@ -591,6 +607,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
 
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
 
+  #define MIN_PROBE_PT (Z_MIN_POS-2)     //How far the extruder should move down to probe
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.

Marlin/example_configurations/Felix/Configuration_DUAL.h

@@ -552,6 +552,22 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
     // You probably don't need more than 3 (squared=9).
     #define AUTO_BED_LEVELING_GRID_POINTS 2
 
+    //#define REPROBE // Re-attempts probing
+
+    #ifdef REPROBE
+      #define Z_RETRY_PT 15 // Z height to move the hotend after failed probe
+      #define NUM_ATTEMPTS 3 // Number of attempts to make before quiting
+      //#define PROBE_FAIL_PANIC // Completely give up printing if the final attempt fails (use G26 to get out of failed state)
+      //#define REWIPE // Re-attempts wiping
+      #ifdef REWIPE
+        #define NUM_REWIPES 6 // Number of (back-and-forth) re-wipe attemps to make, e.g. 6 would produce 12 strokes
+        // Re-wipe line from REWIPE_FIRST_PT to REWIPE_SECOND_PT
+        #define REWIPE_FIRST_PT {45, 173}
+        #define REWIPE_SECOND_PT {115, 173}
+        #define Z_REWIPE_PT (Z_MIN_POS + 1) // Depth to re-wipe at
+      #endif
+    #endif
+
   #else  // !AUTO_BED_LEVELING_GRID
 
     // Arbitrary points to probe.
@@ -588,6 +604,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
 
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
 
+  #define MIN_PROBE_PT (Z_MIN_POS-2)     //How far the extruder should move down to probe
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.

Marlin/example_configurations/Hephestos/Configuration.h

@@ -565,6 +565,22 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
     // You probably don't need more than 3 (squared=9).
     #define AUTO_BED_LEVELING_GRID_POINTS 2
 
+    //#define REPROBE // Re-attempts probing
+
+    #ifdef REPROBE
+      #define Z_RETRY_PT 15 // Z height to move the hotend after failed probe
+      #define NUM_ATTEMPTS 3 // Number of attempts to make before quiting
+      //#define PROBE_FAIL_PANIC // Completely give up printing if the final attempt fails (use G26 to get out of failed state)
+      //#define REWIPE // Re-attempts wiping
+      #ifdef REWIPE
+        #define NUM_REWIPES 6 // Number of (back-and-forth) re-wipe attemps to make, e.g. 6 would produce 12 strokes
+        // Re-wipe line from REWIPE_FIRST_PT to REWIPE_SECOND_PT
+        #define REWIPE_FIRST_PT {45, 173}
+        #define REWIPE_SECOND_PT {115, 173}
+        #define Z_REWIPE_PT (Z_MIN_POS + 1) // Depth to re-wipe at
+      #endif
+    #endif
+
   #else  // !AUTO_BED_LEVELING_GRID
 
     // Arbitrary points to probe.
@@ -601,6 +617,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
 
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
 
+  #define MIN_PROBE_PT (Z_MIN_POS-2)     //How far the extruder should move down to probe
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.

Marlin/example_configurations/Hephestos_2/Configuration.h

@@ -567,6 +567,22 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
     // You probably don't need more than 3 (squared=9).
     #define AUTO_BED_LEVELING_GRID_POINTS 2
 
+    //#define REPROBE // Re-attempts probing
+
+    #ifdef REPROBE
+      #define Z_RETRY_PT 15 // Z height to move the hotend after failed probe
+      #define NUM_ATTEMPTS 3 // Number of attempts to make before quiting
+      //#define PROBE_FAIL_PANIC // Completely give up printing if the final attempt fails (use G26 to get out of failed state)
+      //#define REWIPE // Re-attempts wiping
+      #ifdef REWIPE
+        #define NUM_REWIPES 6 // Number of (back-and-forth) re-wipe attemps to make, e.g. 6 would produce 12 strokes
+        // Re-wipe line from REWIPE_FIRST_PT to REWIPE_SECOND_PT
+        #define REWIPE_FIRST_PT {45, 173}
+        #define REWIPE_SECOND_PT {115, 173}
+        #define Z_REWIPE_PT (Z_MIN_POS + 1) // Depth to re-wipe at
+      #endif
+    #endif
+
   #else  // !AUTO_BED_LEVELING_GRID
 
     // Arbitrary points to probe.
@@ -603,6 +619,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
 
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
 
+  #define MIN_PROBE_PT (Z_MIN_POS-2)     //How far the extruder should move down to probe
   #define Z_RAISE_BEFORE_PROBING   5  // How much the Z axis will be raised before traveling to the first probing point.
   #define Z_RAISE_BETWEEN_PROBINGS 2  // How much the Z axis will be raised when traveling from between next probing points.
   #define Z_RAISE_AFTER_PROBING    5  // How much the Z axis will be raised after the last probing point.

Marlin/example_configurations/K8200/Configuration.h

@@ -590,6 +590,22 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
     // You probably don't need more than 3 (squared=9).
     #define AUTO_BED_LEVELING_GRID_POINTS 2
 
+    //#define REPROBE // Re-attempts probing
+
+    #ifdef REPROBE
+      #define Z_RETRY_PT 15 // Z height to move the hotend after failed probe
+      #define NUM_ATTEMPTS 3 // Number of attempts to make before quiting
+      //#define PROBE_FAIL_PANIC // Completely give up printing if the final attempt fails (use G26 to get out of failed state)
+      //#define REWIPE // Re-attempts wiping
+      #ifdef REWIPE
+        #define NUM_REWIPES 6 // Number of (back-and-forth) re-wipe attemps to make, e.g. 6 would produce 12 strokes
+        // Re-wipe line from REWIPE_FIRST_PT to REWIPE_SECOND_PT
+        #define REWIPE_FIRST_PT {45, 173}
+        #define REWIPE_SECOND_PT {115, 173}
+        #define Z_REWIPE_PT (Z_MIN_POS + 1) // Depth to re-wipe at
+      #endif
+    #endif
+
   #else  // !AUTO_BED_LEVELING_GRID
 
     // Arbitrary points to probe.
@@ -626,6 +642,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
 
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
 
+  #define MIN_PROBE_PT (Z_MIN_POS-2)     //How far the extruder should move down to probe
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.

Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h

@@ -573,6 +573,22 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
     // You probably don't need more than 3 (squared=9).
     #define AUTO_BED_LEVELING_GRID_POINTS 2
 
+    //#define REPROBE // Re-attempts probing
+
+    #ifdef REPROBE
+      #define Z_RETRY_PT 15 // Z height to move the hotend after failed probe
+      #define NUM_ATTEMPTS 3 // Number of attempts to make before quiting
+      //#define PROBE_FAIL_PANIC // Completely give up printing if the final attempt fails (use G26 to get out of failed state)
+      //#define REWIPE // Re-attempts wiping
+      #ifdef REWIPE
+        #define NUM_REWIPES 6 // Number of (back-and-forth) re-wipe attemps to make, e.g. 6 would produce 12 strokes
+        // Re-wipe line from REWIPE_FIRST_PT to REWIPE_SECOND_PT
+        #define REWIPE_FIRST_PT {45, 173}
+        #define REWIPE_SECOND_PT {115, 173}
+        #define Z_REWIPE_PT (Z_MIN_POS + 1) // Depth to re-wipe at
+      #endif
+    #endif
+
   #else  // !AUTO_BED_LEVELING_GRID
 
     // Arbitrary points to probe.
@@ -609,6 +625,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
 
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
 
+  #define MIN_PROBE_PT (Z_MIN_POS-2)     //How far the extruder should move down to probe
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.

Marlin/example_configurations/RigidBot/Configuration.h

@@ -567,6 +567,22 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
     // You probably don't need more than 3 (squared=9).
     #define AUTO_BED_LEVELING_GRID_POINTS 2
 
+    //#define REPROBE // Re-attempts probing
+
+    #ifdef REPROBE
+      #define Z_RETRY_PT 15 // Z height to move the hotend after failed probe
+      #define NUM_ATTEMPTS 3 // Number of attempts to make before quiting
+      //#define PROBE_FAIL_PANIC // Completely give up printing if the final attempt fails (use G26 to get out of failed state)
+      //#define REWIPE // Re-attempts wiping
+      #ifdef REWIPE
+        #define NUM_REWIPES 6 // Number of (back-and-forth) re-wipe attemps to make, e.g. 6 would produce 12 strokes
+        // Re-wipe line from REWIPE_FIRST_PT to REWIPE_SECOND_PT
+        #define REWIPE_FIRST_PT {45, 173}
+        #define REWIPE_SECOND_PT {115, 173}
+        #define Z_REWIPE_PT (Z_MIN_POS + 1) // Depth to re-wipe at
+      #endif
+    #endif
+
   #else  // !AUTO_BED_LEVELING_GRID
 
     // Arbitrary points to probe.
@@ -603,6 +619,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
 
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
 
+  #define MIN_PROBE_PT (Z_MIN_POS-2)     //How far the extruder should move down to probe
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.

Marlin/example_configurations/SCARA/Configuration.h

@@ -580,6 +580,21 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
     // Set the number of grid points per dimension.
     // You probably don't need more than 3 (squared=9).
     #define AUTO_BED_LEVELING_GRID_POINTS 2
+    //#define REPROBE // Re-attempts probing
+
+    #ifdef REPROBE
+      #define Z_RETRY_PT 15 // Z height to move the hotend after failed probe
+      #define NUM_ATTEMPTS 3 // Number of attempts to make before quiting
+      //#define PROBE_FAIL_PANIC // Completely give up printing if the final attempt fails (use G26 to get out of failed state)
+      //#define REWIPE // Re-attempts wiping
+      #ifdef REWIPE
+        #define NUM_REWIPES 6 // Number of (back-and-forth) re-wipe attemps to make, e.g. 6 would produce 12 strokes
+        // Re-wipe line from REWIPE_FIRST_PT to REWIPE_SECOND_PT
+        #define REWIPE_FIRST_PT {45, 173}
+        #define REWIPE_SECOND_PT {115, 173}
+        #define Z_REWIPE_PT (Z_MIN_POS + 1) // Depth to re-wipe at
+      #endif
+    #endif
 
   #else  // !AUTO_BED_LEVELING_GRID
 
@@ -617,6 +632,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
 
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
 
+  #define MIN_PROBE_PT (Z_MIN_POS-2)     //How far the extruder should move down to probe
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.

Marlin/example_configurations/TAZ4/Configuration.h

@@ -594,6 +594,22 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
     // You probably don't need more than 3 (squared=9).
     #define AUTO_BED_LEVELING_GRID_POINTS 2
 
+    //#define REPROBE // Re-attempts probing
+
+    #ifdef REPROBE
+      #define Z_RETRY_PT 15 // Z height to move the hotend after failed probe
+      #define NUM_ATTEMPTS 3 // Number of attempts to make before quiting
+      //#define PROBE_FAIL_PANIC // Completely give up printing if the final attempt fails (use G26 to get out of failed state)
+      //#define REWIPE // Re-attempts wiping
+      #ifdef REWIPE
+        #define NUM_REWIPES 6 // Number of (back-and-forth) re-wipe attemps to make, e.g. 6 would produce 12 strokes
+        // Re-wipe line from REWIPE_FIRST_PT to REWIPE_SECOND_PT
+        #define REWIPE_FIRST_PT {45, 173}
+        #define REWIPE_SECOND_PT {115, 173}
+        #define Z_REWIPE_PT (Z_MIN_POS + 1) // Depth to re-wipe at
+      #endif
+    #endif
+
   #else  // !AUTO_BED_LEVELING_GRID
 
     // Arbitrary points to probe.
@@ -630,6 +646,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
 
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
 
+  #define MIN_PROBE_PT (Z_MIN_POS-2)     //How far the extruder should move down to probe
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.

Marlin/example_configurations/WITBOX/Configuration.h

@@ -565,6 +565,22 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
     // You probably don't need more than 3 (squared=9).
     #define AUTO_BED_LEVELING_GRID_POINTS 2
 
+    //#define REPROBE // Re-attempts probing
+
+    #ifdef REPROBE
+      #define Z_RETRY_PT 15 // Z height to move the hotend after failed probe
+      #define NUM_ATTEMPTS 3 // Number of attempts to make before quiting
+      //#define PROBE_FAIL_PANIC // Completely give up printing if the final attempt fails (use G26 to get out of failed state)
+      //#define REWIPE // Re-attempts wiping
+      #ifdef REWIPE
+        #define NUM_REWIPES 6 // Number of (back-and-forth) re-wipe attemps to make, e.g. 6 would produce 12 strokes
+        // Re-wipe line from REWIPE_FIRST_PT to REWIPE_SECOND_PT
+        #define REWIPE_FIRST_PT {45, 173}
+        #define REWIPE_SECOND_PT {115, 173}
+        #define Z_REWIPE_PT (Z_MIN_POS + 1) // Depth to re-wipe at
+      #endif
+    #endif
+
   #else  // !AUTO_BED_LEVELING_GRID
 
     // Arbitrary points to probe.
@@ -601,6 +617,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
 
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
 
+  #define MIN_PROBE_PT (Z_MIN_POS-2)     //How far the extruder should move down to probe
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.

Marlin/example_configurations/adafruit/ST7565/Configuration.h

@@ -573,6 +573,22 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
     // You probably don't need more than 3 (squared=9).
     #define AUTO_BED_LEVELING_GRID_POINTS 2
 
+    //#define REPROBE // Re-attempts probing
+
+    #ifdef REPROBE
+      #define Z_RETRY_PT 15 // Z height to move the hotend after failed probe
+      #define NUM_ATTEMPTS 3 // Number of attempts to make before quiting
+      //#define PROBE_FAIL_PANIC // Completely give up printing if the final attempt fails (use G26 to get out of failed state)
+      //#define REWIPE // Re-attempts wiping
+      #ifdef REWIPE
+        #define NUM_REWIPES 6 // Number of (back-and-forth) re-wipe attemps to make, e.g. 6 would produce 12 strokes
+        // Re-wipe line from REWIPE_FIRST_PT to REWIPE_SECOND_PT
+        #define REWIPE_FIRST_PT {45, 173}
+        #define REWIPE_SECOND_PT {115, 173}
+        #define Z_REWIPE_PT (Z_MIN_POS + 1) // Depth to re-wipe at
+      #endif
+    #endif
+
   #else  // !AUTO_BED_LEVELING_GRID
 
     // Arbitrary points to probe.
@@ -609,6 +625,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
 
   #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
 
+  #define MIN_PROBE_PT (Z_MIN_POS-2)     //How far the extruder should move down to probe
   #define Z_RAISE_BEFORE_PROBING 15   // How much the Z axis will be raised before traveling to the first probing point.
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.