thomas
/
marlin
Observar 1
Favorito 0
Fork 0
Código Issues 0 Pull requests 0 Versões 0 Wiki Atividade
Ver código fonte

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

Edward Patel 10 anos atrás
pai
002340f32c
commit
a9ed39b12d
12 arquivos alterados com 12 adições e 99 exclusões
Visão unificada Mostrar estatísticas do Diff
  1. 0
    9
      Marlin/Configuration.h
  2. 12
    0
      Marlin/SanityCheck.h
  3. 0
    9
      Marlin/configurator/config/Configuration.h
  4. 0
    9
      Marlin/example_configurations/Felix/Configuration.h
  5. 0
    9
      Marlin/example_configurations/Hephestos/Configuration.h
  6. 0
    9
      Marlin/example_configurations/K8200/Configuration.h
  7. 0
    9
      Marlin/example_configurations/SCARA/Configuration.h
  8. 0
    9
      Marlin/example_configurations/WITBOX/Configuration.h
  9. 0
    9
      Marlin/example_configurations/delta/generic/Configuration.h
  10. 0
    9
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  11. 0
    9
      Marlin/example_configurations/makibox/Configuration.h
  12. 0
    9
      Marlin/example_configurations/tvrrug/Round2/Configuration.h

+ 0
- 9
Marlin/Configuration.h Ver arquivo

431 
 #endif  // MANUAL_BED_LEVELING
 431 
 #endif  // MANUAL_BED_LEVELING
432
432
433 
 #ifdef MESH_BED_LEVELING
 433 
 #ifdef MESH_BED_LEVELING
434 
-
435 
-  #ifdef DELTA
436 
-    #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers
437 
-  #endif
438 
-
439 
   #define MESH_MIN_X 10
 434 
   #define MESH_MIN_X 10
440 
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
 435 
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
441 
   #define MESH_MIN_Y 10
 436 
   #define MESH_MIN_Y 10
456
451
457 
 #ifdef ENABLE_AUTO_BED_LEVELING
 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 
   // There are 2 different ways to specify probing locations
 454 
   // There are 2 different ways to specify probing locations
464 
   //
 455 
   //
465 
   // - "grid" mode
 456 
   // - "grid" mode

+ 12
- 0
Marlin/SanityCheck.h Ver arquivo

92 
   #endif
 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 
    * Auto Bed Leveling
 107 
    * Auto Bed Leveling
96 
    */
 108 
    */
97 
   #ifdef ENABLE_AUTO_BED_LEVELING
 109 
   #ifdef ENABLE_AUTO_BED_LEVELING

+ 0
- 9
Marlin/configurator/config/Configuration.h Ver arquivo

431 
 #endif  // MANUAL_BED_LEVELING
 431 
 #endif  // MANUAL_BED_LEVELING
432
432
433 
 #ifdef MESH_BED_LEVELING
 433 
 #ifdef MESH_BED_LEVELING
434 
-
435 
-  #ifdef DELTA
436 
-    #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers
437 
-  #endif
438 
-
439 
   #define MESH_MIN_X 10
 434 
   #define MESH_MIN_X 10
440 
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
 435 
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
441 
   #define MESH_MIN_Y 10
 436 
   #define MESH_MIN_Y 10
456
451
457 
 #ifdef ENABLE_AUTO_BED_LEVELING
 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 
   // There are 2 different ways to specify probing locations
 454 
   // There are 2 different ways to specify probing locations
464 
   //
 455 
   //
465 
   // - "grid" mode
 456 
   // - "grid" mode

+ 0
- 9
Marlin/example_configurations/Felix/Configuration.h Ver arquivo

369 
 #endif  // MANUAL_BED_LEVELING
 369 
 #endif  // MANUAL_BED_LEVELING
370
370
371 
 #ifdef MESH_BED_LEVELING
 371 
 #ifdef MESH_BED_LEVELING
372 
-
373 
-  #ifdef DELTA
374 
-    #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers
375 
-  #endif
376 
-
377 
   #define MESH_MIN_X 10
 372 
   #define MESH_MIN_X 10
378 
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
 373 
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
379 
   #define MESH_MIN_Y 10
 374 
   #define MESH_MIN_Y 10
392
387
393 
 #ifdef ENABLE_AUTO_BED_LEVELING
 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 
   // There are 2 different ways to specify probing locations
 390 
   // There are 2 different ways to specify probing locations
400 
   //
 391 
   //
401 
   // - "grid" mode
 392 
   // - "grid" mode

+ 0
- 9
Marlin/example_configurations/Hephestos/Configuration.h Ver arquivo

392 
 #endif  // MANUAL_BED_LEVELING
 392 
 #endif  // MANUAL_BED_LEVELING
393
393
394 
 #ifdef MESH_BED_LEVELING
 394 
 #ifdef MESH_BED_LEVELING
395 
-
396 
-  #ifdef DELTA
397 
-    #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers
398 
-  #endif
399 
-
400 
   #define MESH_MIN_X 10
 395 
   #define MESH_MIN_X 10
401 
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
 396 
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
402 
   #define MESH_MIN_Y 10
 397 
   #define MESH_MIN_Y 10
415
410
416 
 #ifdef ENABLE_AUTO_BED_LEVELING
 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 
   // There are 2 different ways to specify probing locations
 413 
   // There are 2 different ways to specify probing locations
423 
   //
 414 
   //
424 
   // - "grid" mode
 415 
   // - "grid" mode

+ 0
- 9
Marlin/example_configurations/K8200/Configuration.h Ver arquivo

397 
 #endif  // MANUAL_BED_LEVELING
 397 
 #endif  // MANUAL_BED_LEVELING
398
398
399 
 #ifdef MESH_BED_LEVELING
 399 
 #ifdef MESH_BED_LEVELING
400 
-
401 
-  #ifdef DELTA
402 
-    #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers
403 
-  #endif
404 
-
405 
   #define MESH_MIN_X 10
 400 
   #define MESH_MIN_X 10
406 
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
 401 
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
407 
   #define MESH_MIN_Y 10
 402 
   #define MESH_MIN_Y 10
420
415
421 
 #ifdef ENABLE_AUTO_BED_LEVELING
 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 
   // There are 2 different ways to specify probing locations
 418 
   // There are 2 different ways to specify probing locations
428 
   //
 419 
   //
429 
   // - "grid" mode
 420 
   // - "grid" mode

+ 0
- 9
Marlin/example_configurations/SCARA/Configuration.h Ver arquivo

421 
 #endif  // MANUAL_BED_LEVELING
 421 
 #endif  // MANUAL_BED_LEVELING
422
422
423 
 #ifdef MESH_BED_LEVELING
 423 
 #ifdef MESH_BED_LEVELING
424 
-
425 
-  #ifdef DELTA
426 
-    #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers
427 
-  #endif
428 
-
429 
   #define MESH_MIN_X 10
 424 
   #define MESH_MIN_X 10
430 
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
 425 
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
431 
   #define MESH_MIN_Y 10
 426 
   #define MESH_MIN_Y 10
444
439
445 
 #ifdef ENABLE_AUTO_BED_LEVELING
 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 
   // There are 2 different ways to specify probing locations
 442 
   // There are 2 different ways to specify probing locations
452 
   //
 443 
   //
453 
   // - "grid" mode
 444 
   // - "grid" mode

+ 0
- 9
Marlin/example_configurations/WITBOX/Configuration.h Ver arquivo

391 
 #endif  // MANUAL_BED_LEVELING
 391 
 #endif  // MANUAL_BED_LEVELING
392
392
393 
 #ifdef MESH_BED_LEVELING
 393 
 #ifdef MESH_BED_LEVELING
394 
-
395 
-  #ifdef DELTA
396 
-    #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers
397 
-  #endif
398 
-
399 
   #define MESH_MIN_X 10
 394 
   #define MESH_MIN_X 10
400 
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
 395 
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
401 
   #define MESH_MIN_Y 10
 396 
   #define MESH_MIN_Y 10
414
409
415 
 #ifdef ENABLE_AUTO_BED_LEVELING
 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 
   // There are 2 different ways to specify probing locations
 412 
   // There are 2 different ways to specify probing locations
422 
   //
 413 
   //
423 
   // - "grid" mode
 414 
   // - "grid" mode

+ 0
- 9
Marlin/example_configurations/delta/generic/Configuration.h Ver arquivo

419 
 #endif  // MANUAL_BED_LEVELING
 419 
 #endif  // MANUAL_BED_LEVELING
420
420
421 
 #ifdef MESH_BED_LEVELING
 421 
 #ifdef MESH_BED_LEVELING
422 
-
423 
-  #ifdef DELTA
424 
-    #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers
425 
-  #endif
426 
-
427 
   #define MESH_MIN_X 10
 422 
   #define MESH_MIN_X 10
428 
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
 423 
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
429 
   #define MESH_MIN_Y 10
 424 
   #define MESH_MIN_Y 10
442
437
443 
 #ifdef ENABLE_AUTO_BED_LEVELING
 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 
   // There are 2 different ways to specify probing locations
 440 
   // There are 2 different ways to specify probing locations
450 
   //
 441 
   //
451 
   // - "grid" mode
 442 
   // - "grid" mode

+ 0
- 9
Marlin/example_configurations/delta/kossel_mini/Configuration.h Ver arquivo

419 
 #endif  // MANUAL_BED_LEVELING
 419 
 #endif  // MANUAL_BED_LEVELING
420
420
421 
 #ifdef MESH_BED_LEVELING
 421 
 #ifdef MESH_BED_LEVELING
422 
-
423 
-  #ifdef DELTA
424 
-    #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers
425 
-  #endif
426 
-
427 
   #define MESH_MIN_X 10
 422 
   #define MESH_MIN_X 10
428 
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
 423 
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
429 
   #define MESH_MIN_Y 10
 424 
   #define MESH_MIN_Y 10
442
437
443 
 #ifdef ENABLE_AUTO_BED_LEVELING
 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 
   // There are 2 different ways to specify probing locations
 440 
   // There are 2 different ways to specify probing locations
450 
   //
 441 
   //
451 
   // - "grid" mode
 442 
   // - "grid" mode

+ 0
- 9
Marlin/example_configurations/makibox/Configuration.h Ver arquivo

389 
 #endif  // MANUAL_BED_LEVELING
 389 
 #endif  // MANUAL_BED_LEVELING
390
390
391 
 #ifdef MESH_BED_LEVELING
 391 
 #ifdef MESH_BED_LEVELING
392 
-
393 
-  #ifdef DELTA
394 
-    #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers
395 
-  #endif
396 
-
397 
   #define MESH_MIN_X 10
 392 
   #define MESH_MIN_X 10
398 
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
 393 
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
399 
   #define MESH_MIN_Y 10
 394 
   #define MESH_MIN_Y 10
412
407
413 
 #ifdef ENABLE_AUTO_BED_LEVELING
 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 
   // There are 2 different ways to specify probing locations
 410 
   // There are 2 different ways to specify probing locations
420 
   //
 411 
   //
421 
   // - "grid" mode
 412 
   // - "grid" mode

+ 0
- 9
Marlin/example_configurations/tvrrug/Round2/Configuration.h Ver arquivo

391 
 #endif  // MANUAL_BED_LEVELING
 391 
 #endif  // MANUAL_BED_LEVELING
392
392
393 
 #ifdef MESH_BED_LEVELING
 393 
 #ifdef MESH_BED_LEVELING
394 
-
395 
-  #ifdef DELTA
396 
-    #error 'MESH_BED_LEVELING' does not yet support 'DELTA' printers
397 
-  #endif
398 
-
399 
   #define MESH_MIN_X 10
 394 
   #define MESH_MIN_X 10
400 
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
 395 
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
401 
   #define MESH_MIN_Y 10
 396 
   #define MESH_MIN_Y 10
414
409
415 
 #ifdef ENABLE_AUTO_BED_LEVELING
 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 
   // There are 2 different ways to specify probing locations
 412 
   // There are 2 different ways to specify probing locations
422 
   //
 413 
   //
423 
   // - "grid" mode
 414 
   // - "grid" mode

Escrever Pré-visualização
Carregando…
Cancelar
Salvar