Sfoglia il codice sorgente

Moved checks into SanityCheck.h + removed previous added checks.

Edward Patel 10 anni fa
parent
commit
a9ed39b12d

+ 0
- 9
Marlin/Configuration.h Vedi File

@@ -431,11 +431,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
431 431
 #endif  // MANUAL_BED_LEVELING
432 432
 
433 433
 #ifdef MESH_BED_LEVELING
434
-
435
-  #ifdef DELTA
436
-    #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers
437
-  #endif
438
-
439 434
   #define MESH_MIN_X 10
440 435
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
441 436
   #define MESH_MIN_Y 10
@@ -456,10 +451,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
456 451
 
457 452
 #ifdef ENABLE_AUTO_BED_LEVELING
458 453
 
459
-  #ifdef MESH_BED_LEVELING
460
-    #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both
461
-  #endif // MESH_BED_LEVELING
462
-
463 454
   // There are 2 different ways to specify probing locations
464 455
   //
465 456
   // - "grid" mode

+ 12
- 0
Marlin/SanityCheck.h Vedi File

@@ -92,6 +92,18 @@
92 92
   #endif
93 93
 
94 94
   /**
95
+   * Mesh Bed Leveling
96
+   */
97
+  #ifdef MESH_BED_LEVELING
98
+    #ifdef DELTA
99
+      #error MESH_BED_LEVELING does not yet support DELTA printers
100
+    #endif
101
+    #ifdef ENABLE_AUTO_BED_LEVELING
102
+      #error Select ENABLE_AUTO_BED_LEVELING or MESH_BED_LEVELING, not both
103
+    #endif
104
+  #endif
105
+
106
+  /**
95 107
    * Auto Bed Leveling
96 108
    */
97 109
   #ifdef ENABLE_AUTO_BED_LEVELING

+ 0
- 9
Marlin/configurator/config/Configuration.h Vedi File

@@ -431,11 +431,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
431 431
 #endif  // MANUAL_BED_LEVELING
432 432
 
433 433
 #ifdef MESH_BED_LEVELING
434
-
435
-  #ifdef DELTA
436
-    #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers
437
-  #endif
438
-
439 434
   #define MESH_MIN_X 10
440 435
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
441 436
   #define MESH_MIN_Y 10
@@ -456,10 +451,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
456 451
 
457 452
 #ifdef ENABLE_AUTO_BED_LEVELING
458 453
 
459
-  #ifdef MESH_BED_LEVELING
460
-    #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both
461
-  #endif // MESH_BED_LEVELING
462
-
463 454
   // There are 2 different ways to specify probing locations
464 455
   //
465 456
   // - "grid" mode

+ 0
- 9
Marlin/example_configurations/Felix/Configuration.h Vedi File

@@ -369,11 +369,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
369 369
 #endif  // MANUAL_BED_LEVELING
370 370
 
371 371
 #ifdef MESH_BED_LEVELING
372
-
373
-  #ifdef DELTA
374
-    #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers
375
-  #endif
376
-
377 372
   #define MESH_MIN_X 10
378 373
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
379 374
   #define MESH_MIN_Y 10
@@ -392,10 +387,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
392 387
 
393 388
 #ifdef ENABLE_AUTO_BED_LEVELING
394 389
 
395
-  #ifdef MESH_BED_LEVELING
396
-    #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both
397
-  #endif // MESH_BED_LEVELING
398
-
399 390
   // There are 2 different ways to specify probing locations
400 391
   //
401 392
   // - "grid" mode

+ 0
- 9
Marlin/example_configurations/Hephestos/Configuration.h Vedi File

@@ -392,11 +392,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
392 392
 #endif  // MANUAL_BED_LEVELING
393 393
 
394 394
 #ifdef MESH_BED_LEVELING
395
-
396
-  #ifdef DELTA
397
-    #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers
398
-  #endif
399
-
400 395
   #define MESH_MIN_X 10
401 396
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
402 397
   #define MESH_MIN_Y 10
@@ -415,10 +410,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
415 410
 
416 411
 #ifdef ENABLE_AUTO_BED_LEVELING
417 412
 
418
-  #ifdef MESH_BED_LEVELING
419
-    #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both
420
-  #endif // MESH_BED_LEVELING
421
-
422 413
   // There are 2 different ways to specify probing locations
423 414
   //
424 415
   // - "grid" mode

+ 0
- 9
Marlin/example_configurations/K8200/Configuration.h Vedi File

@@ -397,11 +397,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
397 397
 #endif  // MANUAL_BED_LEVELING
398 398
 
399 399
 #ifdef MESH_BED_LEVELING
400
-
401
-  #ifdef DELTA
402
-    #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers
403
-  #endif
404
-
405 400
   #define MESH_MIN_X 10
406 401
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
407 402
   #define MESH_MIN_Y 10
@@ -420,10 +415,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
420 415
 
421 416
 #ifdef ENABLE_AUTO_BED_LEVELING
422 417
 
423
-  #ifdef MESH_BED_LEVELING
424
-    #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both
425
-  #endif // MESH_BED_LEVELING
426
-
427 418
   // There are 2 different ways to specify probing locations
428 419
   //
429 420
   // - "grid" mode

+ 0
- 9
Marlin/example_configurations/SCARA/Configuration.h Vedi File

@@ -421,11 +421,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
421 421
 #endif  // MANUAL_BED_LEVELING
422 422
 
423 423
 #ifdef MESH_BED_LEVELING
424
-
425
-  #ifdef DELTA
426
-    #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers
427
-  #endif
428
-
429 424
   #define MESH_MIN_X 10
430 425
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
431 426
   #define MESH_MIN_Y 10
@@ -444,10 +439,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
444 439
 
445 440
 #ifdef ENABLE_AUTO_BED_LEVELING
446 441
 
447
-  #ifdef MESH_BED_LEVELING
448
-    #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both
449
-  #endif // MESH_BED_LEVELING
450
-
451 442
   // There are 2 different ways to specify probing locations
452 443
   //
453 444
   // - "grid" mode

+ 0
- 9
Marlin/example_configurations/WITBOX/Configuration.h Vedi File

@@ -391,11 +391,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
391 391
 #endif  // MANUAL_BED_LEVELING
392 392
 
393 393
 #ifdef MESH_BED_LEVELING
394
-
395
-  #ifdef DELTA
396
-    #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers
397
-  #endif
398
-
399 394
   #define MESH_MIN_X 10
400 395
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
401 396
   #define MESH_MIN_Y 10
@@ -414,10 +409,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
414 409
 
415 410
 #ifdef ENABLE_AUTO_BED_LEVELING
416 411
 
417
-  #ifdef MESH_BED_LEVELING
418
-    #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both
419
-  #endif // MESH_BED_LEVELING
420
-
421 412
   // There are 2 different ways to specify probing locations
422 413
   //
423 414
   // - "grid" mode

+ 0
- 9
Marlin/example_configurations/delta/generic/Configuration.h Vedi File

@@ -419,11 +419,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
419 419
 #endif  // MANUAL_BED_LEVELING
420 420
 
421 421
 #ifdef MESH_BED_LEVELING
422
-
423
-  #ifdef DELTA
424
-    #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers
425
-  #endif
426
-
427 422
   #define MESH_MIN_X 10
428 423
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
429 424
   #define MESH_MIN_Y 10
@@ -442,10 +437,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
442 437
 
443 438
 #ifdef ENABLE_AUTO_BED_LEVELING
444 439
 
445
-  #ifdef MESH_BED_LEVELING
446
-    #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both
447
-  #endif // MESH_BED_LEVELING
448
-
449 440
   // There are 2 different ways to specify probing locations
450 441
   //
451 442
   // - "grid" mode

+ 0
- 9
Marlin/example_configurations/delta/kossel_mini/Configuration.h Vedi File

@@ -419,11 +419,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
419 419
 #endif  // MANUAL_BED_LEVELING
420 420
 
421 421
 #ifdef MESH_BED_LEVELING
422
-
423
-  #ifdef DELTA
424
-    #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers
425
-  #endif
426
-
427 422
   #define MESH_MIN_X 10
428 423
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
429 424
   #define MESH_MIN_Y 10
@@ -442,10 +437,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
442 437
 
443 438
 #ifdef ENABLE_AUTO_BED_LEVELING
444 439
 
445
-  #ifdef MESH_BED_LEVELING
446
-    #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both
447
-  #endif // MESH_BED_LEVELING
448
-
449 440
   // There are 2 different ways to specify probing locations
450 441
   //
451 442
   // - "grid" mode

+ 0
- 9
Marlin/example_configurations/makibox/Configuration.h Vedi File

@@ -389,11 +389,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
389 389
 #endif  // MANUAL_BED_LEVELING
390 390
 
391 391
 #ifdef MESH_BED_LEVELING
392
-
393
-  #ifdef DELTA
394
-    #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers
395
-  #endif
396
-
397 392
   #define MESH_MIN_X 10
398 393
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
399 394
   #define MESH_MIN_Y 10
@@ -412,10 +407,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
412 407
 
413 408
 #ifdef ENABLE_AUTO_BED_LEVELING
414 409
 
415
-  #ifdef MESH_BED_LEVELING
416
-    #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both
417
-  #endif // MESH_BED_LEVELING
418
-
419 410
   // There are 2 different ways to specify probing locations
420 411
   //
421 412
   // - "grid" mode

+ 0
- 9
Marlin/example_configurations/tvrrug/Round2/Configuration.h Vedi File

@@ -391,11 +391,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
391 391
 #endif  // MANUAL_BED_LEVELING
392 392
 
393 393
 #ifdef MESH_BED_LEVELING
394
-
395
-  #ifdef DELTA
396
-    #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers
397
-  #endif
398
-
399 394
   #define MESH_MIN_X 10
400 395
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
401 396
   #define MESH_MIN_Y 10
@@ -414,10 +409,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
414 409
 
415 410
 #ifdef ENABLE_AUTO_BED_LEVELING
416 411
 
417
-  #ifdef MESH_BED_LEVELING
418
-    #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both
419
-  #endif // MESH_BED_LEVELING
420
-
421 412
   // There are 2 different ways to specify probing locations
422 413
   //
423 414
   // - "grid" mode

Loading…
Annulla
Salva