bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Simpler Allen Key config. Fixes, cleanups from refactor (#15256)

Browse Source
This commit is contained in:
Scott Lahteine
2019-09-14 03:05:10 -05:00
committed by GitHub
parent ffb418b226
commit 465c6d9230
62 changed files with 389 additions and 685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Marlin/src/gcode/calibrate/G425.cpp
View File

@ -314,18 +314,16 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
// The difference between the known and the measured location
// of the calibration object is the positional error
m.pos_error[X_AXIS] =
#if HAS_X_CENTER
m.true_center[X_AXIS] - m.obj_center[X_AXIS];
#else
0;
#endif
m.pos_error[Y_AXIS] =
#if HAS_Y_CENTER
m.true_center[Y_AXIS] - m.obj_center[Y_AXIS];
#else
0;
#endif
m.pos_error[X_AXIS] = (0
#if HAS_X_CENTER
+ m.true_center[X_AXIS] - m.obj_center[X_AXIS]
#endif
);
m.pos_error[Y_AXIS] = (0
#if HAS_Y_CENTER
+ m.true_center[Y_AXIS] - m.obj_center[Y_AXIS]
#endif
);
m.pos_error[Z_AXIS] = m.true_center[Z_AXIS] - m.obj_center[Z_AXIS];
}
@ -394,13 +392,13 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
inline void report_measured_nozzle_dimensions(const measurements_t &m) {
SERIAL_ECHOLNPGM("Nozzle Tip Outer Dimensions:");
#if HAS_X_CENTER
SERIAL_ECHOLNPAIR(" X", m.nozzle_outer_dimension[X_AXIS]);
#else
UNUSED(m);
#endif
#if HAS_Y_CENTER
SERIAL_ECHOLNPAIR(" Y", m.nozzle_outer_dimension[Y_AXIS]);
#if HAS_X_CENTER || HAS_Y_CENTER
#if HAS_X_CENTER
SERIAL_ECHOLNPAIR(" X", m.nozzle_outer_dimension[X_AXIS]);
#endif
#if HAS_Y_CENTER
SERIAL_ECHOLNPAIR(" Y", m.nozzle_outer_dimension[Y_AXIS]);
#endif
#else
UNUSED(m);
#endif
@ -412,16 +410,11 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
// This function requires normalize_hotend_offsets() to be called
//
inline void report_hotend_offsets() {
for (uint8_t e = 1; e < HOTENDS; e++) {
SERIAL_ECHOPAIR("T", int(e));
SERIAL_ECHOLNPGM(" Hotend Offset:");
SERIAL_ECHOLNPAIR(" X: ", hotend_offset[X_AXIS][e]);
SERIAL_ECHOLNPAIR(" Y: ", hotend_offset[Y_AXIS][e]);
SERIAL_ECHOLNPAIR(" Z: ", hotend_offset[Z_AXIS][e]);
SERIAL_EOL();
}
for (uint8_t e = 1; e < HOTENDS; e++)
SERIAL_ECHOLNPAIR("T", int(e), " Hotend Offset X", hotend_offset[X_AXIS][e], " Y", hotend_offset[Y_AXIS][e], " Z", hotend_offset[Z_AXIS][e]);
}
#endif
#endif // CALIBRATION_REPORTING
/**