Browse Source

Fix decimal places in G29 Bed Equation Coeficients

alexborro 9 years ago
parent
commit
2f3c77b751
2 changed files with 16 additions and 10 deletions
  1. 12
    6
      Marlin/Marlin_main.cpp
  2. 4
    4
      Marlin/vector_3.cpp

+ 12
- 6
Marlin/Marlin_main.cpp View File

2015
 
2015
 
2016
       if (verbose_level) {
2016
       if (verbose_level) {
2017
         SERIAL_PROTOCOLPGM("Eqn coefficients: a: ");
2017
         SERIAL_PROTOCOLPGM("Eqn coefficients: a: ");
2018
-        SERIAL_PROTOCOL(plane_equation_coefficients[0] + 0.0001);
2018
+        SERIAL_PROTOCOL_F(plane_equation_coefficients[0], 8);
2019
         SERIAL_PROTOCOLPGM(" b: ");
2019
         SERIAL_PROTOCOLPGM(" b: ");
2020
-        SERIAL_PROTOCOL(plane_equation_coefficients[1] + 0.0001);
2020
+        SERIAL_PROTOCOL_F(plane_equation_coefficients[1], 8);
2021
         SERIAL_PROTOCOLPGM(" d: ");
2021
         SERIAL_PROTOCOLPGM(" d: ");
2022
-        SERIAL_PROTOCOLLN(plane_equation_coefficients[2] + 0.0001);
2022
+        SERIAL_PROTOCOL_F(plane_equation_coefficients[2], 8);
2023
+        SERIAL_EOL;
2023
         if (verbose_level > 2) {
2024
         if (verbose_level > 2) {
2024
           SERIAL_PROTOCOLPGM("Mean of sampled points: ");
2025
           SERIAL_PROTOCOLPGM("Mean of sampled points: ");
2025
-          SERIAL_PROTOCOL_F(mean, 6);
2026
+          SERIAL_PROTOCOL_F(mean, 8);
2026
           SERIAL_EOL;
2027
           SERIAL_EOL;
2027
         }
2028
         }
2028
       }
2029
       }
2033
 
2034
 
2034
         SERIAL_PROTOCOLPGM(" \nBed Height Topography: \n");
2035
         SERIAL_PROTOCOLPGM(" \nBed Height Topography: \n");
2035
         #if TOPO_ORIGIN == OriginFrontLeft
2036
         #if TOPO_ORIGIN == OriginFrontLeft
2037
+          SERIAL_PROTOCOLPGM("+-----------+\n");
2038
+          SERIAL_PROTOCOLPGM("|...Back....|\n");
2039
+          SERIAL_PROTOCOLPGM("|Left..Right|\n");
2040
+          SERIAL_PROTOCOLPGM("|...Front...|\n");
2041
+          SERIAL_PROTOCOLPGM("+-----------+\n");
2036
           for (yy = auto_bed_leveling_grid_points - 1; yy >= 0; yy--)
2042
           for (yy = auto_bed_leveling_grid_points - 1; yy >= 0; yy--)
2037
         #else
2043
         #else
2038
           for (yy = 0; yy < auto_bed_leveling_grid_points; yy++)
2044
           for (yy = 0; yy < auto_bed_leveling_grid_points; yy++)
2039
         #endif
2045
         #endif
2040
           {
2046
           {
2041
             #if TOPO_ORIGIN == OriginBackRight
2047
             #if TOPO_ORIGIN == OriginBackRight
2042
-              for (xx = auto_bed_leveling_grid_points - 1; xx >= 0; xx--)
2043
-            #else
2044
               for (xx = 0; xx < auto_bed_leveling_grid_points; xx++)
2048
               for (xx = 0; xx < auto_bed_leveling_grid_points; xx++)
2049
+            #else
2050
+              for (xx = auto_bed_leveling_grid_points - 1; xx >= 0; xx--)
2045
             #endif
2051
             #endif
2046
               {
2052
               {
2047
                 int ind =
2053
                 int ind =

+ 4
- 4
Marlin/vector_3.cpp View File

79
 {
79
 {
80
 	SERIAL_PROTOCOL(title);
80
 	SERIAL_PROTOCOL(title);
81
 	SERIAL_PROTOCOLPGM(" x: ");
81
 	SERIAL_PROTOCOLPGM(" x: ");
82
-	SERIAL_PROTOCOL(x);
82
+	SERIAL_PROTOCOL_F(x, 6);
83
 	SERIAL_PROTOCOLPGM(" y: ");
83
 	SERIAL_PROTOCOLPGM(" y: ");
84
-	SERIAL_PROTOCOL(y);
84
+	SERIAL_PROTOCOL_F(y, 6);
85
 	SERIAL_PROTOCOLPGM(" z: ");
85
 	SERIAL_PROTOCOLPGM(" z: ");
86
-	SERIAL_PROTOCOL(z);
86
+	SERIAL_PROTOCOL_F(z, 6);
87
 	SERIAL_EOL;
87
 	SERIAL_EOL;
88
 }
88
 }
89
 
89
 
150
   int count = 0;
150
   int count = 0;
151
   for(int i=0; i<3; i++) {
151
   for(int i=0; i<3; i++) {
152
     for(int j=0; j<3; j++) {
152
     for(int j=0; j<3; j++) {
153
-      SERIAL_PROTOCOL(matrix[count] + 0.0001);
153
+      SERIAL_PROTOCOL_F(matrix[count], 6);
154
       SERIAL_PROTOCOLPGM(" ");
154
       SERIAL_PROTOCOLPGM(" ");
155
       count++;
155
       count++;
156
     }
156
     }

Loading…
Cancel
Save