thomas
/
marlin
Vērot 1
Pievienot zvaigznīti 0
Atdalīts 0
Kods Problēmas 0 Izmaiņu pieprasījumi 0 Laidieni 0 Vikivietne Aktivitāte
Pārlūkot izejas kodu

Disable UBL_G26_MESH_EDITING by default

Scott Lahteine 8 gadus atpakaļ
vecāks
9e4bd6b3b5
revīzija
edbc024d76
26 mainītis faili ar 32 papildinājumiem un 32 dzēšanām
Dalītais skats Rādīt salīdzināšanas statistiku
  1. 1
    1
      .travis.yml
  2. 1
    1
      Marlin/Configuration.h
  3. 2
    2
      Marlin/G26_Mesh_Validation_Tool.cpp
  4. 6
    6
      Marlin/Marlin_main.cpp
  5. 1
    1
      Marlin/UBL_G29.cpp
  6. 1
    1
      Marlin/example_configurations/Cartesio/Configuration.h
  7. 1
    1
      Marlin/example_configurations/Felix/Configuration.h
  8. 1
    1
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  9. 1
    1
      Marlin/example_configurations/Hephestos/Configuration.h
  10. 1
    1
      Marlin/example_configurations/Hephestos_2/Configuration.h
  11. 1
    1
      Marlin/example_configurations/K8200/Configuration.h
  12. 1
    1
      Marlin/example_configurations/K8400/Configuration.h
  13. 1
    1
      Marlin/example_configurations/K8400/Dual-head/Configuration.h
  14. 1
    1
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  15. 1
    1
      Marlin/example_configurations/RigidBot/Configuration.h
  16. 1
    1
      Marlin/example_configurations/SCARA/Configuration.h
  17. 1
    1
      Marlin/example_configurations/TAZ4/Configuration.h
  18. 1
    1
      Marlin/example_configurations/WITBOX/Configuration.h
  19. 1
    1
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  20. 1
    1
      Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h
  21. 1
    1
      Marlin/example_configurations/delta/generic/Configuration.h
  22. 1
    1
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  23. 1
    1
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  24. 1
    1
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  25. 1
    1
      Marlin/example_configurations/makibox/Configuration.h
  26. 1
    1
      Marlin/example_configurations/tvrrug/Round2/Configuration.h

+ 1
- 1
.travis.yml Parādīt failu 

@@ -120,7 +120,7 @@ script:
120 120 
   # Test a simple build of AUTO_BED_LEVELING_UBL
121 121 
   #
122 122 
   - restore_configs
123 
-  - opt_enable AUTO_BED_LEVELING_UBL FIX_MOUNTED_PROBE EEPROM_SETTINGS G3D_PANEL
123 
+  - opt_enable AUTO_BED_LEVELING_UBL UBL_G26_MESH_EDITING FIX_MOUNTED_PROBE EEPROM_SETTINGS G3D_PANEL
124 124 
   - build_marlin
125 125 
   #
126 126 
   # Test a Sled Z Probe

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

@@ -862,7 +862,7 @@
862 862 
   #define UBL_PROBE_PT_2_Y 20
863 863 
   #define UBL_PROBE_PT_3_X 180
864 864 
   #define UBL_PROBE_PT_3_Y 20
865 
-  #define UBL_MESH_EDIT_ENABLED     // Enable G26 mesh editing
865 
+  //#define UBL_G26_MESH_EDITING    // Enable G26 mesh editing
866 866
867 867 
 #elif ENABLED(MESH_BED_LEVELING)
868 868

+ 2
- 2
Marlin/G26_Mesh_Validation_Tool.cpp Parādīt failu 

@@ -26,7 +26,7 @@
26 26
27 27 
 #include "MarlinConfig.h"
28 28
29 
-#if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(UBL_MESH_EDIT_ENABLED)
29 
+#if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(UBL_G26_MESH_EDITING)
30 30
31 31 
   #include "Marlin.h"
32 32 
   #include "Configuration.h"
 
@@ -896,4 +896,4 @@
896 896 
     return UBL_OK;
897 897 
   }
898 898
899 
-#endif // AUTO_BED_LEVELING_UBL && UBL_MESH_EDIT_ENABLED
899 
+#endif // AUTO_BED_LEVELING_UBL && UBL_G26_MESH_EDITING

+ 6
- 6
Marlin/Marlin_main.cpp Parādīt failu 

@@ -5344,7 +5344,7 @@ inline void gcode_M42() {
5344 5344
5345 5345 
 #endif // Z_MIN_PROBE_REPEATABILITY_TEST
5346 5346
5347 
-#if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(UBL_MESH_EDIT_ENABLED)
5347 
+#if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(UBL_G26_MESH_EDITING)
5348 5348
5349 5349 
   inline void gcode_M49() {
5350 5350 
     ubl.g26_debug_flag = !ubl.g26_debug_flag;
 
@@ -5352,7 +5352,7 @@ inline void gcode_M42() {
5352 5352 
     serialprintPGM(ubl.g26_debug_flag ? PSTR("on.") : PSTR("off."));
5353 5353 
   }
5354 5354
5355 
-#endif // AUTO_BED_LEVELING_UBL && UBL_MESH_EDIT_ENABLED
5355 
+#endif // AUTO_BED_LEVELING_UBL && UBL_G26_MESH_EDITING
5356 5356
5357 5357 
 /**
5358 5358 
  * M75: Start print timer
 
@@ -8601,7 +8601,7 @@ void process_next_command() {
8601 8601 
           break;
8602 8602 
       #endif // INCH_MODE_SUPPORT
8603 8603
8604 
-      #if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(UBL_MESH_EDIT_ENABLED)
8604 
+      #if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(UBL_G26_MESH_EDITING)
8605 8605 
         case 26: // G26: Mesh Validation Pattern generation
8606 8606 
           gcode_G26();
8607 8607 
           break;
 
@@ -8617,7 +8617,7 @@ void process_next_command() {
8617 8617 
         gcode_G28();
8618 8618 
         break;
8619 8619
8620 
-      #if PLANNER_LEVELING && !ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(UBL_MESH_EDIT_ENABLED)
8620 
+      #if PLANNER_LEVELING && !ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(UBL_G26_MESH_EDITING)
8621 8621 
         case 29: // G29 Detailed Z probe, probes the bed at 3 or more points,
8622 8622 
                  // or provides access to the UBL System if enabled.
8623 8623 
           gcode_G29();
 
@@ -8733,11 +8733,11 @@ void process_next_command() {
8733 8733 
           break;
8734 8734 
       #endif // Z_MIN_PROBE_REPEATABILITY_TEST
8735 8735
8736 
-      #if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(UBL_MESH_EDIT_ENABLED)
8736 
+      #if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(UBL_G26_MESH_EDITING)
8737 8737 
         case 49: // M49: Turn on or off G26 debug flag for verbose output
8738 8738 
           gcode_M49();
8739 8739 
           break;
8740 
-      #endif // AUTO_BED_LEVELING_UBL && UBL_MESH_EDIT_ENABLED
8740 
+      #endif // AUTO_BED_LEVELING_UBL && UBL_G26_MESH_EDITING
8741 8741
8742 8742 
       case 75: // M75: Start print timer
8743 8743 
         gcode_M75(); break;

+ 1
- 1
Marlin/UBL_G29.cpp Parādīt failu 

@@ -22,7 +22,7 @@
22 22
23 23 
 #include "MarlinConfig.h"
24 24
25 
-#if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(UBL_MESH_EDIT_ENABLED)
25 
+#if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(UBL_G26_MESH_EDITING)
26 26 
   //#include "vector_3.h"
27 27 
   //#include "qr_solve.h"
28 28

+ 1
- 1
Marlin/example_configurations/Cartesio/Configuration.h Parādīt failu 

@@ -863,7 +863,7 @@
863 863 
   #define UBL_PROBE_PT_2_Y 20
864 864 
   #define UBL_PROBE_PT_3_X 180
865 865 
   #define UBL_PROBE_PT_3_Y 20
866 
-  #define UBL_MESH_EDIT_ENABLED     // Enable G26 mesh editing
866 
+  //#define UBL_G26_MESH_EDITING    // Enable G26 mesh editing
867 867
868 868 
 #elif ENABLED(MESH_BED_LEVELING)
869 869

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

@@ -846,7 +846,7 @@
846 846 
   #define UBL_PROBE_PT_2_Y 20
847 847 
   #define UBL_PROBE_PT_3_X 180
848 848 
   #define UBL_PROBE_PT_3_Y 20
849 
-  #define UBL_MESH_EDIT_ENABLED     // Enable G26 mesh editing
849 
+  //#define UBL_G26_MESH_EDITING    // Enable G26 mesh editing
850 850
851 851 
 #elif ENABLED(MESH_BED_LEVELING)
852 852

+ 1
- 1
Marlin/example_configurations/Felix/DUAL/Configuration.h Parādīt failu 

@@ -846,7 +846,7 @@
846 846 
   #define UBL_PROBE_PT_2_Y 20
847 847 
   #define UBL_PROBE_PT_3_X 180
848 848 
   #define UBL_PROBE_PT_3_Y 20
849 
-  #define UBL_MESH_EDIT_ENABLED     // Enable G26 mesh editing
849 
+  //#define UBL_G26_MESH_EDITING    // Enable G26 mesh editing
850 850
851 851 
 #elif ENABLED(MESH_BED_LEVELING)
852 852

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

@@ -855,7 +855,7 @@
855 855 
   #define UBL_PROBE_PT_2_Y 20
856 856 
   #define UBL_PROBE_PT_3_X 180
857 857 
   #define UBL_PROBE_PT_3_Y 20
858 
-  #define UBL_MESH_EDIT_ENABLED     // Enable G26 mesh editing
858 
+  //#define UBL_G26_MESH_EDITING    // Enable G26 mesh editing
859 859
860 860 
 #elif ENABLED(MESH_BED_LEVELING)
861 861

+ 1
- 1
Marlin/example_configurations/Hephestos_2/Configuration.h Parādīt failu 

@@ -857,7 +857,7 @@
857 857 
   #define UBL_PROBE_PT_2_Y 20
858 858 
   #define UBL_PROBE_PT_3_X 180
859 859 
   #define UBL_PROBE_PT_3_Y 20
860 
-  #define UBL_MESH_EDIT_ENABLED     // Enable G26 mesh editing
860 
+  //#define UBL_G26_MESH_EDITING    // Enable G26 mesh editing
861 861
862 862 
 #elif ENABLED(MESH_BED_LEVELING)
863 863

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

@@ -892,7 +892,7 @@
892 892 
   #define UBL_PROBE_PT_2_Y 20
893 893 
   #define UBL_PROBE_PT_3_X 180
894 894 
   #define UBL_PROBE_PT_3_Y 20
895 
-  #define UBL_MESH_EDIT_ENABLED     // Enable G26 mesh editing
895 
+  //#define UBL_G26_MESH_EDITING    // Enable G26 mesh editing
896 896
897 897 
 #elif ENABLED(MESH_BED_LEVELING)
898 898

+ 1
- 1
Marlin/example_configurations/K8400/Configuration.h Parādīt failu 

@@ -863,7 +863,7 @@
863 863 
   #define UBL_PROBE_PT_2_Y 20
864 864 
   #define UBL_PROBE_PT_3_X 180
865 865 
   #define UBL_PROBE_PT_3_Y 20
866 
-  #define UBL_MESH_EDIT_ENABLED     // Enable G26 mesh editing
866 
+  //#define UBL_G26_MESH_EDITING    // Enable G26 mesh editing
867 867
868 868 
 #elif ENABLED(MESH_BED_LEVELING)
869 869

+ 1
- 1
Marlin/example_configurations/K8400/Dual-head/Configuration.h Parādīt failu 

@@ -863,7 +863,7 @@
863 863 
   #define UBL_PROBE_PT_2_Y 20
864 864 
   #define UBL_PROBE_PT_3_X 180
865 865 
   #define UBL_PROBE_PT_3_Y 20
866 
-  #define UBL_MESH_EDIT_ENABLED     // Enable G26 mesh editing
866 
+  //#define UBL_G26_MESH_EDITING    // Enable G26 mesh editing
867 867
868 868 
 #elif ENABLED(MESH_BED_LEVELING)
869 869

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

@@ -863,7 +863,7 @@
863 863 
   #define UBL_PROBE_PT_2_Y 20
864 864 
   #define UBL_PROBE_PT_3_X 180
865 865 
   #define UBL_PROBE_PT_3_Y 20
866 
-  #define UBL_MESH_EDIT_ENABLED     // Enable G26 mesh editing
866 
+  //#define UBL_G26_MESH_EDITING    // Enable G26 mesh editing
867 867
868 868 
 #elif ENABLED(MESH_BED_LEVELING)
869 869

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

@@ -862,7 +862,7 @@
862 862 
   #define UBL_PROBE_PT_2_Y 20
863 863 
   #define UBL_PROBE_PT_3_X 180
864 864 
   #define UBL_PROBE_PT_3_Y 20
865 
-  #define UBL_MESH_EDIT_ENABLED     // Enable G26 mesh editing
865 
+  //#define UBL_G26_MESH_EDITING    // Enable G26 mesh editing
866 866
867 867 
 #elif ENABLED(MESH_BED_LEVELING)
868 868

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

@@ -878,7 +878,7 @@
878 878 
   #define UBL_PROBE_PT_2_Y 20
879 879 
   #define UBL_PROBE_PT_3_X 180
880 880 
   #define UBL_PROBE_PT_3_Y 20
881 
-  #define UBL_MESH_EDIT_ENABLED     // Enable G26 mesh editing
881 
+  //#define UBL_G26_MESH_EDITING    // Enable G26 mesh editing
882 882
883 883 
 #elif ENABLED(MESH_BED_LEVELING)
884 884

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

@@ -884,7 +884,7 @@
884 884 
   #define UBL_PROBE_PT_2_Y 20
885 885 
   #define UBL_PROBE_PT_3_X 180
886 886 
   #define UBL_PROBE_PT_3_Y 20
887 
-  #define UBL_MESH_EDIT_ENABLED     // Enable G26 mesh editing
887 
+  //#define UBL_G26_MESH_EDITING    // Enable G26 mesh editing
888 888
889 889 
 #elif ENABLED(MESH_BED_LEVELING)
890 890

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

@@ -855,7 +855,7 @@
855 855 
   #define UBL_PROBE_PT_2_Y 20
856 856 
   #define UBL_PROBE_PT_3_X 180
857 857 
   #define UBL_PROBE_PT_3_Y 20
858 
-  #define UBL_MESH_EDIT_ENABLED     // Enable G26 mesh editing
858 
+  //#define UBL_G26_MESH_EDITING    // Enable G26 mesh editing
859 859
860 860 
 #elif ENABLED(MESH_BED_LEVELING)
861 861

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

@@ -863,7 +863,7 @@
863 863 
   #define UBL_PROBE_PT_2_Y 20
864 864 
   #define UBL_PROBE_PT_3_X 180
865 865 
   #define UBL_PROBE_PT_3_Y 20
866 
-  #define UBL_MESH_EDIT_ENABLED     // Enable G26 mesh editing
866 
+  //#define UBL_G26_MESH_EDITING    // Enable G26 mesh editing
867 867
868 868 
 #elif ENABLED(MESH_BED_LEVELING)
869 869

+ 1
- 1
Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h Parādīt failu 

@@ -968,7 +968,7 @@
968 968 
   #define UBL_PROBE_PT_2_Y 20
969 969 
   #define UBL_PROBE_PT_3_X 180
970 970 
   #define UBL_PROBE_PT_3_Y 20
971 
-  #define UBL_MESH_EDIT_ENABLED     // Enable G26 mesh editing
971 
+  //#define UBL_G26_MESH_EDITING    // Enable G26 mesh editing
972 972
973 973 
 #elif ENABLED(MESH_BED_LEVELING)
974 974

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

@@ -954,7 +954,7 @@
954 954 
   #define UBL_PROBE_PT_2_Y 20
955 955 
   #define UBL_PROBE_PT_3_X 180
956 956 
   #define UBL_PROBE_PT_3_Y 20
957 
-  #define UBL_MESH_EDIT_ENABLED     // Enable G26 mesh editing
957 
+  //#define UBL_G26_MESH_EDITING    // Enable G26 mesh editing
958 958
959 959 
 #elif ENABLED(MESH_BED_LEVELING)
960 960

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

@@ -958,7 +958,7 @@
958 958 
   #define UBL_PROBE_PT_2_Y 20
959 959 
   #define UBL_PROBE_PT_3_X 180
960 960 
   #define UBL_PROBE_PT_3_Y 20
961 
-  #define UBL_MESH_EDIT_ENABLED     // Enable G26 mesh editing
961 
+  //#define UBL_G26_MESH_EDITING    // Enable G26 mesh editing
962 962
963 963 
 #elif ENABLED(MESH_BED_LEVELING)
964 964

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

@@ -957,7 +957,7 @@
957 957 
   #define UBL_PROBE_PT_2_Y 20
958 958 
   #define UBL_PROBE_PT_3_X 180
959 959 
   #define UBL_PROBE_PT_3_Y 20
960 
-  #define UBL_MESH_EDIT_ENABLED     // Enable G26 mesh editing
960 
+  //#define UBL_G26_MESH_EDITING    // Enable G26 mesh editing
961 961
962 962 
 #elif ENABLED(MESH_BED_LEVELING)
963 963

+ 1
- 1
Marlin/example_configurations/delta/kossel_xl/Configuration.h Parādīt failu 

@@ -967,7 +967,7 @@
967 967 
   #define UBL_PROBE_PT_2_Y 20
968 968 
   #define UBL_PROBE_PT_3_X 180
969 969 
   #define UBL_PROBE_PT_3_Y 20
970 
-  #define UBL_MESH_EDIT_ENABLED     // Enable G26 mesh editing
970 
+  //#define UBL_G26_MESH_EDITING    // Enable G26 mesh editing
971 971
972 972 
 #elif ENABLED(MESH_BED_LEVELING)
973 973

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

@@ -866,7 +866,7 @@
866 866 
   #define UBL_PROBE_PT_2_Y 20
867 867 
   #define UBL_PROBE_PT_3_X 180
868 868 
   #define UBL_PROBE_PT_3_Y 20
869 
-  #define UBL_MESH_EDIT_ENABLED     // Enable G26 mesh editing
869 
+  //#define UBL_G26_MESH_EDITING    // Enable G26 mesh editing
870 870
871 871 
 #elif ENABLED(MESH_BED_LEVELING)
872 872

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

@@ -859,7 +859,7 @@
859 859 
   #define UBL_PROBE_PT_2_Y 20
860 860 
   #define UBL_PROBE_PT_3_X 180
861 861 
   #define UBL_PROBE_PT_3_Y 20
862 
-  #define UBL_MESH_EDIT_ENABLED     // Enable G26 mesh editing
862 
+  //#define UBL_G26_MESH_EDITING    // Enable G26 mesh editing
863 863
864 864 
 #elif ENABLED(MESH_BED_LEVELING)
865 865

Rakstīt Priekšskatītījums
Notiek ielāde…
Atcelt
Saglabāt