Преглед изворни кода

Remove "ubl." prefix from calls within ubl method

Scott Lahteine пре 7 година
родитељ
комит
0fef9a2983
1 измењених фајлова са 17 додато и 17 уклоњено
  1. 17
    17
      Marlin/ubl_G29.cpp

+ 17
- 17
Marlin/ubl_G29.cpp Прегледај датотеку

@@ -1152,17 +1152,17 @@
1152 1152
 
1153 1153
     say_ubl_name();
1154 1154
     SERIAL_PROTOCOLPGM("System Version " UBL_VERSION " ");
1155
-    if (ubl.state.active)
1155
+    if (state.active)
1156 1156
       SERIAL_PROTOCOLCHAR('A');
1157 1157
     else
1158 1158
       SERIAL_PROTOCOLPGM("Ina");
1159 1159
     SERIAL_PROTOCOLLNPGM("ctive.\n");
1160 1160
     safe_delay(50);
1161 1161
 
1162
-    if (ubl.state.eeprom_storage_slot == -1)
1162
+    if (state.eeprom_storage_slot == -1)
1163 1163
       SERIAL_PROTOCOLPGM("No Mesh Loaded.");
1164 1164
     else {
1165
-      SERIAL_PROTOCOLPAIR("Mesh ", ubl.state.eeprom_storage_slot);
1165
+      SERIAL_PROTOCOLPAIR("Mesh ", state.eeprom_storage_slot);
1166 1166
       SERIAL_PROTOCOLPGM(" Loaded.");
1167 1167
     }
1168 1168
     SERIAL_EOL;
@@ -1179,7 +1179,7 @@
1179 1179
     SERIAL_PROTOCOL_F(zprobe_zoffset, 7);
1180 1180
     SERIAL_EOL;
1181 1181
 
1182
-    SERIAL_PROTOCOLLNPAIR("ubl.eeprom_start=", hex_address((void*)ubl.eeprom_start));
1182
+    SERIAL_PROTOCOLLNPAIR("ubl.eeprom_start=", hex_address((void*)eeprom_start));
1183 1183
 
1184 1184
     SERIAL_ECHOLNPAIR("GRID_MAX_POINTS_X  ", GRID_MAX_POINTS_X);
1185 1185
     SERIAL_ECHOLNPAIR("GRID_MAX_POINTS_Y  ", GRID_MAX_POINTS_Y);
@@ -1191,7 +1191,7 @@
1191 1191
 
1192 1192
     SERIAL_PROTOCOLPGM("X-Axis Mesh Points at: ");
1193 1193
     for (uint8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
1194
-      SERIAL_PROTOCOL_F(LOGICAL_X_POSITION(pgm_read_float(&ubl.mesh_index_to_xpos[i])), 3);
1194
+      SERIAL_PROTOCOL_F(LOGICAL_X_POSITION(pgm_read_float(&mesh_index_to_xpos[i])), 3);
1195 1195
       SERIAL_PROTOCOLPGM("  ");
1196 1196
       safe_delay(25);
1197 1197
     }
@@ -1199,26 +1199,26 @@
1199 1199
 
1200 1200
     SERIAL_PROTOCOLPGM("Y-Axis Mesh Points at: ");
1201 1201
     for (uint8_t i = 0; i < GRID_MAX_POINTS_Y; i++) {
1202
-      SERIAL_PROTOCOL_F(LOGICAL_Y_POSITION(pgm_read_float(&ubl.mesh_index_to_ypos[i])), 3);
1202
+      SERIAL_PROTOCOL_F(LOGICAL_Y_POSITION(pgm_read_float(&mesh_index_to_ypos[i])), 3);
1203 1203
       SERIAL_PROTOCOLPGM("  ");
1204 1204
       safe_delay(25);
1205 1205
     }
1206 1206
     SERIAL_EOL;
1207 1207
 
1208
-    SERIAL_PROTOCOLLNPAIR("Free EEPROM space starts at: ", hex_address((void*)ubl.eeprom_start));
1208
+    SERIAL_PROTOCOLLNPAIR("Free EEPROM space starts at: ", hex_address((void*)eeprom_start));
1209 1209
     SERIAL_PROTOCOLLNPAIR("end of EEPROM: ", hex_address((void*)E2END));
1210 1210
     safe_delay(25);
1211 1211
 
1212
-    SERIAL_PROTOCOLPAIR("sizeof(ubl.state) : ", (int)sizeof(ubl.state));
1212
+    SERIAL_PROTOCOLPAIR("sizeof(ubl.state) : ", (int)sizeof(state));
1213 1213
     SERIAL_EOL;
1214
-    SERIAL_PROTOCOLLNPAIR("z_value[][] size: ", (int)sizeof(ubl.z_values));
1214
+    SERIAL_PROTOCOLLNPAIR("z_value[][] size: ", (int)sizeof(z_values));
1215 1215
     SERIAL_EOL;
1216 1216
     safe_delay(25);
1217 1217
 
1218 1218
     SERIAL_PROTOCOLLNPAIR("EEPROM free for UBL: ", hex_address((void*)k));
1219 1219
     safe_delay(25);
1220 1220
 
1221
-    SERIAL_PROTOCOLPAIR("EEPROM can hold ", k / sizeof(ubl.z_values));
1221
+    SERIAL_PROTOCOLPAIR("EEPROM can hold ", k / sizeof(z_values));
1222 1222
     SERIAL_PROTOCOLLNPGM(" meshes.\n");
1223 1223
     safe_delay(25);
1224 1224
 
@@ -1239,7 +1239,7 @@
1239 1239
     SERIAL_ECHOLNPAIR("=", UBL_MESH_MAX_Y);
1240 1240
     safe_delay(25);
1241 1241
 
1242
-    if (!ubl.sanity_check()) {
1242
+    if (!sanity_check()) {
1243 1243
       say_ubl_name();
1244 1244
       SERIAL_PROTOCOLLNPGM("sanity checks passed.");
1245 1245
     }
@@ -1554,11 +1554,11 @@
1554 1554
             SERIAL_ECHOPGM(")   measured: ");
1555 1555
             SERIAL_PROTOCOL_F(measured_z, 7);
1556 1556
             SERIAL_ECHOPGM("   correction: ");
1557
-            SERIAL_PROTOCOL_F(ubl.get_z_correction(LOGICAL_X_POSITION(x), LOGICAL_Y_POSITION(y)), 7);
1557
+            SERIAL_PROTOCOL_F(get_z_correction(LOGICAL_X_POSITION(x), LOGICAL_Y_POSITION(y)), 7);
1558 1558
           }
1559 1559
         #endif
1560 1560
 
1561
-        measured_z -= ubl.get_z_correction(LOGICAL_X_POSITION(x), LOGICAL_Y_POSITION(y)) /* + zprobe_zoffset */ ;
1561
+        measured_z -= get_z_correction(LOGICAL_X_POSITION(x), LOGICAL_Y_POSITION(y)) /* + zprobe_zoffset */ ;
1562 1562
 
1563 1563
         #if ENABLED(DEBUG_LEVELING_FEATURE)
1564 1564
           if (DEBUGGING(LEVELING)) {
@@ -1605,9 +1605,9 @@
1605 1605
 
1606 1606
     for (uint8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
1607 1607
       for (uint8_t j = 0; j < GRID_MAX_POINTS_Y; j++) {
1608
-        float x_tmp = pgm_read_float(&ubl.mesh_index_to_xpos[i]),
1609
-              y_tmp = pgm_read_float(&ubl.mesh_index_to_ypos[j]),
1610
-              z_tmp = ubl.z_values[i][j];
1608
+        float x_tmp = pgm_read_float(&mesh_index_to_xpos[i]),
1609
+              y_tmp = pgm_read_float(&mesh_index_to_ypos[j]),
1610
+              z_tmp = z_values[i][j];
1611 1611
 
1612 1612
         #if ENABLED(DEBUG_LEVELING_FEATURE)
1613 1613
           if (DEBUGGING(LEVELING)) {
@@ -1637,7 +1637,7 @@
1637 1637
           }
1638 1638
         #endif
1639 1639
 
1640
-        ubl.z_values[i][j] += z_tmp - lsf_results.D;
1640
+        z_values[i][j] += z_tmp - lsf_results.D;
1641 1641
       }
1642 1642
     }
1643 1643
 

Loading…
Откажи
Сачувај