thomas
/
marlin
Прати 1
Волим 0
Креирај огранак 0
Код Дискусије 0 Захтеви за спајање 0 Издања 0 Вики Activity
Преглед изворни кода

Added #error + mention not to enable ABL and Mesh at the same time

Edward Patel пре 10 година
родитељ
5360158545
комит
9a093b2e8f
12 измењених фајлова са 45 додато и 1 уклоњено
Један поглед Покажи статистику Diff
  1. 1
    1
      Documentation/MeshBedLeveling.md
  2. 4
    0
      Marlin/Configuration.h
  3. 4
    0
      Marlin/configurator/config/Configuration.h
  4. 4
    0
      Marlin/example_configurations/Felix/Configuration.h
  5. 4
    0
      Marlin/example_configurations/Hephestos/Configuration.h
  6. 4
    0
      Marlin/example_configurations/K8200/Configuration.h
  7. 4
    0
      Marlin/example_configurations/SCARA/Configuration.h
  8. 4
    0
      Marlin/example_configurations/WITBOX/Configuration.h
  9. 4
    0
      Marlin/example_configurations/delta/generic/Configuration.h
  10. 4
    0
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  11. 4
    0
      Marlin/example_configurations/makibox/Configuration.h
  12. 4
    0
      Marlin/example_configurations/tvrrug/Round2/Configuration.h

+ 1
- 1
Documentation/MeshBedLeveling.md Прегледај датотеку

7
7
8 
 This mesh based method of leveling/compensating can compensate for an non-flat bed. There are various opinions about doing this. It was primarily written to compensate a RigidBot BIG bed (40x30cm) that was somewhat bent.
 8 
 This mesh based method of leveling/compensating can compensate for an non-flat bed. There are various opinions about doing this. It was primarily written to compensate a RigidBot BIG bed (40x30cm) that was somewhat bent.
9
9
10 
-Currently there is no automatic way to probe the bed like the Auto Bed Leveling feature. This might soon be implemented though, stay tuned.
10 
+Currently there is no automatic way to probe the bed like the Auto Bed Leveling feature. So, you can not enable `ENABLE_AUTO_BED_LEVELING` at the same time. This might soon be implemented though, stay tuned.
11
11
12 
 Theory
 12 
 Theory
13 
 ------
 13 
 ------

+ 4
- 0
Marlin/Configuration.h Прегледај датотеку

417
417
418 
 #ifdef ENABLE_AUTO_BED_LEVELING
 418 
 #ifdef ENABLE_AUTO_BED_LEVELING
419
419
420 
+  #ifdef MESH_BED_LEVELING
421 
+    #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both
422 
+  #endif // MESH_BED_LEVELING
423 
+
420 
   // There are 2 different ways to specify probing locations
 424 
   // There are 2 different ways to specify probing locations
421 
   //
 425 
   //
422 
   // - "grid" mode
 426 
   // - "grid" mode

+ 4
- 0
Marlin/configurator/config/Configuration.h Прегледај датотеку

437
437
438 
 #ifdef ENABLE_AUTO_BED_LEVELING
 438 
 #ifdef ENABLE_AUTO_BED_LEVELING
439
439
440 
+  #ifdef MESH_BED_LEVELING
441 
+    #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both
442 
+  #endif // MESH_BED_LEVELING
443 
+
440 
   // There are 2 different ways to specify probing locations
 444 
   // There are 2 different ways to specify probing locations
441 
   //
 445 
   //
442 
   // - "grid" mode
 446 
   // - "grid" mode

+ 4
- 0
Marlin/example_configurations/Felix/Configuration.h Прегледај датотеку

387
387
388 
 #ifdef ENABLE_AUTO_BED_LEVELING
 388 
 #ifdef ENABLE_AUTO_BED_LEVELING
389
389
390 
+  #ifdef MESH_BED_LEVELING
391 
+    #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both
392 
+  #endif // MESH_BED_LEVELING
393 
+
390 
   // There are 2 different ways to specify probing locations
 394 
   // There are 2 different ways to specify probing locations
391 
   //
 395 
   //
392 
   // - "grid" mode
 396 
   // - "grid" mode

+ 4
- 0
Marlin/example_configurations/Hephestos/Configuration.h Прегледај датотеку

410
410
411 
 #ifdef ENABLE_AUTO_BED_LEVELING
 411 
 #ifdef ENABLE_AUTO_BED_LEVELING
412
412
413 
+  #ifdef MESH_BED_LEVELING
414 
+    #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both
415 
+  #endif // MESH_BED_LEVELING
416 
+
413 
   // There are 2 different ways to specify probing locations
 417 
   // There are 2 different ways to specify probing locations
414 
   //
 418 
   //
415 
   // - "grid" mode
 419 
   // - "grid" mode

+ 4
- 0
Marlin/example_configurations/K8200/Configuration.h Прегледај датотеку

415
415
416 
 #ifdef ENABLE_AUTO_BED_LEVELING
 416 
 #ifdef ENABLE_AUTO_BED_LEVELING
417
417
418 
+  #ifdef MESH_BED_LEVELING
419 
+    #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both
420 
+  #endif // MESH_BED_LEVELING
421 
+
418 
   // There are 2 different ways to specify probing locations
 422 
   // There are 2 different ways to specify probing locations
419 
   //
 423 
   //
420 
   // - "grid" mode
 424 
   // - "grid" mode

+ 4
- 0
Marlin/example_configurations/SCARA/Configuration.h Прегледај датотеку

439
439
440 
 #ifdef ENABLE_AUTO_BED_LEVELING
 440 
 #ifdef ENABLE_AUTO_BED_LEVELING
441
441
442 
+  #ifdef MESH_BED_LEVELING
443 
+    #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both
444 
+  #endif // MESH_BED_LEVELING
445 
+
442 
   // There are 2 different ways to specify probing locations
 446 
   // There are 2 different ways to specify probing locations
443 
   //
 447 
   //
444 
   // - "grid" mode
 448 
   // - "grid" mode

+ 4
- 0
Marlin/example_configurations/WITBOX/Configuration.h Прегледај датотеку

409
409
410 
 #ifdef ENABLE_AUTO_BED_LEVELING
 410 
 #ifdef ENABLE_AUTO_BED_LEVELING
411
411
412 
+  #ifdef MESH_BED_LEVELING
413 
+    #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both
414 
+  #endif // MESH_BED_LEVELING
415 
+
412 
   // There are 2 different ways to specify probing locations
 416 
   // There are 2 different ways to specify probing locations
413 
   //
 417 
   //
414 
   // - "grid" mode
 418 
   // - "grid" mode

+ 4
- 0
Marlin/example_configurations/delta/generic/Configuration.h Прегледај датотеку

437
437
438 
 #ifdef ENABLE_AUTO_BED_LEVELING
 438 
 #ifdef ENABLE_AUTO_BED_LEVELING
439
439
440 
+  #ifdef MESH_BED_LEVELING
441 
+    #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both
442 
+  #endif // MESH_BED_LEVELING
443 
+
440 
   // There are 2 different ways to specify probing locations
 444 
   // There are 2 different ways to specify probing locations
441 
   //
 445 
   //
442 
   // - "grid" mode
 446 
   // - "grid" mode

+ 4
- 0
Marlin/example_configurations/delta/kossel_mini/Configuration.h Прегледај датотеку

437
437
438 
 #ifdef ENABLE_AUTO_BED_LEVELING
 438 
 #ifdef ENABLE_AUTO_BED_LEVELING
439
439
440 
+  #ifdef MESH_BED_LEVELING
441 
+    #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both
442 
+  #endif // MESH_BED_LEVELING
443 
+
440 
   // There are 2 different ways to specify probing locations
 444 
   // There are 2 different ways to specify probing locations
441 
   //
 445 
   //
442 
   // - "grid" mode
 446 
   // - "grid" mode

+ 4
- 0
Marlin/example_configurations/makibox/Configuration.h Прегледај датотеку

407
407
408 
 #ifdef ENABLE_AUTO_BED_LEVELING
 408 
 #ifdef ENABLE_AUTO_BED_LEVELING
409
409
410 
+  #ifdef MESH_BED_LEVELING
411 
+    #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both
412 
+  #endif // MESH_BED_LEVELING
413 
+
410 
   // There are 2 different ways to specify probing locations
 414 
   // There are 2 different ways to specify probing locations
411 
   //
 415 
   //
412 
   // - "grid" mode
 416 
   // - "grid" mode

+ 4
- 0
Marlin/example_configurations/tvrrug/Round2/Configuration.h Прегледај датотеку

409
409
410 
 #ifdef ENABLE_AUTO_BED_LEVELING
 410 
 #ifdef ENABLE_AUTO_BED_LEVELING
411
411
412 
+  #ifdef MESH_BED_LEVELING
413 
+    #error Select 'ENABLE_AUTO_BED_LEVELING' or 'MESH_BED_LEVELING', not both
414 
+  #endif // MESH_BED_LEVELING
415 
+
412 
   // There are 2 different ways to specify probing locations
 416 
   // There are 2 different ways to specify probing locations
413 
   //
 417 
   //
414 
   // - "grid" mode
 418 
   // - "grid" mode

Write Preview
Loading…
Откажи
Сачувај