Browse Source

More robust MBL index / point conversion

Scott Lahteine 8 years ago
parent
commit
bc5a547d55
2 changed files with 20 additions and 17 deletions
  1. 2
    2
      Marlin/mesh_bed_leveling.cpp
  2. 18
    15
      Marlin/mesh_bed_leveling.h

+ 2
- 2
Marlin/mesh_bed_leveling.cpp View File

31
   void mesh_bed_leveling::reset() {
31
   void mesh_bed_leveling::reset() {
32
     active = 0;
32
     active = 0;
33
     z_offset = 0;
33
     z_offset = 0;
34
-    for (int y = 0; y < MESH_NUM_Y_POINTS; y++)
35
-      for (int x = 0; x < MESH_NUM_X_POINTS; x++)
34
+    for (int8_t y = MESH_NUM_Y_POINTS; y--;)
35
+      for (int8_t x = MESH_NUM_X_POINTS; x--;)
36
         z_values[y][x] = 0;
36
         z_values[y][x] = 0;
37
   }
37
   }
38
 
38
 

+ 18
- 15
Marlin/mesh_bed_leveling.h View File

37
 
37
 
38
     void reset();
38
     void reset();
39
 
39
 
40
-    float get_x(int i) { return MESH_MIN_X + (MESH_X_DIST) * i; }
41
-    float get_y(int i) { return MESH_MIN_Y + (MESH_Y_DIST) * i; }
42
-    void set_z(int ix, int iy, float z) { z_values[iy][ix] = z; }
40
+    static FORCE_INLINE float get_x(int8_t i) { return MESH_MIN_X + (MESH_X_DIST) * i; }
41
+    static FORCE_INLINE float get_y(int8_t i) { return MESH_MIN_Y + (MESH_Y_DIST) * i; }
42
+    void set_z(int8_t ix, int8_t iy, float z) { z_values[iy][ix] = z; }
43
 
43
 
44
-    inline void zigzag(int index, int &ix, int &iy) {
44
+    inline void zigzag(int8_t index, int8_t &ix, int8_t &iy) {
45
       ix = index % (MESH_NUM_X_POINTS);
45
       ix = index % (MESH_NUM_X_POINTS);
46
       iy = index / (MESH_NUM_X_POINTS);
46
       iy = index / (MESH_NUM_X_POINTS);
47
       if (iy & 1) ix = (MESH_NUM_X_POINTS - 1) - ix; // Zig zag
47
       if (iy & 1) ix = (MESH_NUM_X_POINTS - 1) - ix; // Zig zag
48
     }
48
     }
49
 
49
 
50
-    void set_zigzag_z(int index, float z) {
50
+    void set_zigzag_z(int8_t index, float z) {
51
       int ix, iy;
51
       int ix, iy;
52
       zigzag(index, ix, iy);
52
       zigzag(index, ix, iy);
53
       set_z(ix, iy, z);
53
       set_z(ix, iy, z);
54
     }
54
     }
55
 
55
 
56
-    int select_x_index(float x) {
57
-      int i = 1;
58
-      while (x > get_x(i) && i < MESH_NUM_X_POINTS - 1) i++;
59
-      return i - 1;
56
+    int8_t select_x_index(float x) {
57
+      for (uint8_t i = MESH_NUM_X_POINTS; i--;)
58
+        if (fabs(x - get_x(i)) <= (MESH_X_DIST) / 2)
59
+          return i;
60
+      return -1;
60
     }
61
     }
61
 
62
 
62
-    int select_y_index(float y) {
63
-      int i = 1;
64
-      while (y > get_y(i) && i < MESH_NUM_Y_POINTS - 1) i++;
65
-      return i - 1;
63
+    int8_t select_y_index(float y) {
64
+      for (uint8_t i = MESH_NUM_Y_POINTS; i--;)
65
+        if (fabs(y - get_y(i)) <= (MESH_Y_DIST) / 2)
66
+          return i;
67
+      return -1;
66
     }
68
     }
67
 
69
 
68
     float calc_z0(float a0, float a1, float z1, float a2, float z2) {
70
     float calc_z0(float a0, float a1, float z1, float a2, float z2) {
72
     }
74
     }
73
 
75
 
74
     float get_z(float x0, float y0) {
76
     float get_z(float x0, float y0) {
75
-      int x_index = select_x_index(x0);
76
-      int y_index = select_y_index(y0);
77
+      int8_t x_index = select_x_index(x0);
78
+      int8_t y_index = select_y_index(y0);
79
+      if (x_index < 0 || y_index < 0) return z_offset;
77
       float z1 = calc_z0(x0,
80
       float z1 = calc_z0(x0,
78
                          get_x(x_index), z_values[y_index][x_index],
81
                          get_x(x_index), z_values[y_index][x_index],
79
                          get_x(x_index + 1), z_values[y_index][x_index + 1]);
82
                          get_x(x_index + 1), z_values[y_index][x_index + 1]);

Loading…
Cancel
Save