Pārlūkot izejas kodu

Merge pull request #3013 from thinkyhead/esenapaj-patch-1

Enhanced #3010 - formal Mesh/Manual dependency
Scott Lahteine 9 gadus atpakaļ
vecāks
revīzija
e7cf85b922

+ 8
- 6
Marlin/Configuration.h Parādīt failu

@@ -413,16 +413,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
413 413
 #endif
414 414
 
415 415
 //===========================================================================
416
-//=========================== Manual Bed Leveling ===========================
416
+//============================ Mesh Bed Leveling ============================
417 417
 //===========================================================================
418 418
 
419
-//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
420 419
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
421 420
 
422
-#if ENABLED(MANUAL_BED_LEVELING)
423
-  #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
424
-#endif  // MANUAL_BED_LEVELING
425
-
426 421
 #if ENABLED(MESH_BED_LEVELING)
427 422
   #define MESH_MIN_X 10
428 423
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
@@ -431,6 +426,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
431 426
   #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
432 427
   #define MESH_NUM_Y_POINTS 3
433 428
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
429
+
430
+  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
431
+
432
+  #if ENABLED(MANUAL_BED_LEVELING)
433
+    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
434
+  #endif  // MANUAL_BED_LEVELING
435
+
434 436
 #endif  // MESH_BED_LEVELING
435 437
 
436 438
 //===========================================================================

+ 3
- 0
Marlin/SanityCheck.h Parādīt failu

@@ -112,6 +112,7 @@
112 112
 /**
113 113
  * Mesh Bed Leveling
114 114
  */
115
+
115 116
 #if ENABLED(MESH_BED_LEVELING)
116 117
   #if ENABLED(DELTA)
117 118
     #error MESH_BED_LEVELING does not yet support DELTA printers.
@@ -122,6 +123,8 @@
122 123
   #if MESH_NUM_X_POINTS > 7 || MESH_NUM_Y_POINTS > 7
123 124
     #error MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS need to be less than 8.
124 125
   #endif
126
+#elif ENABLED(MANUAL_BED_LEVELING)
127
+  #error MESH_BED_LEVELING is required for MANUAL_BED_LEVELING.
125 128
 #endif
126 129
 
127 130
 /**

+ 8
- 6
Marlin/example_configurations/Felix/Configuration.h Parādīt failu

@@ -395,16 +395,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
395 395
 #endif
396 396
 
397 397
 //===========================================================================
398
-//=========================== Manual Bed Leveling ===========================
398
+//============================ Mesh Bed Leveling ============================
399 399
 //===========================================================================
400 400
 
401
-//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
402 401
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
403 402
 
404
-#if ENABLED(MANUAL_BED_LEVELING)
405
-  #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
406
-#endif  // MANUAL_BED_LEVELING
407
-
408 403
 #if ENABLED(MESH_BED_LEVELING)
409 404
   #define MESH_MIN_X 10
410 405
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
@@ -413,6 +408,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
413 408
   #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
414 409
   #define MESH_NUM_Y_POINTS 3
415 410
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
411
+
412
+  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
413
+
414
+  #if ENABLED(MANUAL_BED_LEVELING)
415
+    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
416
+  #endif  // MANUAL_BED_LEVELING
417
+
416 418
 #endif  // MESH_BED_LEVELING
417 419
 
418 420
 //===========================================================================

+ 8
- 6
Marlin/example_configurations/Felix/Configuration_DUAL.h Parādīt failu

@@ -365,16 +365,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
365 365
 #endif
366 366
 
367 367
 //===========================================================================
368
-//=========================== Manual Bed Leveling ===========================
368
+//============================ Mesh Bed Leveling ============================
369 369
 //===========================================================================
370 370
 
371
-//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
372 371
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
373 372
 
374
-#if ENABLED(MANUAL_BED_LEVELING)
375
-  #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
376
-#endif  // MANUAL_BED_LEVELING
377
-
378 373
 #if ENABLED(MESH_BED_LEVELING)
379 374
   #define MESH_MIN_X 10
380 375
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
@@ -383,6 +378,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
383 378
   #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
384 379
   #define MESH_NUM_Y_POINTS 3
385 380
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
381
+
382
+  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
383
+
384
+  #if ENABLED(MANUAL_BED_LEVELING)
385
+    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
386
+  #endif  // MANUAL_BED_LEVELING
387
+
386 388
 #endif  // MESH_BED_LEVELING
387 389
 
388 390
 //===========================================================================

+ 8
- 6
Marlin/example_configurations/Hephestos/Configuration.h Parādīt failu

@@ -405,16 +405,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
405 405
 #endif
406 406
 
407 407
 //===========================================================================
408
-//=========================== Manual Bed Leveling ===========================
408
+//============================ Mesh Bed Leveling ============================
409 409
 //===========================================================================
410 410
 
411
-//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
412 411
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
413 412
 
414
-#if ENABLED(MANUAL_BED_LEVELING)
415
-  #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
416
-#endif  // MANUAL_BED_LEVELING
417
-
418 413
 #if ENABLED(MESH_BED_LEVELING)
419 414
   #define MESH_MIN_X 10
420 415
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
@@ -423,6 +418,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
423 418
   #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
424 419
   #define MESH_NUM_Y_POINTS 3
425 420
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
421
+
422
+  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
423
+
424
+  #if ENABLED(MANUAL_BED_LEVELING)
425
+    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
426
+  #endif  // MANUAL_BED_LEVELING
427
+
426 428
 #endif  // MESH_BED_LEVELING
427 429
 
428 430
 //===========================================================================

+ 8
- 6
Marlin/example_configurations/K8200/Configuration.h Parādīt failu

@@ -428,16 +428,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
428 428
 #endif
429 429
 
430 430
 //===========================================================================
431
-//=========================== Manual Bed Leveling ===========================
431
+//============================ Mesh Bed Leveling ============================
432 432
 //===========================================================================
433 433
 
434
-//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
435 434
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
436 435
 
437
-#if ENABLED(MANUAL_BED_LEVELING)
438
-  #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
439
-#endif  // MANUAL_BED_LEVELING
440
-
441 436
 #if ENABLED(MESH_BED_LEVELING)
442 437
   #define MESH_MIN_X 10
443 438
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
@@ -446,6 +441,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
446 441
   #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
447 442
   #define MESH_NUM_Y_POINTS 3
448 443
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
444
+
445
+  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
446
+
447
+  #if ENABLED(MANUAL_BED_LEVELING)
448
+    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
449
+  #endif  // MANUAL_BED_LEVELING
450
+
449 451
 #endif  // MESH_BED_LEVELING
450 452
 
451 453
 //===========================================================================

+ 8
- 6
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h Parādīt failu

@@ -413,16 +413,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
413 413
 #endif
414 414
 
415 415
 //===========================================================================
416
-//=========================== Manual Bed Leveling ===========================
416
+//============================ Mesh Bed Leveling ============================
417 417
 //===========================================================================
418 418
 
419
-//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
420 419
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
421 420
 
422
-#if ENABLED(MANUAL_BED_LEVELING)
423
-  #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
424
-#endif  // MANUAL_BED_LEVELING
425
-
426 421
 #if ENABLED(MESH_BED_LEVELING)
427 422
   #define MESH_MIN_X 10
428 423
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
@@ -431,6 +426,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
431 426
   #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
432 427
   #define MESH_NUM_Y_POINTS 3
433 428
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
429
+
430
+  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
431
+
432
+  #if ENABLED(MANUAL_BED_LEVELING)
433
+    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
434
+  #endif  // MANUAL_BED_LEVELING
435
+
434 436
 #endif  // MESH_BED_LEVELING
435 437
 
436 438
 //===========================================================================

+ 8
- 6
Marlin/example_configurations/RigidBot/Configuration.h Parādīt failu

@@ -404,16 +404,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
404 404
 #endif
405 405
 
406 406
 //===========================================================================
407
-//=========================== Manual Bed Leveling ===========================
407
+//============================ Mesh Bed Leveling ============================
408 408
 //===========================================================================
409 409
 
410
-//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
411 410
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
412 411
 
413
-#if ENABLED(MANUAL_BED_LEVELING)
414
-  #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
415
-#endif  // MANUAL_BED_LEVELING
416
-
417 412
 #if ENABLED(MESH_BED_LEVELING)
418 413
   #define MESH_MIN_X 10
419 414
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
@@ -422,6 +417,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
422 417
   #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
423 418
   #define MESH_NUM_Y_POINTS 3
424 419
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
420
+
421
+  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
422
+
423
+  #if ENABLED(MANUAL_BED_LEVELING)
424
+    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
425
+  #endif  // MANUAL_BED_LEVELING
426
+
425 427
 #endif  // MESH_BED_LEVELING
426 428
 
427 429
 //===========================================================================

+ 8
- 6
Marlin/example_configurations/SCARA/Configuration.h Parādīt failu

@@ -421,16 +421,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
421 421
 #endif
422 422
 
423 423
 //===========================================================================
424
-//=========================== Manual Bed Leveling ===========================
424
+//============================ Mesh Bed Leveling ============================
425 425
 //===========================================================================
426 426
 
427
-//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
428 427
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
429 428
 
430
-#if ENABLED(MANUAL_BED_LEVELING)
431
-  #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
432
-#endif  // MANUAL_BED_LEVELING
433
-
434 429
 #if ENABLED(MESH_BED_LEVELING)
435 430
   #define MESH_MIN_X 10
436 431
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
@@ -439,6 +434,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
439 434
   #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
440 435
   #define MESH_NUM_Y_POINTS 3
441 436
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
437
+
438
+  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
439
+
440
+  #if ENABLED(MANUAL_BED_LEVELING)
441
+    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
442
+  #endif  // MANUAL_BED_LEVELING
443
+
442 444
 #endif  // MESH_BED_LEVELING
443 445
 
444 446
 //===========================================================================

+ 8
- 6
Marlin/example_configurations/TAZ4/Configuration.h Parādīt failu

@@ -433,16 +433,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
433 433
 #endif
434 434
 
435 435
 //===========================================================================
436
-//=========================== Manual Bed Leveling ===========================
436
+//============================ Mesh Bed Leveling ============================
437 437
 //===========================================================================
438 438
 
439
-//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
440 439
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
441 440
 
442
-#if ENABLED(MANUAL_BED_LEVELING)
443
-  #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
444
-#endif  // MANUAL_BED_LEVELING
445
-
446 441
 #if ENABLED(MESH_BED_LEVELING)
447 442
   #define MESH_MIN_X 10
448 443
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
@@ -451,6 +446,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
451 446
   #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
452 447
   #define MESH_NUM_Y_POINTS 3
453 448
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
449
+
450
+  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
451
+
452
+  #if ENABLED(MANUAL_BED_LEVELING)
453
+    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
454
+  #endif  // MANUAL_BED_LEVELING
455
+
454 456
 #endif  // MESH_BED_LEVELING
455 457
 
456 458
 //===========================================================================

+ 8
- 6
Marlin/example_configurations/WITBOX/Configuration.h Parādīt failu

@@ -405,16 +405,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
405 405
 #endif
406 406
 
407 407
 //===========================================================================
408
-//=========================== Manual Bed Leveling ===========================
408
+//============================ Mesh Bed Leveling ============================
409 409
 //===========================================================================
410 410
 
411
-//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
412 411
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
413 412
 
414
-#if ENABLED(MANUAL_BED_LEVELING)
415
-  #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
416
-#endif  // MANUAL_BED_LEVELING
417
-
418 413
 #if ENABLED(MESH_BED_LEVELING)
419 414
   #define MESH_MIN_X 10
420 415
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
@@ -423,6 +418,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
423 418
   #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
424 419
   #define MESH_NUM_Y_POINTS 3
425 420
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
421
+
422
+  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
423
+
424
+  #if ENABLED(MANUAL_BED_LEVELING)
425
+    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
426
+  #endif  // MANUAL_BED_LEVELING
427
+
426 428
 #endif  // MESH_BED_LEVELING
427 429
 
428 430
 //===========================================================================

+ 8
- 6
Marlin/example_configurations/adafruit/ST7565/Configuration.h Parādīt failu

@@ -413,16 +413,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
413 413
 #endif
414 414
 
415 415
 //===========================================================================
416
-//=========================== Manual Bed Leveling ===========================
416
+//============================ Mesh Bed Leveling ============================
417 417
 //===========================================================================
418 418
 
419
-//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
420 419
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
421 420
 
422
-#if ENABLED(MANUAL_BED_LEVELING)
423
-  #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
424
-#endif  // MANUAL_BED_LEVELING
425
-
426 421
 #if ENABLED(MESH_BED_LEVELING)
427 422
   #define MESH_MIN_X 10
428 423
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
@@ -431,6 +426,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
431 426
   #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
432 427
   #define MESH_NUM_Y_POINTS 3
433 428
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
429
+
430
+  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
431
+
432
+  #if ENABLED(MANUAL_BED_LEVELING)
433
+    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
434
+  #endif  // MANUAL_BED_LEVELING
435
+
434 436
 #endif  // MESH_BED_LEVELING
435 437
 
436 438
 //===========================================================================

+ 8
- 6
Marlin/example_configurations/delta/biv2.5/Configuration.h Parādīt failu

@@ -448,16 +448,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
448 448
 #endif
449 449
 
450 450
 //===========================================================================
451
-//=========================== Manual Bed Leveling ===========================
451
+//============================ Mesh Bed Leveling ============================
452 452
 //===========================================================================
453 453
 
454
-//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
455 454
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
456 455
 
457
-#if ENABLED(MANUAL_BED_LEVELING)
458
-  #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
459
-#endif  // MANUAL_BED_LEVELING
460
-
461 456
 #if ENABLED(MESH_BED_LEVELING)
462 457
   #define MESH_MIN_X 10
463 458
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
@@ -466,6 +461,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
466 461
   #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
467 462
   #define MESH_NUM_Y_POINTS 3
468 463
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
464
+
465
+  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
466
+
467
+  #if ENABLED(MANUAL_BED_LEVELING)
468
+    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
469
+  #endif  // MANUAL_BED_LEVELING
470
+
469 471
 #endif  // MESH_BED_LEVELING
470 472
 
471 473
 //===========================================================================

+ 8
- 6
Marlin/example_configurations/delta/generic/Configuration.h Parādīt failu

@@ -448,16 +448,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
448 448
 #endif
449 449
 
450 450
 //===========================================================================
451
-//=========================== Manual Bed Leveling ===========================
451
+//============================ Mesh Bed Leveling ============================
452 452
 //===========================================================================
453 453
 
454
-//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
455 454
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
456 455
 
457
-#if ENABLED(MANUAL_BED_LEVELING)
458
-  #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
459
-#endif  // MANUAL_BED_LEVELING
460
-
461 456
 #if ENABLED(MESH_BED_LEVELING)
462 457
   #define MESH_MIN_X 10
463 458
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
@@ -466,6 +461,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
466 461
   #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
467 462
   #define MESH_NUM_Y_POINTS 3
468 463
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
464
+
465
+  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
466
+
467
+  #if ENABLED(MANUAL_BED_LEVELING)
468
+    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
469
+  #endif  // MANUAL_BED_LEVELING
470
+
469 471
 #endif  // MESH_BED_LEVELING
470 472
 
471 473
 //===========================================================================

+ 8
- 6
Marlin/example_configurations/delta/kossel_mini/Configuration.h Parādīt failu

@@ -448,16 +448,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
448 448
 #endif
449 449
 
450 450
 //===========================================================================
451
-//=========================== Manual Bed Leveling ===========================
451
+//============================ Mesh Bed Leveling ============================
452 452
 //===========================================================================
453 453
 
454
-//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
455 454
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
456 455
 
457
-#if ENABLED(MANUAL_BED_LEVELING)
458
-  #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
459
-#endif  // MANUAL_BED_LEVELING
460
-
461 456
 #if ENABLED(MESH_BED_LEVELING)
462 457
   #define MESH_MIN_X 10
463 458
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
@@ -466,6 +461,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
466 461
   #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
467 462
   #define MESH_NUM_Y_POINTS 3
468 463
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
464
+
465
+  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
466
+
467
+  #if ENABLED(MANUAL_BED_LEVELING)
468
+    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
469
+  #endif  // MANUAL_BED_LEVELING
470
+
469 471
 #endif  // MESH_BED_LEVELING
470 472
 
471 473
 //===========================================================================

+ 8
- 6
Marlin/example_configurations/delta/kossel_pro/Configuration.h Parādīt failu

@@ -435,16 +435,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
435 435
 #endif
436 436
 
437 437
 //===========================================================================
438
-//=========================== Manual Bed Leveling ===========================
438
+//============================ Mesh Bed Leveling ============================
439 439
 //===========================================================================
440 440
 
441
-//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
442 441
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
443 442
 
444
-#if ENABLED(MANUAL_BED_LEVELING)
445
-  #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
446
-#endif  // MANUAL_BED_LEVELING
447
-
448 443
 #if ENABLED(MESH_BED_LEVELING)
449 444
   #define MESH_MIN_X 10
450 445
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
@@ -453,6 +448,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
453 448
   #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
454 449
   #define MESH_NUM_Y_POINTS 3
455 450
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
451
+
452
+  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
453
+
454
+  #if ENABLED(MANUAL_BED_LEVELING)
455
+    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
456
+  #endif  // MANUAL_BED_LEVELING
457
+
456 458
 #endif  // MESH_BED_LEVELING
457 459
 
458 460
 //===========================================================================

+ 8
- 6
Marlin/example_configurations/makibox/Configuration.h Parādīt failu

@@ -416,16 +416,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
416 416
 #endif
417 417
 
418 418
 //===========================================================================
419
-//=========================== Manual Bed Leveling ===========================
419
+//============================ Mesh Bed Leveling ============================
420 420
 //===========================================================================
421 421
 
422
-//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
423 422
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
424 423
 
425
-#if ENABLED(MANUAL_BED_LEVELING)
426
-  #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
427
-#endif  // MANUAL_BED_LEVELING
428
-
429 424
 #if ENABLED(MESH_BED_LEVELING)
430 425
   #define MESH_MIN_X 10
431 426
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
@@ -434,6 +429,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
434 429
   #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
435 430
   #define MESH_NUM_Y_POINTS 3
436 431
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
432
+
433
+  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
434
+
435
+  #if ENABLED(MANUAL_BED_LEVELING)
436
+    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
437
+  #endif  // MANUAL_BED_LEVELING
438
+
437 439
 #endif  // MESH_BED_LEVELING
438 440
 
439 441
 //===========================================================================

+ 8
- 6
Marlin/example_configurations/tvrrug/Round2/Configuration.h Parādīt failu

@@ -403,16 +403,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
403 403
 #endif
404 404
 
405 405
 //===========================================================================
406
-//=========================== Manual Bed Leveling ===========================
406
+//============================ Mesh Bed Leveling ============================
407 407
 //===========================================================================
408 408
 
409
-//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
410 409
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
411 410
 
412
-#if ENABLED(MANUAL_BED_LEVELING)
413
-  #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
414
-#endif  // MANUAL_BED_LEVELING
415
-
416 411
 #if ENABLED(MESH_BED_LEVELING)
417 412
   #define MESH_MIN_X 10
418 413
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
@@ -421,6 +416,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
421 416
   #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
422 417
   #define MESH_NUM_Y_POINTS 3
423 418
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
419
+
420
+  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
421
+
422
+  #if ENABLED(MANUAL_BED_LEVELING)
423
+    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
424
+  #endif  // MANUAL_BED_LEVELING
425
+
424 426
 #endif  // MESH_BED_LEVELING
425 427
 
426 428
 //===========================================================================

Notiek ielāde…
Atcelt
Saglabāt