|
@@ -37,7 +37,7 @@
|
37
|
37
|
*/
|
38
|
38
|
|
39
|
39
|
// Change EEPROM version if the structure changes
|
40
|
|
-#define EEPROM_VERSION "V73"
|
|
40
|
+#define EEPROM_VERSION "V74"
|
41
|
41
|
#define EEPROM_OFFSET 100
|
42
|
42
|
|
43
|
43
|
// Check the integrity of data offsets.
|
|
@@ -192,7 +192,7 @@ typedef struct SettingsDataStruct {
|
192
|
192
|
// AUTO_BED_LEVELING_BILINEAR
|
193
|
193
|
//
|
194
|
194
|
uint8_t grid_max_x, grid_max_y; // GRID_MAX_POINTS_X, GRID_MAX_POINTS_Y
|
195
|
|
- xy_int_t bilinear_grid_spacing, bilinear_start; // G29 L F
|
|
195
|
+ xy_pos_t bilinear_grid_spacing, bilinear_start; // G29 L F
|
196
|
196
|
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
197
|
197
|
bed_mesh_t z_values; // G29
|
198
|
198
|
#else
|
|
@@ -658,7 +658,7 @@ void MarlinSettings::postprocess() {
|
658
|
658
|
#else
|
659
|
659
|
// For disabled Bilinear Grid write an empty 3x3 grid
|
660
|
660
|
const uint8_t grid_max_x = 3, grid_max_y = 3;
|
661
|
|
- const xy_int_t bilinear_start{0}, bilinear_grid_spacing{0};
|
|
661
|
+ const xy_pos_t bilinear_start{0}, bilinear_grid_spacing{0};
|
662
|
662
|
dummy = 0;
|
663
|
663
|
EEPROM_WRITE(grid_max_x);
|
664
|
664
|
EEPROM_WRITE(grid_max_y);
|
|
@@ -1469,7 +1469,7 @@ void MarlinSettings::postprocess() {
|
1469
|
1469
|
#endif // AUTO_BED_LEVELING_BILINEAR
|
1470
|
1470
|
{
|
1471
|
1471
|
// Skip past disabled (or stale) Bilinear Grid data
|
1472
|
|
- xy_int_t bgs, bs;
|
|
1472
|
+ xy_pos_t bgs, bs;
|
1473
|
1473
|
EEPROM_READ(bgs);
|
1474
|
1474
|
EEPROM_READ(bs);
|
1475
|
1475
|
for (uint16_t q = grid_max_x * grid_max_y; q--;) EEPROM_READ(dummy);
|