Skip to content

Commit 171904b

Browse files
committed
Make G29 What command print reliably and fix G29 P1 bug Waldo found
1 parent 9d3ac66 commit 171904b

File tree

1 file changed

+19
-2
lines changed

1 file changed

+19
-2
lines changed

Marlin/UBL_G29.cpp

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@
748748
goto LEAVE;
749749
}
750750
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;
752752
}
753753

754754
if (do_ubl_mesh_map) ubl.display_map(map_type);
@@ -1108,7 +1108,10 @@
11081108
statistics_flag++;
11091109

11101110
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");
11121115
SERIAL_PROTOCOLLNPGM("ctive.\n");
11131116
delay(50);
11141117

@@ -1120,6 +1123,7 @@
11201123
SERIAL_PROTOCOLPGM(" Loaded.");
11211124
}
11221125
SERIAL_EOL;
1126+
delay(50);
11231127

11241128
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
11251129
SERIAL_PROTOCOLPAIR("g29_correction_fade_height : ", ubl.state.g29_correction_fade_height);
@@ -1129,18 +1133,21 @@
11291133
SERIAL_PROTOCOLPGM("z_offset: ");
11301134
SERIAL_PROTOCOL_F(ubl.state.z_offset, 6);
11311135
SERIAL_EOL;
1136+
delay(50);
11321137

11331138
SERIAL_PROTOCOLPGM("X-Axis Mesh Points at: ");
11341139
for (uint8_t i = 0; i < UBL_MESH_NUM_X_POINTS; i++) {
11351140
SERIAL_PROTOCOL_F( ubl.map_x_index_to_bed_location(i), 1);
11361141
SERIAL_PROTOCOLPGM(" ");
1142+
delay(50);
11371143
}
11381144
SERIAL_EOL;
11391145

11401146
SERIAL_PROTOCOLPGM("Y-Axis Mesh Points at: ");
11411147
for (uint8_t i = 0; i < UBL_MESH_NUM_Y_POINTS; i++) {
11421148
SERIAL_PROTOCOL_F( ubl.map_y_index_to_bed_location(i), 1);
11431149
SERIAL_PROTOCOLPGM(" ");
1150+
delay(50);
11441151
}
11451152
SERIAL_EOL;
11461153

@@ -1149,46 +1156,56 @@
11491156
SERIAL_PROTOCOLLNPAIR(" state:", READ(KILL_PIN));
11501157
#endif
11511158
SERIAL_EOL;
1159+
delay(50);
11521160

11531161
SERIAL_PROTOCOLLNPAIR("ubl_state_at_invocation :", ubl_state_at_invocation);
11541162
SERIAL_EOL;
11551163
SERIAL_PROTOCOLLNPAIR("ubl_state_recursion_chk :", ubl_state_recursion_chk);
11561164
SERIAL_EOL;
1165+
delay(50);
11571166
SERIAL_PROTOCOLPGM("Free EEPROM space starts at: 0x");
11581167
prt_hex_word(ubl_eeprom_start);
11591168
SERIAL_EOL;
11601169

11611170
SERIAL_PROTOCOLPGM("end of EEPROM : ");
11621171
prt_hex_word(E2END);
11631172
SERIAL_EOL;
1173+
delay(50);
11641174

11651175
SERIAL_PROTOCOLLNPAIR("sizeof(ubl) : ", (int)sizeof(ubl));
11661176
SERIAL_EOL;
11671177
SERIAL_PROTOCOLLNPAIR("z_value[][] size: ", (int)sizeof(z_values));
11681178
SERIAL_EOL;
1179+
delay(50);
11691180

11701181
SERIAL_PROTOCOLPGM("EEPROM free for UBL: 0x");
11711182
prt_hex_word(k);
11721183
SERIAL_EOL;
1184+
delay(50);
11731185

11741186
SERIAL_PROTOCOLPGM("EEPROM can hold 0x");
11751187
prt_hex_word(k / sizeof(z_values));
11761188
SERIAL_PROTOCOLLNPGM(" meshes.\n");
1189+
delay(50);
11771190

11781191
SERIAL_PROTOCOLPGM("sizeof(ubl.state) :");
11791192
prt_hex_word(sizeof(ubl.state));
11801193

11811194
SERIAL_PROTOCOLPAIR("\nUBL_MESH_NUM_X_POINTS ", UBL_MESH_NUM_X_POINTS);
11821195
SERIAL_PROTOCOLPAIR("\nUBL_MESH_NUM_Y_POINTS ", UBL_MESH_NUM_Y_POINTS);
1196+
delay(50);
11831197
SERIAL_PROTOCOLPAIR("\nUBL_MESH_MIN_X ", UBL_MESH_MIN_X);
11841198
SERIAL_PROTOCOLPAIR("\nUBL_MESH_MIN_Y ", UBL_MESH_MIN_Y);
1199+
delay(50);
11851200
SERIAL_PROTOCOLPAIR("\nUBL_MESH_MAX_X ", UBL_MESH_MAX_X);
11861201
SERIAL_PROTOCOLPAIR("\nUBL_MESH_MAX_Y ", UBL_MESH_MAX_Y);
1202+
delay(50);
11871203
SERIAL_PROTOCOLPGM("\nMESH_X_DIST ");
11881204
SERIAL_PROTOCOL_F(MESH_X_DIST, 6);
11891205
SERIAL_PROTOCOLPGM("\nMESH_Y_DIST ");
11901206
SERIAL_PROTOCOL_F(MESH_Y_DIST, 6);
11911207
SERIAL_EOL;
1208+
delay(50);
11921209

11931210
if (!ubl.sanity_check())
11941211
SERIAL_PROTOCOLLNPGM("Unified Bed Leveling sanity checks passed.");

0 commit comments

Comments
 (0)