Browse Source

Rename ENABLE_AUTO_BED_LEVELING

With the introduction of the #if ENABLED(…)

reads better than
Richard Wackerbarth 9 years ago
parent
commit
6292d9e815

+ 2
- 2
Marlin/Conditionals.h View File

@@ -279,7 +279,7 @@
279 279
   /**
280 280
    * Auto Bed Leveling
281 281
    */
282
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
282
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
283 283
     // Boundaries for probing based on set limits
284 284
     #define MIN_PROBE_X (max(X_MIN_POS, X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
285 285
     #define MAX_PROBE_X (min(X_MAX_POS, X_MAX_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
@@ -287,7 +287,7 @@
287 287
     #define MAX_PROBE_Y (min(Y_MAX_POS, Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
288 288
   #endif
289 289
 
290
-  #define SERVO_LEVELING (defined(ENABLE_AUTO_BED_LEVELING) && defined(Z_ENDSTOP_SERVO_NR))
290
+  #define SERVO_LEVELING (defined(AUTO_BED_LEVELING_FEATURE) && defined(Z_ENDSTOP_SERVO_NR))
291 291
 
292 292
    /**
293 293
     * Sled Options

+ 6
- 5
Marlin/Configuration.h View File

@@ -442,10 +442,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
442 442
 
443 443
 // @section bedlevel
444 444
 
445
-//#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line).
446
-#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z probe repeatability test will be included if auto bed leveling is enabled.
445
+//#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
446
+//#define DEBUG_LEVELING_FEATURE
447
+#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
447 448
 
448
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
449
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
449 450
 
450 451
   // There are 2 different ways to specify probing locations:
451 452
   //
@@ -557,7 +558,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
557 558
   //
558 559
   //#define Z_MIN_PROBE_ENDSTOP
559 560
 
560
-#endif // ENABLE_AUTO_BED_LEVELING
561
+#endif // AUTO_BED_LEVELING_FEATURE
561 562
 
562 563
 
563 564
 // @section homing
@@ -608,7 +609,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
608 609
 // Custom M code points
609 610
 #define CUSTOM_M_CODES
610 611
 #if ENABLED(CUSTOM_M_CODES)
611
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
612
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
612 613
     #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
613 614
     #define Z_PROBE_OFFSET_RANGE_MIN -20
614 615
     #define Z_PROBE_OFFSET_RANGE_MAX 20

+ 2
- 2
Marlin/Marlin.h View File

@@ -268,7 +268,7 @@ extern bool axis_known_position[3]; // axis[n].is_known
268 268
     extern float delta_diagonal_rod;
269 269
     extern float delta_segments_per_second;
270 270
     void recalc_delta_settings(float radius, float diagonal_rod);
271
-    #if ENABLED(ENABLE_AUTO_BED_LEVELING)
271
+    #if ENABLED(AUTO_BED_LEVELING_FEATURE)
272 272
       extern int delta_grid_spacing[2];
273 273
       void adjust_delta(float cartesian[3]);
274 274
     #endif
@@ -282,7 +282,7 @@ extern bool axis_known_position[3]; // axis[n].is_known
282 282
   extern float z_endstop_adj;
283 283
 #endif
284 284
 
285
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
285
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
286 286
   extern float zprobe_zoffset;
287 287
 #endif
288 288
 

+ 27
- 27
Marlin/Marlin_main.cpp View File

@@ -29,12 +29,12 @@
29 29
 
30 30
 #include "Marlin.h"
31 31
 
32
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
32
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
33 33
   #include "vector_3.h"
34 34
   #if ENABLED(AUTO_BED_LEVELING_GRID)
35 35
     #include "qr_solve.h"
36 36
   #endif
37
-#endif // ENABLE_AUTO_BED_LEVELING
37
+#endif // AUTO_BED_LEVELING_FEATURE
38 38
 
39 39
 #if ENABLED(MESH_BED_LEVELING)
40 40
   #include "mesh_bed_leveling.h"
@@ -288,7 +288,7 @@ static uint8_t target_extruder;
288 288
 bool no_wait_for_cooling = true;
289 289
 bool target_direction;
290 290
 
291
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
291
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
292 292
   int xy_travel_speed = XY_TRAVEL_SPEED;
293 293
   float zprobe_zoffset = Z_PROBE_OFFSET_FROM_EXTRUDER;
294 294
 #endif
@@ -366,7 +366,7 @@ bool target_direction;
366 366
   float delta_diagonal_rod = DELTA_DIAGONAL_ROD;
367 367
   float delta_diagonal_rod_2 = sq(delta_diagonal_rod);
368 368
   float delta_segments_per_second = DELTA_SEGMENTS_PER_SECOND;
369
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
369
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
370 370
     int delta_grid_spacing[2] = { 0, 0 };
371 371
     float bed_level[AUTO_BED_LEVELING_GRID_POINTS][AUTO_BED_LEVELING_GRID_POINTS];
372 372
   #endif
@@ -1095,7 +1095,7 @@ static void set_axis_is_at_home(AxisEnum axis) {
1095 1095
     min_pos[axis] = base_min_pos(axis) + home_offset[axis];
1096 1096
     max_pos[axis] = base_max_pos(axis) + home_offset[axis];
1097 1097
 
1098
-    #if ENABLED(ENABLE_AUTO_BED_LEVELING) && Z_HOME_DIR < 0
1098
+    #if ENABLED(AUTO_BED_LEVELING_FEATURE) && Z_HOME_DIR < 0
1099 1099
       if (axis == Z_AXIS) current_position[Z_AXIS] -= zprobe_zoffset;
1100 1100
     #endif
1101 1101
   }
@@ -1146,7 +1146,7 @@ static void setup_for_endstop_move() {
1146 1146
   enable_endstops(true);
1147 1147
 }
1148 1148
 
1149
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
1149
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
1150 1150
 
1151 1151
   #if ENABLED(DELTA)
1152 1152
     /**
@@ -1604,7 +1604,7 @@ static void setup_for_endstop_move() {
1604 1604
 
1605 1605
   #endif
1606 1606
 
1607
-#endif // ENABLE_AUTO_BED_LEVELING
1607
+#endif // AUTO_BED_LEVELING_FEATURE
1608 1608
 
1609 1609
 
1610 1610
 #if ENABLED(Z_PROBE_SLED)
@@ -2000,7 +2000,7 @@ inline void gcode_G28() {
2000 2000
   st_synchronize();
2001 2001
 
2002 2002
   // For auto bed leveling, clear the level matrix
2003
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
2003
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
2004 2004
     plan_bed_level_matrix.set_to_identity();
2005 2005
     #if ENABLED(DELTA)
2006 2006
       reset_bed_level();
@@ -2395,7 +2395,7 @@ inline void gcode_G28() {
2395 2395
     } // switch(state)
2396 2396
   }
2397 2397
 
2398
-#elif ENABLED(ENABLE_AUTO_BED_LEVELING)
2398
+#elif ENABLED(AUTO_BED_LEVELING_FEATURE)
2399 2399
 
2400 2400
   void out_of_range_error(const char *p_edge) {
2401 2401
     SERIAL_PROTOCOLPGM("?Probe ");
@@ -2839,7 +2839,7 @@ inline void gcode_G28() {
2839 2839
 
2840 2840
   #endif //!Z_PROBE_SLED
2841 2841
 
2842
-#endif //ENABLE_AUTO_BED_LEVELING
2842
+#endif //AUTO_BED_LEVELING_FEATURE
2843 2843
 
2844 2844
 /**
2845 2845
  * G92: Set current position to given X Y Z E
@@ -3116,7 +3116,7 @@ inline void gcode_M42() {
3116 3116
   } // code_seen('S')
3117 3117
 }
3118 3118
 
3119
-#if ENABLED(ENABLE_AUTO_BED_LEVELING) && ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
3119
+#if ENABLED(AUTO_BED_LEVELING_FEATURE) && ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
3120 3120
 
3121 3121
   // This is redundant since the SanityCheck.h already checks for a valid Z_MIN_PROBE_PIN, but here for clarity.
3122 3122
   #if ENABLED(Z_MIN_PROBE_ENDSTOP)
@@ -3366,7 +3366,7 @@ inline void gcode_M42() {
3366 3366
     SERIAL_EOL; SERIAL_EOL;
3367 3367
   }
3368 3368
 
3369
-#endif // ENABLE_AUTO_BED_LEVELING && Z_MIN_PROBE_REPEATABILITY_TEST
3369
+#endif // AUTO_BED_LEVELING_FEATURE && Z_MIN_PROBE_REPEATABILITY_TEST
3370 3370
 
3371 3371
 /**
3372 3372
  * M104: Set hot end temperature
@@ -4585,7 +4585,7 @@ inline void gcode_M303() {
4585 4585
  */
4586 4586
 inline void gcode_M400() { st_synchronize(); }
4587 4587
 
4588
-#if ENABLED(ENABLE_AUTO_BED_LEVELING) && DISABLED(Z_PROBE_SLED) && (HAS_SERVO_ENDSTOPS || ENABLED(Z_PROBE_ALLEN_KEY))
4588
+#if ENABLED(AUTO_BED_LEVELING_FEATURE) && DISABLED(Z_PROBE_SLED) && (HAS_SERVO_ENDSTOPS || ENABLED(Z_PROBE_ALLEN_KEY))
4589 4589
 
4590 4590
   /**
4591 4591
    * M401: Engage Z Servo endstop if available
@@ -4607,7 +4607,7 @@ inline void gcode_M400() { st_synchronize(); }
4607 4607
     stow_z_probe(false);
4608 4608
   }
4609 4609
 
4610
-#endif // ENABLE_AUTO_BED_LEVELING && (HAS_SERVO_ENDSTOPS || Z_PROBE_ALLEN_KEY) && !Z_PROBE_SLED
4610
+#endif // AUTO_BED_LEVELING_FEATURE && (HAS_SERVO_ENDSTOPS || Z_PROBE_ALLEN_KEY) && !Z_PROBE_SLED
4611 4611
 
4612 4612
 #if ENABLED(FILAMENT_SENSOR)
4613 4613
 
@@ -5282,13 +5282,13 @@ void process_next_command() {
5282 5282
         gcode_G28();
5283 5283
         break;
5284 5284
 
5285
-      #if ENABLED(ENABLE_AUTO_BED_LEVELING) || ENABLED(MESH_BED_LEVELING)
5285
+      #if ENABLED(AUTO_BED_LEVELING_FEATURE) || ENABLED(MESH_BED_LEVELING)
5286 5286
         case 29: // G29 Detailed Z probe, probes the bed at 3 or more points.
5287 5287
           gcode_G29();
5288 5288
           break;
5289 5289
       #endif
5290 5290
 
5291
-      #if ENABLED(ENABLE_AUTO_BED_LEVELING)
5291
+      #if ENABLED(AUTO_BED_LEVELING_FEATURE)
5292 5292
 
5293 5293
         #if DISABLED(Z_PROBE_SLED)
5294 5294
 
@@ -5305,7 +5305,7 @@ void process_next_command() {
5305 5305
 
5306 5306
         #endif // Z_PROBE_SLED
5307 5307
 
5308
-      #endif // ENABLE_AUTO_BED_LEVELING
5308
+      #endif // AUTO_BED_LEVELING_FEATURE
5309 5309
 
5310 5310
       case 90: // G90
5311 5311
         relative_mode = false;
@@ -5377,11 +5377,11 @@ void process_next_command() {
5377 5377
         gcode_M42();
5378 5378
         break;
5379 5379
 
5380
-      #if ENABLED(ENABLE_AUTO_BED_LEVELING) && ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
5380
+      #if ENABLED(AUTO_BED_LEVELING_FEATURE) && ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
5381 5381
         case 48: // M48 Z probe repeatability
5382 5382
           gcode_M48();
5383 5383
           break;
5384
-      #endif // ENABLE_AUTO_BED_LEVELING && Z_MIN_PROBE_REPEATABILITY_TEST
5384
+      #endif // AUTO_BED_LEVELING_FEATURE && Z_MIN_PROBE_REPEATABILITY_TEST
5385 5385
 
5386 5386
       #if ENABLED(M100_FREE_MEMORY_WATCHER)
5387 5387
         case 100:
@@ -5650,14 +5650,14 @@ void process_next_command() {
5650 5650
         gcode_M400();
5651 5651
         break;
5652 5652
 
5653
-      #if ENABLED(ENABLE_AUTO_BED_LEVELING) && (HAS_SERVO_ENDSTOPS || ENABLED(Z_PROBE_ALLEN_KEY)) && DISABLED(Z_PROBE_SLED)
5653
+      #if ENABLED(AUTO_BED_LEVELING_FEATURE) && (HAS_SERVO_ENDSTOPS || ENABLED(Z_PROBE_ALLEN_KEY)) && DISABLED(Z_PROBE_SLED)
5654 5654
         case 401:
5655 5655
           gcode_M401();
5656 5656
           break;
5657 5657
         case 402:
5658 5658
           gcode_M402();
5659 5659
           break;
5660
-      #endif // ENABLE_AUTO_BED_LEVELING && (HAS_SERVO_ENDSTOPS || Z_PROBE_ALLEN_KEY) && !Z_PROBE_SLED
5660
+      #endif // AUTO_BED_LEVELING_FEATURE && (HAS_SERVO_ENDSTOPS || Z_PROBE_ALLEN_KEY) && !Z_PROBE_SLED
5661 5661
 
5662 5662
       #if ENABLED(FILAMENT_SENSOR)
5663 5663
         case 404:  //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or display nominal filament width
@@ -5799,7 +5799,7 @@ void clamp_to_software_endstops(float target[3]) {
5799 5799
     NOLESS(target[Y_AXIS], min_pos[Y_AXIS]);
5800 5800
     
5801 5801
     float negative_z_offset = 0;
5802
-    #if ENABLED(ENABLE_AUTO_BED_LEVELING)
5802
+    #if ENABLED(AUTO_BED_LEVELING_FEATURE)
5803 5803
       if (zprobe_zoffset < 0) negative_z_offset += zprobe_zoffset;
5804 5804
       if (home_offset[Z_AXIS] < 0) negative_z_offset += home_offset[Z_AXIS];
5805 5805
     #endif
@@ -5849,7 +5849,7 @@ void clamp_to_software_endstops(float target[3]) {
5849 5849
     */
5850 5850
   }
5851 5851
 
5852
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
5852
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
5853 5853
 
5854 5854
     // Adjust print surface height by linear interpolation over the bed_level array.
5855 5855
     void adjust_delta(float cartesian[3]) {
@@ -5889,7 +5889,7 @@ void clamp_to_software_endstops(float target[3]) {
5889 5889
       SERIAL_ECHOPGM(" offset="); SERIAL_ECHOLN(offset);
5890 5890
       */
5891 5891
     }
5892
-  #endif // ENABLE_AUTO_BED_LEVELING
5892
+  #endif // AUTO_BED_LEVELING_FEATURE
5893 5893
 
5894 5894
 #endif // DELTA
5895 5895
 
@@ -6008,7 +6008,7 @@ void mesh_plan_buffer_line(float x, float y, float z, const float e, float feed_
6008 6008
 
6009 6009
       calculate_delta(target);
6010 6010
 
6011
-      #if ENABLED(ENABLE_AUTO_BED_LEVELING)
6011
+      #if ENABLED(AUTO_BED_LEVELING_FEATURE)
6012 6012
         adjust_delta(target);
6013 6013
       #endif
6014 6014
 
@@ -6236,7 +6236,7 @@ void plan_arc(
6236 6236
 
6237 6237
     #if ENABLED(DELTA) || ENABLED(SCARA)
6238 6238
       calculate_delta(arc_target);
6239
-      #if ENABLED(ENABLE_AUTO_BED_LEVELING)
6239
+      #if ENABLED(AUTO_BED_LEVELING_FEATURE)
6240 6240
         adjust_delta(arc_target);
6241 6241
       #endif
6242 6242
       plan_buffer_line(delta[X_AXIS], delta[Y_AXIS], delta[Z_AXIS], arc_target[E_AXIS], feed_rate, active_extruder);
@@ -6248,7 +6248,7 @@ void plan_arc(
6248 6248
   // Ensure last segment arrives at target location.
6249 6249
   #if ENABLED(DELTA) || ENABLED(SCARA)
6250 6250
     calculate_delta(target);
6251
-    #if ENABLED(ENABLE_AUTO_BED_LEVELING)
6251
+    #if ENABLED(AUTO_BED_LEVELING_FEATURE)
6252 6252
       adjust_delta(target);
6253 6253
     #endif
6254 6254
     plan_buffer_line(delta[X_AXIS], delta[Y_AXIS], delta[Z_AXIS], target[E_AXIS], feed_rate, active_extruder);

+ 8
- 6
Marlin/SanityCheck.h View File

@@ -116,8 +116,8 @@
116 116
     #if ENABLED(DELTA)
117 117
       #error MESH_BED_LEVELING does not yet support DELTA printers.
118 118
     #endif
119
-    #if ENABLED(ENABLE_AUTO_BED_LEVELING)
120
-      #error Select ENABLE_AUTO_BED_LEVELING or MESH_BED_LEVELING, not both.
119
+    #if ENABLED(AUTO_BED_LEVELING_FEATURE)
120
+      #error Select AUTO_BED_LEVELING_FEATURE or MESH_BED_LEVELING, not both.
121 121
     #endif
122 122
     #if MESH_NUM_X_POINTS > 7 || MESH_NUM_Y_POINTS > 7
123 123
       #error MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS need to be less than 8.
@@ -127,7 +127,7 @@
127 127
   /**
128 128
    * Auto Bed Leveling
129 129
    */
130
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
130
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
131 131
 
132 132
     /**
133 133
      * Require a Z min pin
@@ -137,7 +137,7 @@
137 137
         #if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
138 138
           #error You must have a Z min or Z probe endstop to enable Z_MIN_PROBE_REPEATABILITY_TEST.
139 139
         #else
140
-          #error ENABLE_AUTO_BED_LEVELING requires a Z min or Z probe endstop. Z_MIN_PIN or Z_MIN_PROBE_PIN must point to a valid hardware pin.
140
+          #error AUTO_BED_LEVELING_FEATURE requires a Z_MIN or Z_PROBE endstop. Z_MIN_PIN or Z_MIN_PROBE_PIN must point to a valid hardware pin.
141 141
         #endif
142 142
       #endif
143 143
     #endif
@@ -207,7 +207,7 @@
207 207
 
208 208
     #endif // !AUTO_BED_LEVELING_GRID
209 209
 
210
-  #endif // ENABLE_AUTO_BED_LEVELING
210
+  #endif // AUTO_BED_LEVELING_FEATURE
211 211
 
212 212
   /**
213 213
    * ULTIPANEL encoder
@@ -221,7 +221,7 @@
221 221
    */
222 222
   #if ENABLED(DELTA)
223 223
 
224
-    #if ENABLED(ENABLE_AUTO_BED_LEVELING)
224
+    #if ENABLED(AUTO_BED_LEVELING_FEATURE)
225 225
 
226 226
       #if DISABLED(AUTO_BED_LEVELING_GRID)
227 227
         #error Only AUTO_BED_LEVELING_GRID is supported with DELTA.
@@ -362,6 +362,8 @@
362 362
     #error CUSTOM_MENDEL_NAME is now CUSTOM_MACHINE_NAME. Please update your configuration.
363 363
   #elif defined(HAS_AUTOMATIC_VERSIONING)
364 364
     #error HAS_AUTOMATIC_VERSIONING deprecated - use USE_AUTOMATIC_VERSIONING instead
365
+  #elif defined(ENABLE_AUTO_BED_LEVELING)
366
+    #error ENABLE_AUTO_BED_LEVELING deprecated - use AUTO_BED_LEVELING_FEATURE instead
365 367
   #endif
366 368
 
367 369
 #endif //SANITYCHECK_H

+ 4
- 4
Marlin/configuration_store.cpp View File

@@ -171,7 +171,7 @@ void Config_StoreSettings()  {
171 171
     for (uint8_t q=0; q<mesh_num_x*mesh_num_y; q++) EEPROM_WRITE_VAR(i, dummy);
172 172
   #endif // MESH_BED_LEVELING
173 173
 
174
-  #if DISABLED(ENABLE_AUTO_BED_LEVELING)
174
+  #if DISABLED(AUTO_BED_LEVELING_FEATURE)
175 175
     float zprobe_zoffset = 0;
176 176
   #endif
177 177
   EEPROM_WRITE_VAR(i, zprobe_zoffset);
@@ -339,7 +339,7 @@ void Config_RetrieveSettings() {
339 339
       for (int q = 0; q < mesh_num_x * mesh_num_y; q++) EEPROM_READ_VAR(i, dummy);
340 340
     #endif // MESH_BED_LEVELING
341 341
 
342
-    #if DISABLED(ENABLE_AUTO_BED_LEVELING)
342
+    #if DISABLED(AUTO_BED_LEVELING_FEATURE)
343 343
       float zprobe_zoffset = 0;
344 344
     #endif
345 345
     EEPROM_READ_VAR(i, zprobe_zoffset);
@@ -498,7 +498,7 @@ void Config_ResetDefault() {
498 498
     mbl.active = 0;
499 499
   #endif
500 500
 
501
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
501
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
502 502
     zprobe_zoffset = Z_PROBE_OFFSET_FROM_EXTRUDER;
503 503
   #endif
504 504
 
@@ -857,7 +857,7 @@ void Config_PrintSettings(bool forReplay) {
857 857
   /**
858 858
    * Auto Bed Leveling
859 859
    */
860
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
860
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
861 861
     #if ENABLED(CUSTOM_M_CODES)
862 862
       if (!forReplay) {
863 863
         CONFIG_ECHO_START;

+ 6
- 5
Marlin/configurator/config/Configuration.h View File

@@ -442,10 +442,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
442 442
 
443 443
 // @section bedlevel
444 444
 
445
-//#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line).
446
-#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z probe repeatability test will be included if auto bed leveling is enabled.
445
+//#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
446
+//#define DEBUG_LEVELING_FEATURE
447
+#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
447 448
 
448
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
449
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
449 450
 
450 451
   // There are 2 different ways to specify probing locations:
451 452
   //
@@ -557,7 +558,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
557 558
   //
558 559
   //#define Z_MIN_PROBE_ENDSTOP
559 560
 
560
-#endif // ENABLE_AUTO_BED_LEVELING
561
+#endif // AUTO_BED_LEVELING_FEATURE
561 562
 
562 563
 
563 564
 // @section homing
@@ -608,7 +609,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
608 609
 // Custom M code points
609 610
 #define CUSTOM_M_CODES
610 611
 #if ENABLED(CUSTOM_M_CODES)
611
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
612
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
612 613
     #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
613 614
     #define Z_PROBE_OFFSET_RANGE_MIN -20
614 615
     #define Z_PROBE_OFFSET_RANGE_MAX 20

+ 6
- 5
Marlin/example_configurations/Felix/Configuration.h View File

@@ -424,10 +424,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
424 424
 
425 425
 // @section bedlevel
426 426
 
427
-//#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line).
428
-//#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z probe repeatability test will be included if auto bed leveling is enabled.
427
+//#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
428
+//#define DEBUG_LEVELING_FEATURE
429
+//#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
429 430
 
430
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
431
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
431 432
 
432 433
   // There are 2 different ways to specify probing locations:
433 434
   //
@@ -539,7 +540,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
539 540
   //
540 541
   //#define Z_MIN_PROBE_ENDSTOP
541 542
 
542
-#endif // ENABLE_AUTO_BED_LEVELING
543
+#endif // AUTO_BED_LEVELING_FEATURE
543 544
 
544 545
 
545 546
 // @section homing
@@ -591,7 +592,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
591 592
 // Custom M code points
592 593
 #define CUSTOM_M_CODES
593 594
 #if ENABLED(CUSTOM_M_CODES)
594
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
595
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
595 596
     #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
596 597
     #define Z_PROBE_OFFSET_RANGE_MIN -20
597 598
     #define Z_PROBE_OFFSET_RANGE_MAX 20

+ 7
- 5
Marlin/example_configurations/Felix/Configuration_DUAL.h View File

@@ -394,10 +394,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
394 394
 
395 395
 // @section bedlevel
396 396
 
397
-//#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line).
398
-//#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z probe repeatability test will be included if auto bed leveling is enabled.
399 397
 
400
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
398
+//#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
399
+//#define DEBUG_LEVELING_FEATURE
400
+//#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
401
+
402
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
401 403
 
402 404
   // There are 2 different ways to specify probing locations:
403 405
   //
@@ -509,7 +511,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
509 511
   //
510 512
   //#define Z_MIN_PROBE_ENDSTOP
511 513
 
512
-#endif // ENABLE_AUTO_BED_LEVELING
514
+#endif // AUTO_BED_LEVELING_FEATURE
513 515
 
514 516
 
515 517
 // The position of the homing switches
@@ -561,7 +563,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
561 563
 // Custom M code points
562 564
 #define CUSTOM_M_CODES
563 565
 #if ENABLED(CUSTOM_M_CODES)
564
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
566
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
565 567
     #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
566 568
     #define Z_PROBE_OFFSET_RANGE_MIN -20
567 569
     #define Z_PROBE_OFFSET_RANGE_MAX 20

+ 7
- 5
Marlin/example_configurations/Hephestos/Configuration.h View File

@@ -434,10 +434,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
434 434
 
435 435
 // @section bedlevel
436 436
 
437
-//#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line).
438
-#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z probe repeatability test will be included if auto bed leveling is enabled.
439 437
 
440
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
438
+//#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
439
+//#define DEBUG_LEVELING_FEATURE
440
+#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
441
+
442
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
441 443
 
442 444
   // There are 2 different ways to specify probing locations:
443 445
   //
@@ -549,7 +551,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
549 551
   //
550 552
   //#define Z_MIN_PROBE_ENDSTOP
551 553
 
552
-#endif // ENABLE_AUTO_BED_LEVELING
554
+#endif // AUTO_BED_LEVELING_FEATURE
553 555
 
554 556
 
555 557
 // @section homing
@@ -600,7 +602,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
600 602
 // Custom M code points
601 603
 #define CUSTOM_M_CODES
602 604
 #if ENABLED(CUSTOM_M_CODES)
603
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
605
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
604 606
     #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
605 607
     #define Z_PROBE_OFFSET_RANGE_MIN -20
606 608
     #define Z_PROBE_OFFSET_RANGE_MAX 20

+ 6
- 5
Marlin/example_configurations/K8200/Configuration.h View File

@@ -430,10 +430,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
430 430
 
431 431
 // @section bedlevel
432 432
 
433
-//#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line).
434
-#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z probe repeatability test will be included if auto bed leveling is enabled.
433
+//#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
434
+//#define DEBUG_LEVELING_FEATURE
435
+#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
435 436
 
436
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
437
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
437 438
 
438 439
   // There are 2 different ways to specify probing locations:
439 440
   //
@@ -545,7 +546,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
545 546
   //
546 547
   //#define Z_MIN_PROBE_ENDSTOP
547 548
 
548
-#endif // ENABLE_AUTO_BED_LEVELING
549
+#endif // AUTO_BED_LEVELING_FEATURE
549 550
 
550 551
 
551 552
 // @section homing
@@ -596,7 +597,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
596 597
 // Custom M code points
597 598
 #define CUSTOM_M_CODES
598 599
 #if ENABLED(CUSTOM_M_CODES)
599
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
600
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
600 601
     #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
601 602
     #define Z_PROBE_OFFSET_RANGE_MIN -20
602 603
     #define Z_PROBE_OFFSET_RANGE_MAX 20

+ 7
- 5
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h View File

@@ -442,10 +442,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
442 442
 
443 443
 // @section bedlevel
444 444
 
445
-//#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line).
446
-#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z probe repeatability test will be included if auto bed leveling is enabled.
447 445
 
448
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
446
+//#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
447
+//#define DEBUG_LEVELING_FEATURE
448
+#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
449
+
450
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
449 451
 
450 452
   // There are 2 different ways to specify probing locations:
451 453
   //
@@ -557,7 +559,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
557 559
   //
558 560
   //#define Z_MIN_PROBE_ENDSTOP
559 561
 
560
-#endif // ENABLE_AUTO_BED_LEVELING
562
+#endif // AUTO_BED_LEVELING_FEATURE
561 563
 
562 564
 
563 565
 // @section homing
@@ -608,7 +610,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
608 610
 // Custom M code points
609 611
 #define CUSTOM_M_CODES
610 612
 #if ENABLED(CUSTOM_M_CODES)
611
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
613
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
612 614
     #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
613 615
     #define Z_PROBE_OFFSET_RANGE_MIN -20
614 616
     #define Z_PROBE_OFFSET_RANGE_MAX 20

+ 6
- 5
Marlin/example_configurations/RigidBot/Configuration.h View File

@@ -428,10 +428,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
428 428
 
429 429
 // @section bedlevel
430 430
 
431
-//#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line).
432
-//#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z probe repeatability test will be included if auto bed leveling is enabled.
431
+//#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
432
+//#define DEBUG_LEVELING_FEATURE
433
+//#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
433 434
 
434
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
435
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
435 436
 
436 437
   // There are 2 different ways to specify probing locations:
437 438
   //
@@ -543,7 +544,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
543 544
   //
544 545
   //#define Z_MIN_PROBE_ENDSTOP
545 546
 
546
-#endif // ENABLE_AUTO_BED_LEVELING
547
+#endif // AUTO_BED_LEVELING_FEATURE
547 548
 
548 549
 
549 550
 // @section homing
@@ -595,7 +596,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
595 596
 // Custom M code points
596 597
 #define CUSTOM_M_CODES
597 598
 #if ENABLED(CUSTOM_M_CODES)
598
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
599
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
599 600
     #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
600 601
     #define Z_PROBE_OFFSET_RANGE_MIN -20
601 602
     #define Z_PROBE_OFFSET_RANGE_MAX 20

+ 6
- 5
Marlin/example_configurations/SCARA/Configuration.h View File

@@ -450,10 +450,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
450 450
 
451 451
 // @section bedlevel
452 452
 
453
-//#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line).
454
-#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z probe repeatability test will be included if auto bed leveling is enabled.
453
+//#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
454
+//#define DEBUG_LEVELING_FEATURE
455
+#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
455 456
 
456
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
457
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
457 458
 
458 459
   // There are 2 different ways to specify probing locations:
459 460
   //
@@ -565,7 +566,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
565 566
   //
566 567
   //#define Z_MIN_PROBE_ENDSTOP
567 568
 
568
-#endif // ENABLE_AUTO_BED_LEVELING
569
+#endif // AUTO_BED_LEVELING_FEATURE
569 570
 
570 571
 
571 572
 // @section homing
@@ -616,7 +617,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
616 617
 // Custom M code points
617 618
 //#define CUSTOM_M_CODES
618 619
 #if ENABLED(CUSTOM_M_CODES)
619
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
620
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
620 621
     #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
621 622
     #define Z_PROBE_OFFSET_RANGE_MIN -20
622 623
     #define Z_PROBE_OFFSET_RANGE_MAX 20

+ 6
- 5
Marlin/example_configurations/WITBOX/Configuration.h View File

@@ -434,10 +434,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
434 434
 
435 435
 // @section bedlevel
436 436
 
437
-//#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line).
438
-#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z probe repeatability test will be included if auto bed leveling is enabled.
437
+//#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
438
+//#define DEBUG_LEVELING_FEATURE
439
+#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
439 440
 
440
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
441
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
441 442
 
442 443
   // There are 2 different ways to specify probing locations:
443 444
   //
@@ -549,7 +550,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
549 550
   //
550 551
   //#define Z_MIN_PROBE_ENDSTOP
551 552
 
552
-#endif // ENABLE_AUTO_BED_LEVELING
553
+#endif // AUTO_BED_LEVELING_FEATURE
553 554
 
554 555
 
555 556
 // @section homing
@@ -600,7 +601,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
600 601
 // Custom M code points
601 602
 #define CUSTOM_M_CODES
602 603
 #if ENABLED(CUSTOM_M_CODES)
603
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
604
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
604 605
     #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
605 606
     #define Z_PROBE_OFFSET_RANGE_MIN -20
606 607
     #define Z_PROBE_OFFSET_RANGE_MAX 20

+ 7
- 5
Marlin/example_configurations/adafruit/ST7565/Configuration.h View File

@@ -442,10 +442,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
442 442
 
443 443
 // @section bedlevel
444 444
 
445
-//#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line).
446
-#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z probe repeatability test will be included if auto bed leveling is enabled.
447 445
 
448
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
446
+//#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
447
+//#define DEBUG_LEVELING_FEATURE
448
+#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
449
+
450
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
449 451
 
450 452
   // There are 2 different ways to specify probing locations:
451 453
   //
@@ -557,7 +559,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
557 559
   //
558 560
   //#define Z_MIN_PROBE_ENDSTOP
559 561
 
560
-#endif // ENABLE_AUTO_BED_LEVELING
562
+#endif // AUTO_BED_LEVELING_FEATURE
561 563
 
562 564
 
563 565
 // @section homing
@@ -608,7 +610,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
608 610
 // Custom M code points
609 611
 #define CUSTOM_M_CODES
610 612
 #if ENABLED(CUSTOM_M_CODES)
611
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
613
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
612 614
     #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
613 615
     #define Z_PROBE_OFFSET_RANGE_MIN -20
614 616
     #define Z_PROBE_OFFSET_RANGE_MAX 20

+ 6
- 5
Marlin/example_configurations/delta/biv2.5/Configuration.h View File

@@ -477,10 +477,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
477 477
 
478 478
 // @section bedlevel
479 479
 
480
-//#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line).
481
-//#define Z_MIN_PROBE_REPEATABILITY_TEST // Z probe repeatability test is not supported in Deltas yet.
480
+//#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
481
+//#define DEBUG_LEVELING_FEATURE
482
+#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
482 483
 
483
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
484
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
484 485
 
485 486
   // There are 2 different ways to specify probing locations:
486 487
   //
@@ -677,7 +678,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
677 678
   //
678 679
   //#define Z_MIN_PROBE_ENDSTOP
679 680
 
680
-#endif // ENABLE_AUTO_BED_LEVELING
681
+#endif // AUTO_BED_LEVELING_FEATURE
681 682
 
682 683
 
683 684
 // @section homing
@@ -728,7 +729,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
728 729
 // Custom M code points
729 730
 #define CUSTOM_M_CODES
730 731
 #if ENABLED(CUSTOM_M_CODES)
731
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
732
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
732 733
     #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
733 734
     #define Z_PROBE_OFFSET_RANGE_MIN -20
734 735
     #define Z_PROBE_OFFSET_RANGE_MAX 20

+ 7
- 5
Marlin/example_configurations/delta/generic/Configuration.h View File

@@ -477,10 +477,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
477 477
 
478 478
 // @section bedlevel
479 479
 
480
-//#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line).
481
-//#define Z_MIN_PROBE_REPEATABILITY_TEST // Z probe repeatability test is not supported in Deltas yet.
482 480
 
483
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
481
+//#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
482
+//#define DEBUG_LEVELING_FEATURE
483
+//#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
484
+
485
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
484 486
 
485 487
   // There are 2 different ways to specify probing locations.
486 488
   //
@@ -677,7 +679,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
677 679
   //
678 680
   //#define Z_MIN_PROBE_ENDSTOP
679 681
 
680
-#endif // ENABLE_AUTO_BED_LEVELING
682
+#endif // AUTO_BED_LEVELING_FEATURE
681 683
 
682 684
 
683 685
 // @section homing
@@ -728,7 +730,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
728 730
 // Custom M code points
729 731
 #define CUSTOM_M_CODES
730 732
 #if ENABLED(CUSTOM_M_CODES)
731
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
733
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
732 734
     #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
733 735
     #define Z_PROBE_OFFSET_RANGE_MIN -20
734 736
     #define Z_PROBE_OFFSET_RANGE_MAX 20

+ 7
- 5
Marlin/example_configurations/delta/kossel_mini/Configuration.h View File

@@ -477,10 +477,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
477 477
 
478 478
 // @section bedlevel
479 479
 
480
-#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line).
481
-//#define Z_MIN_PROBE_REPEATABILITY_TEST // Z probe repeatability test is not supported in Deltas yet.
482 480
 
483
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
481
+//#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
482
+//#define DEBUG_LEVELING_FEATURE
483
+#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
484
+
485
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
484 486
 
485 487
   // There are 2 different ways to specify probing locations:
486 488
   //
@@ -681,7 +683,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
681 683
   //
682 684
   //#define Z_MIN_PROBE_ENDSTOP
683 685
 
684
-#endif // ENABLE_AUTO_BED_LEVELING
686
+#endif // AUTO_BED_LEVELING_FEATURE
685 687
 
686 688
 
687 689
 // @section homing
@@ -732,7 +734,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
732 734
 // Custom M code points
733 735
 #define CUSTOM_M_CODES
734 736
 #if ENABLED(CUSTOM_M_CODES)
735
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
737
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
736 738
     #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
737 739
     #define Z_PROBE_OFFSET_RANGE_MIN -20
738 740
     #define Z_PROBE_OFFSET_RANGE_MAX 20

+ 7
- 5
Marlin/example_configurations/delta/kossel_pro/Configuration.h View File

@@ -464,10 +464,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
464 464
 
465 465
 // @section bedlevel
466 466
 
467
-#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line).
468
-//#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z probe repeatability test will be included if auto bed leveling is enabled.
469 467
 
470
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
468
+//#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
469
+//#define DEBUG_LEVELING_FEATURE
470
+#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
471
+
472
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
471 473
 
472 474
   // There are 2 different ways to specify probing locations:
473 475
   //
@@ -666,7 +668,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
666 668
   //
667 669
   //#define Z_MIN_PROBE_ENDSTOP
668 670
 
669
-#endif // ENABLE_AUTO_BED_LEVELING
671
+#endif // AUTO_BED_LEVELING_FEATURE
670 672
 
671 673
 
672 674
 // @section homing
@@ -727,7 +729,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
727 729
 // Custom M code points
728 730
 #define CUSTOM_M_CODES
729 731
 #if ENABLED(CUSTOM_M_CODES)
730
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
732
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
731 733
     #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
732 734
     #define Z_PROBE_OFFSET_RANGE_MIN -15
733 735
     #define Z_PROBE_OFFSET_RANGE_MAX -5

+ 6
- 5
Marlin/example_configurations/makibox/Configuration.h View File

@@ -445,10 +445,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
445 445
 
446 446
 // @section bedlevel
447 447
 
448
-//#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line).
449
-#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z probe repeatability test will be included if auto bed leveling is enabled.
448
+//#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
449
+//#define DEBUG_LEVELING_FEATURE
450
+#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
450 451
 
451
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
452
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
452 453
 
453 454
   // There are 2 different ways to specify probing locations:
454 455
   //
@@ -560,7 +561,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
560 561
   //
561 562
   //#define Z_MIN_PROBE_ENDSTOP
562 563
 
563
-#endif // ENABLE_AUTO_BED_LEVELING
564
+#endif // AUTO_BED_LEVELING_FEATURE
564 565
 
565 566
 
566 567
 // @section homing
@@ -611,7 +612,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
611 612
 // Custom M code points
612 613
 #define CUSTOM_M_CODES
613 614
 #if ENABLED(CUSTOM_M_CODES)
614
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
615
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
615 616
     #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
616 617
     #define Z_PROBE_OFFSET_RANGE_MIN -20
617 618
     #define Z_PROBE_OFFSET_RANGE_MAX 20

+ 7
- 5
Marlin/example_configurations/tvrrug/Round2/Configuration.h View File

@@ -432,10 +432,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
432 432
 
433 433
 // @section bedlevel
434 434
 
435
-//#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line).
436
-#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z probe repeatability test will be included if auto bed leveling is enabled.
437 435
 
438
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
436
+//#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
437
+//#define DEBUG_LEVELING_FEATURE
438
+#define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
439
+
440
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
439 441
 
440 442
   // There are 2 different ways to specify probing locations:
441 443
   //
@@ -547,7 +549,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
547 549
   //
548 550
   //#define Z_MIN_PROBE_ENDSTOP
549 551
 
550
-#endif // ENABLE_AUTO_BED_LEVELING
552
+#endif // AUTO_BED_LEVELING_FEATURE
551 553
 
552 554
 
553 555
 // @section homing
@@ -602,7 +604,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
602 604
 // Custom M code points
603 605
 #define CUSTOM_M_CODES
604 606
 #if ENABLED(CUSTOM_M_CODES)
605
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
607
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
606 608
     #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
607 609
     #define Z_PROBE_OFFSET_RANGE_MIN -20
608 610
     #define Z_PROBE_OFFSET_RANGE_MAX 20

+ 10
- 10
Marlin/planner.cpp View File

@@ -77,14 +77,14 @@ float max_e_jerk;
77 77
 float mintravelfeedrate;
78 78
 unsigned long axis_steps_per_sqr_second[NUM_AXIS];
79 79
 
80
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
80
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
81 81
   // Transform required to compensate for bed level
82 82
   matrix_3x3 plan_bed_level_matrix = {
83 83
     1.0, 0.0, 0.0,
84 84
     0.0, 1.0, 0.0,
85 85
     0.0, 0.0, 1.0
86 86
   };
87
-#endif // ENABLE_AUTO_BED_LEVELING
87
+#endif // AUTO_BED_LEVELING_FEATURE
88 88
 
89 89
 #if ENABLED(AUTOTEMP)
90 90
   float autotemp_max = 250;
@@ -474,11 +474,11 @@ float junction_deviation = 0.1;
474 474
 // Add a new linear movement to the buffer. steps[X_AXIS], _y and _z is the absolute position in
475 475
 // mm. Microseconds specify how many microseconds the move should take to perform. To aid acceleration
476 476
 // calculation the caller must also provide the physical length of the line in millimeters.
477
-#if ENABLED(ENABLE_AUTO_BED_LEVELING) || ENABLED(MESH_BED_LEVELING)
477
+#if ENABLED(AUTO_BED_LEVELING_FEATURE) || ENABLED(MESH_BED_LEVELING)
478 478
   void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate, const uint8_t extruder)
479 479
 #else
480 480
   void plan_buffer_line(const float &x, const float &y, const float &z, const float &e, float feed_rate, const uint8_t extruder)
481
-#endif  // ENABLE_AUTO_BED_LEVELING
481
+#endif  // AUTO_BED_LEVELING_FEATURE
482 482
 {
483 483
   // Calculate the buffer head after we push this byte
484 484
   int next_buffer_head = next_block_index(block_buffer_head);
@@ -489,7 +489,7 @@ float junction_deviation = 0.1;
489 489
 
490 490
   #if ENABLED(MESH_BED_LEVELING)
491 491
     if (mbl.active) z += mbl.get_z(x, y);
492
-  #elif ENABLED(ENABLE_AUTO_BED_LEVELING)
492
+  #elif ENABLED(AUTO_BED_LEVELING_FEATURE)
493 493
     apply_rotation_xyz(plan_bed_level_matrix, x, y, z);
494 494
   #endif
495 495
 
@@ -993,7 +993,7 @@ float junction_deviation = 0.1;
993 993
 
994 994
 } // plan_buffer_line()
995 995
 
996
-#if ENABLED(ENABLE_AUTO_BED_LEVELING) && DISABLED(DELTA)
996
+#if ENABLED(AUTO_BED_LEVELING_FEATURE) && DISABLED(DELTA)
997 997
   vector_3 plan_get_position() {
998 998
     vector_3 position = vector_3(st_get_position_mm(X_AXIS), st_get_position_mm(Y_AXIS), st_get_position_mm(Z_AXIS));
999 999
 
@@ -1006,17 +1006,17 @@ float junction_deviation = 0.1;
1006 1006
 
1007 1007
     return position;
1008 1008
   }
1009
-#endif // ENABLE_AUTO_BED_LEVELING && !DELTA
1009
+#endif // AUTO_BED_LEVELING_FEATURE && !DELTA
1010 1010
 
1011
-#if ENABLED(ENABLE_AUTO_BED_LEVELING) || ENABLED(MESH_BED_LEVELING)
1011
+#if ENABLED(AUTO_BED_LEVELING_FEATURE) || ENABLED(MESH_BED_LEVELING)
1012 1012
   void plan_set_position(float x, float y, float z, const float &e)
1013 1013
 #else
1014 1014
   void plan_set_position(const float &x, const float &y, const float &z, const float &e)
1015
-#endif // ENABLE_AUTO_BED_LEVELING || MESH_BED_LEVELING
1015
+#endif // AUTO_BED_LEVELING_FEATURE || MESH_BED_LEVELING
1016 1016
   {
1017 1017
     #if ENABLED(MESH_BED_LEVELING)
1018 1018
       if (mbl.active) z += mbl.get_z(x, y);
1019
-    #elif ENABLED(ENABLE_AUTO_BED_LEVELING)
1019
+    #elif ENABLED(AUTO_BED_LEVELING_FEATURE)
1020 1020
       apply_rotation_xyz(plan_bed_level_matrix, x, y, z);
1021 1021
     #endif
1022 1022
 

+ 4
- 4
Marlin/planner.h View File

@@ -79,9 +79,9 @@ extern volatile unsigned char block_buffer_head;
79 79
 extern volatile unsigned char block_buffer_tail;
80 80
 FORCE_INLINE uint8_t movesplanned() { return BLOCK_MOD(block_buffer_head - block_buffer_tail + BLOCK_BUFFER_SIZE); }
81 81
 
82
-#if ENABLED(ENABLE_AUTO_BED_LEVELING) || ENABLED(MESH_BED_LEVELING)
82
+#if ENABLED(AUTO_BED_LEVELING_FEATURE) || ENABLED(MESH_BED_LEVELING)
83 83
 
84
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
84
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
85 85
     #include "vector_3.h"
86 86
 
87 87
     // Transform required to compensate for bed level
@@ -91,7 +91,7 @@ FORCE_INLINE uint8_t movesplanned() { return BLOCK_MOD(block_buffer_head - block
91 91
      * Get the position applying the bed level matrix
92 92
      */
93 93
     vector_3 plan_get_position();
94
-  #endif  // ENABLE_AUTO_BED_LEVELING
94
+  #endif  // AUTO_BED_LEVELING_FEATURE
95 95
 
96 96
   /**
97 97
    * Add a new linear movement to the buffer. x, y, z are the signed, absolute target position in
@@ -111,7 +111,7 @@ FORCE_INLINE uint8_t movesplanned() { return BLOCK_MOD(block_buffer_head - block
111 111
   void plan_buffer_line(const float &x, const float &y, const float &z, const float &e, float feed_rate, const uint8_t extruder);
112 112
   void plan_set_position(const float &x, const float &y, const float &z, const float &e);
113 113
 
114
-#endif // ENABLE_AUTO_BED_LEVELING || MESH_BED_LEVELING
114
+#endif // AUTO_BED_LEVELING_FEATURE || MESH_BED_LEVELING
115 115
 
116 116
 void plan_set_e_position(const float &e);
117 117
 

+ 2
- 2
Marlin/ultralcd.cpp View File

@@ -638,7 +638,7 @@ static void lcd_prepare_menu() {
638 638
   //
639 639
   // Level Bed
640 640
   //
641
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
641
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
642 642
     if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS])
643 643
       MENU_ITEM(gcode, MSG_LEVEL_BED, PSTR("G29"));
644 644
   #elif ENABLED(MANUAL_BED_LEVELING)
@@ -1041,7 +1041,7 @@ static void lcd_control_temperature_preheat_abs_settings_menu() {
1041 1041
 static void lcd_control_motion_menu() {
1042 1042
   START_MENU();
1043 1043
   MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
1044
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
1044
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
1045 1045
     MENU_ITEM_EDIT(float32, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
1046 1046
   #endif
1047 1047
   MENU_ITEM_EDIT(float5, MSG_ACC, &acceleration, 10, 99000);

+ 2
- 2
Marlin/vector_3.cpp View File

@@ -19,7 +19,7 @@
19 19
 #include <math.h>
20 20
 #include "Marlin.h"
21 21
 
22
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
22
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
23 23
 #include "vector_3.h"
24 24
 
25 25
 vector_3::vector_3() : x(0), y(0), z(0) { }
@@ -134,5 +134,5 @@ void matrix_3x3::debug(const char title[]) {
134 134
   }
135 135
 }
136 136
 
137
-#endif // ENABLE_AUTO_BED_LEVELING
137
+#endif // AUTO_BED_LEVELING_FEATURE
138 138
 

+ 2
- 2
Marlin/vector_3.h View File

@@ -19,7 +19,7 @@
19 19
 #ifndef VECTOR_3_H
20 20
 #define VECTOR_3_H
21 21
 
22
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
22
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
23 23
 class matrix_3x3;
24 24
 
25 25
 struct vector_3
@@ -57,6 +57,6 @@ struct matrix_3x3
57 57
 
58 58
 
59 59
 void apply_rotation_xyz(matrix_3x3 rotationMatrix, float &x, float& y, float& z);
60
-#endif // ENABLE_AUTO_BED_LEVELING
60
+#endif // AUTO_BED_LEVELING_FEATURE
61 61
 
62 62
 #endif // VECTOR_3_H

Loading…
Cancel
Save