Browse Source

Reduce MBL eeprom read code

Scott Lahteine 9 years ago
parent
commit
fb379384ee
1 changed files with 11 additions and 20 deletions
  1. 11
    20
      Marlin/configuration_store.cpp

+ 11
- 20
Marlin/configuration_store.cpp View File

@@ -325,30 +325,21 @@ void Config_RetrieveSettings() {
325 325
     EEPROM_READ_VAR(i, max_e_jerk);
326 326
     EEPROM_READ_VAR(i, home_offset);
327 327
 
328
-    uint8_t mesh_num_x = 0;
329
-    uint8_t mesh_num_y = 0;
328
+    uint8_t dummy_uint8 = 0, mesh_num_x = 0, mesh_num_y = 0;
329
+    EEPROM_READ_VAR(i, dummy_uint8);
330
+    EEPROM_READ_VAR(i, mesh_num_x);
331
+    EEPROM_READ_VAR(i, mesh_num_y);
330 332
     #ifdef MESH_BED_LEVELING
331
-      EEPROM_READ_VAR(i, mbl.active);
332
-      EEPROM_READ_VAR(i, mesh_num_x);
333
-      EEPROM_READ_VAR(i, mesh_num_y);
334
-      if (mesh_num_x != MESH_NUM_X_POINTS ||
335
-          mesh_num_y != MESH_NUM_Y_POINTS) {
336
-        mbl.reset();
337
-        for (int q=0; q<mesh_num_x*mesh_num_y; q++) {
338
-          EEPROM_READ_VAR(i, dummy);
339
-        }
340
-      } else {
333
+      mbl.active = dummy_uint8;
334
+      if (mesh_num_x == MESH_NUM_X_POINTS && mesh_num_y == MESH_NUM_Y_POINTS) {
341 335
         EEPROM_READ_VAR(i, mbl.z_values);
336
+      } else {
337
+        mbl.reset();
338
+        for (int q = 0; q < mesh_num_x * mesh_num_y; q++) EEPROM_READ_VAR(i, dummy);
342 339
       }
343 340
     #else
344
-      uint8_t dummy_uint8 = 0;
345
-      EEPROM_READ_VAR(i, dummy_uint8);
346
-      EEPROM_READ_VAR(i, mesh_num_x);
347
-      EEPROM_READ_VAR(i, mesh_num_y);
348
-      for (int q=0; q<mesh_num_x*mesh_num_y; q++) {
349
-        EEPROM_READ_VAR(i, dummy);
350
-      }
351
-    #endif  // MESH_BED_LEVELING
341
+      for (int q = 0; q < mesh_num_x * mesh_num_y; q++) EEPROM_READ_VAR(i, dummy);
342
+    #endif // MESH_BED_LEVELING
352 343
 
353 344
     #ifndef ENABLE_AUTO_BED_LEVELING
354 345
       float zprobe_zoffset = 0;

Loading…
Cancel
Save