Skip to content

Commit 07321b7

Browse files
thinkyheadthinkyhead
committed
♻️ Refactor PROBE_PT_[123]
MarlinFirmware/Marlin#25522
1 parent 22aca95 commit 07321b7

File tree

307 files changed

+1228
-2149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

307 files changed

+1228
-2149
lines changed

‎config/default/Configuration_adv.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -2169,13 +2169,10 @@
21692169
* Points to probe for all 3-point Leveling procedures.
21702170
* Override if the automatically selected points are inadequate.
21712171
*/
2172-
#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
2173-
//#define PROBE_PT_1_X 15
2174-
//#define PROBE_PT_1_Y 180
2175-
//#define PROBE_PT_2_X 15
2176-
//#define PROBE_PT_2_Y 20
2177-
//#define PROBE_PT_3_X 170
2178-
//#define PROBE_PT_3_Y 20
2172+
#if NEEDS_THREE_PROBE_POINTS
2173+
//#define PROBE_PT_1 { 15, 180 } // (mm) { x, y }
2174+
//#define PROBE_PT_2 { 15, 20 }
2175+
//#define PROBE_PT_3 { 170, 20 }
21792176
#endif
21802177

21812178
/**

‎config/examples/3DFabXYZ/Migbot/Configuration_adv.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -2169,13 +2169,10 @@
21692169
* Points to probe for all 3-point Leveling procedures.
21702170
* Override if the automatically selected points are inadequate.
21712171
*/
2172-
#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
2173-
//#define PROBE_PT_1_X 15
2174-
//#define PROBE_PT_1_Y 180
2175-
//#define PROBE_PT_2_X 15
2176-
//#define PROBE_PT_2_Y 20
2177-
//#define PROBE_PT_3_X 170
2178-
//#define PROBE_PT_3_Y 20
2172+
#if NEEDS_THREE_PROBE_POINTS
2173+
//#define PROBE_PT_1 { 15, 180 } // (mm) { x, y }
2174+
//#define PROBE_PT_2 { 15, 20 }
2175+
//#define PROBE_PT_3 { 170, 20 }
21792176
#endif
21802177

21812178
/**

‎config/examples/ADIMLab/Gantry v1/Configuration_adv.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -2169,13 +2169,10 @@
21692169
* Points to probe for all 3-point Leveling procedures.
21702170
* Override if the automatically selected points are inadequate.
21712171
*/
2172-
#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
2173-
//#define PROBE_PT_1_X 15
2174-
//#define PROBE_PT_1_Y 180
2175-
//#define PROBE_PT_2_X 15
2176-
//#define PROBE_PT_2_Y 20
2177-
//#define PROBE_PT_3_X 170
2178-
//#define PROBE_PT_3_Y 20
2172+
#if NEEDS_THREE_PROBE_POINTS
2173+
//#define PROBE_PT_1 { 15, 180 } // (mm) { x, y }
2174+
//#define PROBE_PT_2 { 15, 20 }
2175+
//#define PROBE_PT_3 { 170, 20 }
21792176
#endif
21802177

21812178
/**

‎config/examples/ADIMLab/Gantry v2/Configuration_adv.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -2169,13 +2169,10 @@
21692169
* Points to probe for all 3-point Leveling procedures.
21702170
* Override if the automatically selected points are inadequate.
21712171
*/
2172-
#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
2173-
//#define PROBE_PT_1_X 15
2174-
//#define PROBE_PT_1_Y 180
2175-
//#define PROBE_PT_2_X 15
2176-
//#define PROBE_PT_2_Y 20
2177-
//#define PROBE_PT_3_X 170
2178-
//#define PROBE_PT_3_Y 20
2172+
#if NEEDS_THREE_PROBE_POINTS
2173+
//#define PROBE_PT_1 { 15, 180 } // (mm) { x, y }
2174+
//#define PROBE_PT_2 { 15, 20 }
2175+
//#define PROBE_PT_3 { 170, 20 }
21792176
#endif
21802177

21812178
/**

‎config/examples/Alfawise/U20-bltouch/Configuration_adv.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -2179,13 +2179,10 @@
21792179
* Points to probe for all 3-point Leveling procedures.
21802180
* Override if the automatically selected points are inadequate.
21812181
*/
2182-
#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
2183-
//#define PROBE_PT_1_X 15
2184-
//#define PROBE_PT_1_Y 180
2185-
//#define PROBE_PT_2_X 15
2186-
//#define PROBE_PT_2_Y 20
2187-
//#define PROBE_PT_3_X 170
2188-
//#define PROBE_PT_3_Y 20
2182+
#if NEEDS_THREE_PROBE_POINTS
2183+
//#define PROBE_PT_1 { 15, 180 } // (mm) { x, y }
2184+
//#define PROBE_PT_2 { 15, 20 }
2185+
//#define PROBE_PT_3 { 170, 20 }
21892186
#endif
21902187

21912188
/**

‎config/examples/Alfawise/U20/Configuration_adv.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -2170,13 +2170,10 @@
21702170
* Points to probe for all 3-point Leveling procedures.
21712171
* Override if the automatically selected points are inadequate.
21722172
*/
2173-
#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
2174-
//#define PROBE_PT_1_X 15
2175-
//#define PROBE_PT_1_Y 180
2176-
//#define PROBE_PT_2_X 15
2177-
//#define PROBE_PT_2_Y 20
2178-
//#define PROBE_PT_3_X 170
2179-
//#define PROBE_PT_3_Y 20
2173+
#if NEEDS_THREE_PROBE_POINTS
2174+
//#define PROBE_PT_1 { 15, 180 } // (mm) { x, y }
2175+
//#define PROBE_PT_2 { 15, 20 }
2176+
//#define PROBE_PT_3 { 170, 20 }
21802177
#endif
21812178

21822179
/**

‎config/examples/AliExpress/UM2pExt/Configuration_adv.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -2169,13 +2169,10 @@
21692169
* Points to probe for all 3-point Leveling procedures.
21702170
* Override if the automatically selected points are inadequate.
21712171
*/
2172-
#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
2173-
//#define PROBE_PT_1_X 15
2174-
//#define PROBE_PT_1_Y 180
2175-
//#define PROBE_PT_2_X 15
2176-
//#define PROBE_PT_2_Y 20
2177-
//#define PROBE_PT_3_X 170
2178-
//#define PROBE_PT_3_Y 20
2172+
#if NEEDS_THREE_PROBE_POINTS
2173+
//#define PROBE_PT_1 { 15, 180 } // (mm) { x, y }
2174+
//#define PROBE_PT_2 { 15, 20 }
2175+
//#define PROBE_PT_3 { 170, 20 }
21792176
#endif
21802177

21812178
/**

‎config/examples/Anet/A2/Configuration_adv.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -2169,13 +2169,10 @@
21692169
* Points to probe for all 3-point Leveling procedures.
21702170
* Override if the automatically selected points are inadequate.
21712171
*/
2172-
#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
2173-
//#define PROBE_PT_1_X 15
2174-
//#define PROBE_PT_1_Y 180
2175-
//#define PROBE_PT_2_X 15
2176-
//#define PROBE_PT_2_Y 20
2177-
//#define PROBE_PT_3_X 170
2178-
//#define PROBE_PT_3_Y 20
2172+
#if NEEDS_THREE_PROBE_POINTS
2173+
//#define PROBE_PT_1 { 15, 180 } // (mm) { x, y }
2174+
//#define PROBE_PT_2 { 15, 20 }
2175+
//#define PROBE_PT_3 { 170, 20 }
21792176
#endif
21802177

21812178
/**

‎config/examples/Anet/A2plus/Configuration_adv.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -2169,13 +2169,10 @@
21692169
* Points to probe for all 3-point Leveling procedures.
21702170
* Override if the automatically selected points are inadequate.
21712171
*/
2172-
#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
2173-
//#define PROBE_PT_1_X 15
2174-
//#define PROBE_PT_1_Y 180
2175-
//#define PROBE_PT_2_X 15
2176-
//#define PROBE_PT_2_Y 20
2177-
//#define PROBE_PT_3_X 170
2178-
//#define PROBE_PT_3_Y 20
2172+
#if NEEDS_THREE_PROBE_POINTS
2173+
//#define PROBE_PT_1 { 15, 180 } // (mm) { x, y }
2174+
//#define PROBE_PT_2 { 15, 20 }
2175+
//#define PROBE_PT_3 { 170, 20 }
21792176
#endif
21802177

21812178
/**

‎config/examples/Anet/A6/Configuration_adv.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -2169,13 +2169,10 @@
21692169
* Points to probe for all 3-point Leveling procedures.
21702170
* Override if the automatically selected points are inadequate.
21712171
*/
2172-
#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
2173-
//#define PROBE_PT_1_X 15
2174-
//#define PROBE_PT_1_Y 180
2175-
//#define PROBE_PT_2_X 15
2176-
//#define PROBE_PT_2_Y 20
2177-
//#define PROBE_PT_3_X 170
2178-
//#define PROBE_PT_3_Y 20
2172+
#if NEEDS_THREE_PROBE_POINTS
2173+
//#define PROBE_PT_1 { 15, 180 } // (mm) { x, y }
2174+
//#define PROBE_PT_2 { 15, 20 }
2175+
//#define PROBE_PT_3 { 170, 20 }
21792176
#endif
21802177

21812178
/**

‎config/examples/Anet/A8/Configuration_adv.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -2169,13 +2169,10 @@
21692169
* Points to probe for all 3-point Leveling procedures.
21702170
* Override if the automatically selected points are inadequate.
21712171
*/
2172-
#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
2173-
#define PROBE_PT_1_X 20
2174-
#define PROBE_PT_1_Y 160
2175-
#define PROBE_PT_2_X 20
2176-
#define PROBE_PT_2_Y 10
2177-
#define PROBE_PT_3_X 180
2178-
#define PROBE_PT_3_Y 10
2172+
#if NEEDS_THREE_PROBE_POINTS
2173+
#define PROBE_PT_1 { 20, 160 } // (mm) { x, y }
2174+
#define PROBE_PT_2 { 20, 10 }
2175+
#define PROBE_PT_3 { 180, 10 }
21792176
#endif
21802177

21812178
/**

‎config/examples/Anet/A8plus/Configuration_adv.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -2169,13 +2169,10 @@
21692169
* Points to probe for all 3-point Leveling procedures.
21702170
* Override if the automatically selected points are inadequate.
21712171
*/
2172-
#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
2173-
//#define PROBE_PT_1_X 15
2174-
//#define PROBE_PT_1_Y 180
2175-
//#define PROBE_PT_2_X 15
2176-
//#define PROBE_PT_2_Y 20
2177-
//#define PROBE_PT_3_X 170
2178-
//#define PROBE_PT_3_Y 20
2172+
#if NEEDS_THREE_PROBE_POINTS
2173+
//#define PROBE_PT_1 { 15, 180 } // (mm) { x, y }
2174+
//#define PROBE_PT_2 { 15, 20 }
2175+
//#define PROBE_PT_3 { 170, 20 }
21792176
#endif
21802177

21812178
/**

‎config/examples/Anet/A9/Configuration_adv.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -2169,13 +2169,10 @@
21692169
* Points to probe for all 3-point Leveling procedures.
21702170
* Override if the automatically selected points are inadequate.
21712171
*/
2172-
#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
2173-
//#define PROBE_PT_1_X 15
2174-
//#define PROBE_PT_1_Y 180
2175-
//#define PROBE_PT_2_X 15
2176-
//#define PROBE_PT_2_Y 20
2177-
//#define PROBE_PT_3_X 170
2178-
//#define PROBE_PT_3_Y 20
2172+
#if NEEDS_THREE_PROBE_POINTS
2173+
//#define PROBE_PT_1 { 15, 180 } // (mm) { x, y }
2174+
//#define PROBE_PT_2 { 15, 20 }
2175+
//#define PROBE_PT_3 { 170, 20 }
21792176
#endif
21802177

21812178
/**

‎config/examples/Anet/E10/Configuration_adv.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -2169,13 +2169,10 @@
21692169
* Points to probe for all 3-point Leveling procedures.
21702170
* Override if the automatically selected points are inadequate.
21712171
*/
2172-
#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
2173-
//#define PROBE_PT_1_X 15
2174-
//#define PROBE_PT_1_Y 180
2175-
//#define PROBE_PT_2_X 15
2176-
//#define PROBE_PT_2_Y 20
2177-
//#define PROBE_PT_3_X 170
2178-
//#define PROBE_PT_3_Y 20
2172+
#if NEEDS_THREE_PROBE_POINTS
2173+
//#define PROBE_PT_1 { 15, 180 } // (mm) { x, y }
2174+
//#define PROBE_PT_2 { 15, 20 }
2175+
//#define PROBE_PT_3 { 170, 20 }
21792176
#endif
21802177

21812178
/**

‎config/examples/Anet/E16/BTT SKR 1.3/Configuration_adv.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -2169,13 +2169,10 @@
21692169
* Points to probe for all 3-point Leveling procedures.
21702170
* Override if the automatically selected points are inadequate.
21712171
*/
2172-
#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
2173-
//#define PROBE_PT_1_X 15
2174-
//#define PROBE_PT_1_Y 180
2175-
//#define PROBE_PT_2_X 15
2176-
//#define PROBE_PT_2_Y 20
2177-
//#define PROBE_PT_3_X 170
2178-
//#define PROBE_PT_3_Y 20
2172+
#if NEEDS_THREE_PROBE_POINTS
2173+
//#define PROBE_PT_1 { 15, 180 } // (mm) { x, y }
2174+
//#define PROBE_PT_2 { 15, 20 }
2175+
//#define PROBE_PT_3 { 170, 20 }
21792176
#endif
21802177

21812178
/**

‎config/examples/Anet/E16/Stock/Configuration_adv.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -2169,13 +2169,10 @@
21692169
* Points to probe for all 3-point Leveling procedures.
21702170
* Override if the automatically selected points are inadequate.
21712171
*/
2172-
#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
2173-
//#define PROBE_PT_1_X 15
2174-
//#define PROBE_PT_1_Y 180
2175-
//#define PROBE_PT_2_X 15
2176-
//#define PROBE_PT_2_Y 20
2177-
//#define PROBE_PT_3_X 170
2178-
//#define PROBE_PT_3_Y 20
2172+
#if NEEDS_THREE_PROBE_POINTS
2173+
//#define PROBE_PT_1 { 15, 180 } // (mm) { x, y }
2174+
//#define PROBE_PT_2 { 15, 20 }
2175+
//#define PROBE_PT_3 { 170, 20 }
21792176
#endif
21802177

21812178
/**

‎config/examples/Anet/ET4+/Configuration_adv.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -2169,13 +2169,10 @@
21692169
* Points to probe for all 3-point Leveling procedures.
21702170
* Override if the automatically selected points are inadequate.
21712171
*/
2172-
#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
2173-
//#define PROBE_PT_1_X 15
2174-
//#define PROBE_PT_1_Y 180
2175-
//#define PROBE_PT_2_X 15
2176-
//#define PROBE_PT_2_Y 20
2177-
//#define PROBE_PT_3_X 170
2178-
//#define PROBE_PT_3_Y 20
2172+
#if NEEDS_THREE_PROBE_POINTS
2173+
//#define PROBE_PT_1 { 15, 180 } // (mm) { x, y }
2174+
//#define PROBE_PT_2 { 15, 20 }
2175+
//#define PROBE_PT_3 { 170, 20 }
21792176
#endif
21802177

21812178
/**

‎config/examples/Anet/ET4-Pro/Configuration_adv.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -2169,13 +2169,10 @@
21692169
* Points to probe for all 3-point Leveling procedures.
21702170
* Override if the automatically selected points are inadequate.
21712171
*/
2172-
#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
2173-
//#define PROBE_PT_1_X 15
2174-
//#define PROBE_PT_1_Y 180
2175-
//#define PROBE_PT_2_X 15
2176-
//#define PROBE_PT_2_Y 20
2177-
//#define PROBE_PT_3_X 170
2178-
//#define PROBE_PT_3_Y 20
2172+
#if NEEDS_THREE_PROBE_POINTS
2173+
//#define PROBE_PT_1 { 15, 180 } // (mm) { x, y }
2174+
//#define PROBE_PT_2 { 15, 20 }
2175+
//#define PROBE_PT_3 { 170, 20 }
21792176
#endif
21802177

21812178
/**

‎config/examples/Anet/ET4/Configuration_adv.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -2169,13 +2169,10 @@
21692169
* Points to probe for all 3-point Leveling procedures.
21702170
* Override if the automatically selected points are inadequate.
21712171
*/
2172-
#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
2173-
//#define PROBE_PT_1_X 15
2174-
//#define PROBE_PT_1_Y 180
2175-
//#define PROBE_PT_2_X 15
2176-
//#define PROBE_PT_2_Y 20
2177-
//#define PROBE_PT_3_X 170
2178-
//#define PROBE_PT_3_Y 20
2172+
#if NEEDS_THREE_PROBE_POINTS
2173+
//#define PROBE_PT_1 { 15, 180 } // (mm) { x, y }
2174+
//#define PROBE_PT_2 { 15, 20 }
2175+
//#define PROBE_PT_3 { 170, 20 }
21792176
#endif
21802177

21812178
/**

‎config/examples/Anet/ET4X/Configuration_adv.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -2169,13 +2169,10 @@
21692169
* Points to probe for all 3-point Leveling procedures.
21702170
* Override if the automatically selected points are inadequate.
21712171
*/
2172-
#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
2173-
//#define PROBE_PT_1_X 15
2174-
//#define PROBE_PT_1_Y 180
2175-
//#define PROBE_PT_2_X 15
2176-
//#define PROBE_PT_2_Y 20
2177-
//#define PROBE_PT_3_X 170
2178-
//#define PROBE_PT_3_Y 20
2172+
#if NEEDS_THREE_PROBE_POINTS
2173+
//#define PROBE_PT_1 { 15, 180 } // (mm) { x, y }
2174+
//#define PROBE_PT_2 { 15, 20 }
2175+
//#define PROBE_PT_3 { 170, 20 }
21792176
#endif
21802177

21812178
/**

‎config/examples/Anet/ET5-Pro/Configuration_adv.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -2169,13 +2169,10 @@
21692169
* Points to probe for all 3-point Leveling procedures.
21702170
* Override if the automatically selected points are inadequate.
21712171
*/
2172-
#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
2173-
//#define PROBE_PT_1_X 15
2174-
//#define PROBE_PT_1_Y 180
2175-
//#define PROBE_PT_2_X 15
2176-
//#define PROBE_PT_2_Y 20
2177-
//#define PROBE_PT_3_X 170
2178-
//#define PROBE_PT_3_Y 20
2172+
#if NEEDS_THREE_PROBE_POINTS
2173+
//#define PROBE_PT_1 { 15, 180 } // (mm) { x, y }
2174+
//#define PROBE_PT_2 { 15, 20 }
2175+
//#define PROBE_PT_3 { 170, 20 }
21792176
#endif
21802177

21812178
/**

‎config/examples/Anet/ET5/Configuration_adv.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -2169,13 +2169,10 @@
21692169
* Points to probe for all 3-point Leveling procedures.
21702170
* Override if the automatically selected points are inadequate.
21712171
*/
2172-
#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
2173-
//#define PROBE_PT_1_X 15
2174-
//#define PROBE_PT_1_Y 180
2175-
//#define PROBE_PT_2_X 15
2176-
//#define PROBE_PT_2_Y 20
2177-
//#define PROBE_PT_3_X 170
2178-
//#define PROBE_PT_3_Y 20
2172+
#if NEEDS_THREE_PROBE_POINTS
2173+
//#define PROBE_PT_1 { 15, 180 } // (mm) { x, y }
2174+
//#define PROBE_PT_2 { 15, 20 }
2175+
//#define PROBE_PT_3 { 170, 20 }
21792176
#endif
21802177

21812178
/**

0 commit comments

Comments
 (0)