Browse Source

Make G29 What command print reliably and fix G29 P1 bug Waldo found

Roxy-3D 8 years ago
parent
commit
171904b6c7
1 changed files with 19 additions and 2 deletions
  1. 19
    2
      Marlin/UBL_G29.cpp

+ 19
- 2
Marlin/UBL_G29.cpp View File

@@ -748,7 +748,7 @@
748 748
           goto LEAVE;
749 749
         }
750 750
         const float measured_z = probe_pt(xProbe, yProbe, stow_probe, g29_verbose_level);
751
-        z_values[location.x_index][location.y_index] = measured_z + Z_PROBE_OFFSET_FROM_EXTRUDER;
751
+        z_values[location.x_index][location.y_index] = measured_z + zprobe_zoffset;
752 752
       }
753 753
 
754 754
       if (do_ubl_mesh_map) ubl.display_map(map_type);
@@ -1108,7 +1108,10 @@
1108 1108
     statistics_flag++;
1109 1109
 
1110 1110
     SERIAL_PROTOCOLPGM("Unified Bed Leveling System Version 1.00 ");
1111
-    ubl.state.active ? SERIAL_PROTOCOLCHAR('A') : SERIAL_PROTOCOLPGM("In");
1111
+    if (ubl.state.active)  
1112
+      SERIAL_PROTOCOLCHAR('A');
1113
+    else
1114
+      SERIAL_PROTOCOLPGM("In");
1112 1115
     SERIAL_PROTOCOLLNPGM("ctive.\n");
1113 1116
     delay(50);
1114 1117
 
@@ -1120,6 +1123,7 @@
1120 1123
       SERIAL_PROTOCOLPGM(" Loaded.");
1121 1124
     }
1122 1125
     SERIAL_EOL;
1126
+    delay(50);
1123 1127
 
1124 1128
     #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
1125 1129
       SERIAL_PROTOCOLPAIR("g29_correction_fade_height : ", ubl.state.g29_correction_fade_height);
@@ -1129,11 +1133,13 @@
1129 1133
     SERIAL_PROTOCOLPGM("z_offset: ");
1130 1134
     SERIAL_PROTOCOL_F(ubl.state.z_offset, 6);
1131 1135
     SERIAL_EOL;
1136
+    delay(50);
1132 1137
 
1133 1138
     SERIAL_PROTOCOLPGM("X-Axis Mesh Points at: ");
1134 1139
     for (uint8_t i = 0; i < UBL_MESH_NUM_X_POINTS; i++) {
1135 1140
       SERIAL_PROTOCOL_F( ubl.map_x_index_to_bed_location(i), 1);
1136 1141
       SERIAL_PROTOCOLPGM("  ");
1142
+      delay(50);
1137 1143
     }
1138 1144
     SERIAL_EOL;
1139 1145
 
@@ -1141,6 +1147,7 @@
1141 1147
     for (uint8_t i = 0; i < UBL_MESH_NUM_Y_POINTS; i++) {
1142 1148
       SERIAL_PROTOCOL_F( ubl.map_y_index_to_bed_location(i), 1);
1143 1149
       SERIAL_PROTOCOLPGM("  ");
1150
+      delay(50);
1144 1151
     }
1145 1152
     SERIAL_EOL;
1146 1153
 
@@ -1149,11 +1156,13 @@
1149 1156
       SERIAL_PROTOCOLLNPAIR("  state:", READ(KILL_PIN));
1150 1157
     #endif
1151 1158
     SERIAL_EOL;
1159
+    delay(50);
1152 1160
 
1153 1161
     SERIAL_PROTOCOLLNPAIR("ubl_state_at_invocation :", ubl_state_at_invocation);
1154 1162
     SERIAL_EOL;
1155 1163
     SERIAL_PROTOCOLLNPAIR("ubl_state_recursion_chk :", ubl_state_recursion_chk);
1156 1164
     SERIAL_EOL;
1165
+    delay(50);
1157 1166
     SERIAL_PROTOCOLPGM("Free EEPROM space starts at: 0x");
1158 1167
     prt_hex_word(ubl_eeprom_start);
1159 1168
     SERIAL_EOL;
@@ -1161,34 +1170,42 @@
1161 1170
     SERIAL_PROTOCOLPGM("end of EEPROM              : ");
1162 1171
     prt_hex_word(E2END);
1163 1172
     SERIAL_EOL;
1173
+    delay(50);
1164 1174
 
1165 1175
     SERIAL_PROTOCOLLNPAIR("sizeof(ubl) :  ", (int)sizeof(ubl));
1166 1176
     SERIAL_EOL;
1167 1177
     SERIAL_PROTOCOLLNPAIR("z_value[][] size: ", (int)sizeof(z_values));
1168 1178
     SERIAL_EOL;
1179
+    delay(50);
1169 1180
 
1170 1181
     SERIAL_PROTOCOLPGM("EEPROM free for UBL: 0x");
1171 1182
     prt_hex_word(k);
1172 1183
     SERIAL_EOL;
1184
+    delay(50);
1173 1185
 
1174 1186
     SERIAL_PROTOCOLPGM("EEPROM can hold 0x");
1175 1187
     prt_hex_word(k / sizeof(z_values));
1176 1188
     SERIAL_PROTOCOLLNPGM(" meshes.\n");
1189
+    delay(50);
1177 1190
 
1178 1191
     SERIAL_PROTOCOLPGM("sizeof(ubl.state) :");
1179 1192
     prt_hex_word(sizeof(ubl.state));
1180 1193
 
1181 1194
     SERIAL_PROTOCOLPAIR("\nUBL_MESH_NUM_X_POINTS  ", UBL_MESH_NUM_X_POINTS);
1182 1195
     SERIAL_PROTOCOLPAIR("\nUBL_MESH_NUM_Y_POINTS  ", UBL_MESH_NUM_Y_POINTS);
1196
+    delay(50);
1183 1197
     SERIAL_PROTOCOLPAIR("\nUBL_MESH_MIN_X         ", UBL_MESH_MIN_X);
1184 1198
     SERIAL_PROTOCOLPAIR("\nUBL_MESH_MIN_Y         ", UBL_MESH_MIN_Y);
1199
+    delay(50);
1185 1200
     SERIAL_PROTOCOLPAIR("\nUBL_MESH_MAX_X         ", UBL_MESH_MAX_X);
1186 1201
     SERIAL_PROTOCOLPAIR("\nUBL_MESH_MAX_Y         ", UBL_MESH_MAX_Y);
1202
+    delay(50);
1187 1203
     SERIAL_PROTOCOLPGM("\nMESH_X_DIST        ");
1188 1204
     SERIAL_PROTOCOL_F(MESH_X_DIST, 6);
1189 1205
     SERIAL_PROTOCOLPGM("\nMESH_Y_DIST        ");
1190 1206
     SERIAL_PROTOCOL_F(MESH_Y_DIST, 6);
1191 1207
     SERIAL_EOL;
1208
+    delay(50);
1192 1209
 
1193 1210
     if (!ubl.sanity_check())
1194 1211
       SERIAL_PROTOCOLLNPGM("Unified Bed Leveling sanity checks passed.");

Loading…
Cancel
Save