From 589ad64a9795bb57f32cd0372f307702f45b22f1 Mon Sep 17 00:00:00 2001 From: Knutwurst <36196269+knutwurst@users.noreply.github.com> Date: Mon, 17 May 2021 19:01:20 +0200 Subject: [PATCH] Limit floating point conversion to two digits. Thanks to dkoch83. --- Marlin/src/inc/Version.h | 2 +- Marlin/src/lcd/anycubic_touchscreen.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index 6517f172..2b8a7a17 100755 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -44,7 +44,7 @@ #define CUSTOM_BUILD_VERSION "1.2.0-beta.4" #ifndef STRING_DISTRIBUTION_DATE - #define STRING_DISTRIBUTION_DATE "2021-05-16" + #define STRING_DISTRIBUTION_DATE "2021-05-17" #endif /** diff --git a/Marlin/src/lcd/anycubic_touchscreen.cpp b/Marlin/src/lcd/anycubic_touchscreen.cpp index 464578e2..52b7d6b7 100755 --- a/Marlin/src/lcd/anycubic_touchscreen.cpp +++ b/Marlin/src/lcd/anycubic_touchscreen.cpp @@ -1933,7 +1933,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() } } HARDWARE_SERIAL_PROTOCOLPGM("A29V "); - HARDWARE_SERIAL_PROTOCOL(ftostr32(Zvalue)); + HARDWARE_SERIAL_PROTOCOL_F((float)(Zvalue), 2); HARDWARE_SERIAL_ENTER(); } break; @@ -1961,7 +1961,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() refresh_bed_level(); HARDWARE_SERIAL_PROTOCOLPGM("A31V "); - HARDWARE_SERIAL_PROTOCOL(ftostr32(probe.offset.z)); + HARDWARE_SERIAL_PROTOCOL_F((float)(probe.offset.z), 2); HARDWARE_SERIAL_ENTER(); } @@ -1969,9 +1969,10 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() { SAVE_zprobe_zoffset = probe.offset.z; HARDWARE_SERIAL_PROTOCOLPGM("A31V "); - HARDWARE_SERIAL_PROTOCOL(ftostr32(SAVE_zprobe_zoffset)); + HARDWARE_SERIAL_PROTOCOL_F((float)(SAVE_zprobe_zoffset), 2); HARDWARE_SERIAL_ENTER(); } + if(CodeSeen('D')) { SAVE_zprobe_zoffset = probe.offset.z;