btach/MarlinFirmware
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

♻️ String helper class (#24390)

Browse source
This commit is contained in:
Scott Lahteine 2023-06-27 13:19:36 -05:00 • committed by GitHub
parent 4a734e4de4
commit 574dd34c49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 955 additions and 598 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Marlin/src/gcode/probe/G30.cpp
View file

@ -76,18 +76,18 @@ void GcodeSuite::G30() {
const ProbePtRaise raise_after = parser.boolval('E', true) ? PROBE_PT_STOW : PROBE_PT_NONE;
TERN_(HAS_PTC, ptc.set_enabled(!parser.seen('C') || parser.value_bool()));
TERN_(HAS_PTC, ptc.set_enabled(parser.boolval('C', true)));
const float measured_z = probe.probe_at_point(probepos, raise_after);
TERN_(HAS_PTC, ptc.set_enabled(true));
if (!isnan(measured_z)) {
SERIAL_ECHOLNPGM("Bed X: ", probepos.asLogical().x, " Y: ", probepos.asLogical().y, " Z: ", measured_z);
const xy_pos_t lpos = probepos.asLogical();
SString<30> msg(
F("Bed X:"), p_float_t(lpos.x, 1),
F( " Y:"), p_float_t(lpos.y, 1),
F( " Z:"), p_float_t(measured_z, 2)
);
msg.echoln();
#if ANY(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
char msg[31], str_1[6], str_2[6], str_3[6];
sprintf_P(msg, PSTR("X:%s, Y:%s, Z:%s"),
dtostrf(probepos.x, 1, 1, str_1),
dtostrf(probepos.y, 1, 1, str_2),
dtostrf(measured_z, 1, 2, str_3)
);
ui.set_status(msg);
#endif
}