From adb2ac474749b76005e614c4bbaa1f564733e62d Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 22 Jan 2018 08:09:36 -0600 Subject: [PATCH 1/2] Fix skew settings report precision --- Marlin/src/module/configuration_store.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp index 74224abf0a..1f8921f206 100644 --- a/Marlin/src/module/configuration_store.cpp +++ b/Marlin/src/module/configuration_store.cpp @@ -2268,9 +2268,12 @@ void MarlinSettings::reset( #if ENABLED(SKEW_CORRECTION_FOR_Z) SERIAL_ECHO_P(port, " M852 I"); SERIAL_ECHO_F_P(port, LINEAR_UNIT(planner.xy_skew_factor), 6); - SERIAL_ECHOPAIR_P(port, " J", LINEAR_UNIT(planner.xz_skew_factor)); - SERIAL_ECHOLNPAIR_P(port, " K", LINEAR_UNIT(planner.yz_skew_factor)); - #else + SERIAL_ECHOPGM_P(port, " J"); + SERIAL_ECHO_F_P(port, LINEAR_UNIT(planner.xz_skew_factor), 6); + SERIAL_ECHOPGM_P(port, " K"); + SERIAL_ECHO_F_P(port, LINEAR_UNIT(planner.yz_skew_factor), 6); + SERIAL_EOL_P(port); + #else SERIAL_ECHO_P(port, " M852 S"); SERIAL_ECHO_F_P(port, LINEAR_UNIT(planner.xy_skew_factor), 6); SERIAL_EOL_P(port); From 2ebf52e57d2762d214c7ee48cc2aeeda30803a05 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 22 Jan 2018 08:19:44 -0600 Subject: [PATCH 2/2] Fix Skew Correction pre-calculation overflow error --- Marlin/src/inc/Conditionals_post.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index d0b19dde88..1a5c410904 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -911,7 +911,7 @@ #define _GET_SIDE(a,b,c) (SQRT(2*sq(a)+2*sq(b)-4*sq(c))*0.5) #define _SKEW_SIDE(a,b,c) tan(M_PI*0.5-acos((sq(a)-sq(b)-sq(c))/(2*c*b))) - #define _SKEW_FACTOR(a,b,c) _SKEW_SIDE(a,_GET_SIDE(a,b,c),c) + #define _SKEW_FACTOR(a,b,c) _SKEW_SIDE(float(a),_GET_SIDE(float(a),float(b),float(c)),float(c)) #ifndef XY_SKEW_FACTOR constexpr float XY_SKEW_FACTOR = (