thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Apply UBL mesh bounds to remaining configs

Scott Lahteine 8 years ago
parent
60be3d264b
commit
2b88ccd0aa
18 changed files with 82 additions and 6 deletions
Unified View Show Diff Stats
  1. 1
    3
      Marlin/Configuration_adv.h
  2. 5
    0
      Marlin/example_configurations/Cartesio/Configuration_adv.h
  3. 5
    0
      Marlin/example_configurations/Felix/Configuration_adv.h
  4. 5
    0
      Marlin/example_configurations/Hephestos/Configuration_adv.h
  5. 5
    0
      Marlin/example_configurations/Hephestos_2/Configuration_adv.h
  6. 5
    0
      Marlin/example_configurations/K8200/Configuration_adv.h
  7. 5
    0
      Marlin/example_configurations/K8400/Configuration_adv.h
  8. 5
    0
      Marlin/example_configurations/RigidBot/Configuration_adv.h
  9. 5
    0
      Marlin/example_configurations/SCARA/Configuration_adv.h
  10. 5
    0
      Marlin/example_configurations/TAZ4/Configuration_adv.h
  11. 1
    3
      Marlin/example_configurations/TinyBoy2/Configuration_adv.h
  12. 5
    0
      Marlin/example_configurations/WITBOX/Configuration_adv.h
  13. 5
    0
      Marlin/example_configurations/delta/generic/Configuration_adv.h
  14. 5
    0
      Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
  15. 5
    0
      Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
  16. 5
    0
      Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
  17. 5
    0
      Marlin/example_configurations/makibox/Configuration_adv.h
  18. 5
    0
      Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h

+ 1
- 3
Marlin/Configuration_adv.h View File

648 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
 648 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
649 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
 649 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
650 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
 650 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
651 
-#endif
652 
-
653 
-#if ENABLED(AUTO_BED_LEVELING_UBL)
651 
+#elif ENABLED(AUTO_BED_LEVELING_UBL)
654 
   #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET)
 652 
   #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET)
655 
   #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET))
 653 
   #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET))
656 
   #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET)
 654 
   #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET)

+ 5
- 0
Marlin/example_configurations/Cartesio/Configuration_adv.h View File

645 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
 645 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
646 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
 646 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
647 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
 647 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
648 
+#elif ENABLED(AUTO_BED_LEVELING_UBL)
649 
+  #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET)
650 
+  #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET))
651 
+  #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET)
652 
+  #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET))
648 
 #endif
 653 
 #endif
649
654
650 
 // @section extras
 655 
 // @section extras

+ 5
- 0
Marlin/example_configurations/Felix/Configuration_adv.h View File

645 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
 645 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
646 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
 646 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
647 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
 647 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
648 
+#elif ENABLED(AUTO_BED_LEVELING_UBL)
649 
+  #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET)
650 
+  #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET))
651 
+  #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET)
652 
+  #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET))
648 
 #endif
 653 
 #endif
649
654
650 
 // @section extras
 655 
 // @section extras

+ 5
- 0
Marlin/example_configurations/Hephestos/Configuration_adv.h View File

645 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
 645 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
646 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
 646 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
647 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
 647 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
648 
+#elif ENABLED(AUTO_BED_LEVELING_UBL)
649 
+  #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET)
650 
+  #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET))
651 
+  #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET)
652 
+  #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET))
648 
 #endif
 653 
 #endif
649
654
650 
 // @section extras
 655 
 // @section extras

+ 5
- 0
Marlin/example_configurations/Hephestos_2/Configuration_adv.h View File

629 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
 629 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
630 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
 630 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
631 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
 631 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
632 
+#elif ENABLED(AUTO_BED_LEVELING_UBL)
633 
+  #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET)
634 
+  #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET))
635 
+  #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET)
636 
+  #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET))
632 
 #endif
 637 
 #endif
633
638
634 
 // @section extras
 639 
 // @section extras

+ 5
- 0
Marlin/example_configurations/K8200/Configuration_adv.h View File

658 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
 658 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
659 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
 659 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
660 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
 660 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
661 
+#elif ENABLED(AUTO_BED_LEVELING_UBL)
662 
+  #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET)
663 
+  #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET))
664 
+  #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET)
665 
+  #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET))
661 
 #endif
 666 
 #endif
662
667
663 
 // @section extras
 668 
 // @section extras

+ 5
- 0
Marlin/example_configurations/K8400/Configuration_adv.h View File

645 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
 645 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
646 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
 646 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
647 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
 647 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
648 
+#elif ENABLED(AUTO_BED_LEVELING_UBL)
649 
+  #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET)
650 
+  #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET))
651 
+  #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET)
652 
+  #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET))
648 
 #endif
 653 
 #endif
649
654
650 
 // @section extras
 655 
 // @section extras

+ 5
- 0
Marlin/example_configurations/RigidBot/Configuration_adv.h View File

645 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
 645 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
646 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
 646 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
647 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
 647 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
648 
+#elif ENABLED(AUTO_BED_LEVELING_UBL)
649 
+  #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET)
650 
+  #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET))
651 
+  #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET)
652 
+  #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET))
648 
 #endif
 653 
 #endif
649
654
650 
 // @section extras
 655 
 // @section extras

+ 5
- 0
Marlin/example_configurations/SCARA/Configuration_adv.h View File

645 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
 645 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
646 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
 646 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
647 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
 647 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
648 
+#elif ENABLED(AUTO_BED_LEVELING_UBL)
649 
+  #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET)
650 
+  #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET))
651 
+  #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET)
652 
+  #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET))
648 
 #endif
 653 
 #endif
649
654
650 
 // @section extras
 655 
 // @section extras

+ 5
- 0
Marlin/example_configurations/TAZ4/Configuration_adv.h View File

653 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
 653 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
654 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
 654 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
655 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
 655 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
656 
+#elif ENABLED(AUTO_BED_LEVELING_UBL)
657 
+  #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET)
658 
+  #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET))
659 
+  #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET)
660 
+  #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET))
656 
 #endif
 661 
 #endif
657
662
658 
 // @section extras
 663 
 // @section extras

+ 1
- 3
Marlin/example_configurations/TinyBoy2/Configuration_adv.h View File

630 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
 630 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
631 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
 631 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
632 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
 632 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
633 
-#endif
634 
-
635 
-#if ENABLED(AUTO_BED_LEVELING_UBL)
633 
+#elif ENABLED(AUTO_BED_LEVELING_UBL)
636 
   #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET)
 634 
   #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET)
637 
   #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET))
 635 
   #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET))
638 
   #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET)
 636 
   #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET)

+ 5
- 0
Marlin/example_configurations/WITBOX/Configuration_adv.h View File

645 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
 645 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
646 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
 646 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
647 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
 647 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
648 
+#elif ENABLED(AUTO_BED_LEVELING_UBL)
649 
+  #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET)
650 
+  #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET))
651 
+  #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET)
652 
+  #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET))
648 
 #endif
 653 
 #endif
649
654
650 
 // @section extras
 655 
 // @section extras

+ 5
- 0
Marlin/example_configurations/delta/generic/Configuration_adv.h View File

647 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
 647 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
648 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
 648 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
649 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
 649 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
650 
+#elif ENABLED(AUTO_BED_LEVELING_UBL)
651 
+  #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET)
652 
+  #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET))
653 
+  #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET)
654 
+  #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET))
650 
 #endif
 655 
 #endif
651
656
652 
 // @section extras
 657 
 // @section extras

+ 5
- 0
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h View File

647 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
 647 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
648 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
 648 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
649 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
 649 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
650 
+#elif ENABLED(AUTO_BED_LEVELING_UBL)
651 
+  #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET)
652 
+  #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET))
653 
+  #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET)
654 
+  #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET))
650 
 #endif
 655 
 #endif
651
656
652 
 // @section extras
 657 
 // @section extras

+ 5
- 0
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h View File

652 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
 652 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
653 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
 653 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
654 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
 654 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
655 
+#elif ENABLED(AUTO_BED_LEVELING_UBL)
656 
+  #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET)
657 
+  #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET))
658 
+  #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET)
659 
+  #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET))
655 
 #endif
 660 
 #endif
656
661
657 
 // @section extras
 662 
 // @section extras

+ 5
- 0
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h View File

647 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
 647 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
648 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
 648 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
649 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
 649 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
650 
+#elif ENABLED(AUTO_BED_LEVELING_UBL)
651 
+  #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET)
652 
+  #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET))
653 
+  #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET)
654 
+  #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET))
650 
 #endif
 655 
 #endif
651
656
652 
 // @section extras
 657 
 // @section extras

+ 5
- 0
Marlin/example_configurations/makibox/Configuration_adv.h View File

645 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
 645 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
646 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
 646 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
647 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
 647 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
648 
+#elif ENABLED(AUTO_BED_LEVELING_UBL)
649 
+  #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET)
650 
+  #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET))
651 
+  #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET)
652 
+  #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET))
648 
 #endif
 653 
 #endif
649
654
650 
 // @section extras
 655 
 // @section extras

+ 5
- 0
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h View File

645 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
 645 
   #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
646 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
 646 
   #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
647 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
 647 
   #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
648 
+#elif ENABLED(AUTO_BED_LEVELING_UBL)
649 
+  #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET)
650 
+  #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET))
651 
+  #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET)
652 
+  #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET))
648 
 #endif
 653 
 #endif
649
654
650 
 // @section extras
 655 
 // @section extras

Write Preview
Loading…
Cancel
Save