josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed 7x7 mesh bed leveling vs. Z calibration check

This commit is contained in:
PavelSindler 2019-03-14 14:48:01 +01:00
parent ef198856a4
commit 6e26f61726
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Firmware/Marlin_main.cpp
View File

@ -4472,16 +4472,17 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
} }
float z0 = 0.f; float z0 = 0.f;
if (has_z && (mesh_point > 0)) { if (has_z && (mesh_point > 0)) {
uint16_t z_offset_u = eeprom_read_word((uint16_t*)(EEPROM_BED_CALIBRATION_Z_JITTER + 2 * (ix + iy * 3 - 1))); uint16_t z_offset_u = 0;
if (nMeasPoints == 7) {
z_offset_u = eeprom_read_word((uint16_t*)(EEPROM_BED_CALIBRATION_Z_JITTER + 2 * ((ix/3) + iy - 1)));
}
else {
z_offset_u = eeprom_read_word((uint16_t*)(EEPROM_BED_CALIBRATION_Z_JITTER + 2 * (ix + iy * 3 - 1)));
}
z0 = mbl.z_values[0][0] + *reinterpret_cast<int16_t*>(&z_offset_u) * 0.01; z0 = mbl.z_values[0][0] + *reinterpret_cast<int16_t*>(&z_offset_u) * 0.01;
#ifdef SUPPORT_VERBOSITY #ifdef SUPPORT_VERBOSITY
if (verbosity_level >= 1) { if (verbosity_level >= 1) {
SERIAL_ECHOLNPGM(""); printf_P(PSTR("Bed leveling, point: %d, calibration Z stored in eeprom: %d, calibration z: %f \n"), mesh_point, z_offset_u, z0);
SERIAL_ECHOPGM("Bed leveling, point: ");
MYSERIAL.print(mesh_point);
SERIAL_ECHOPGM(", calibration z: ");
MYSERIAL.print(z0, 5);
SERIAL_ECHOLNPGM("");
} }
#endif // SUPPORT_VERBOSITY #endif // SUPPORT_VERBOSITY
} }