From 6e42c9e30506faad87d058929ff85ee233a6db28 Mon Sep 17 00:00:00 2001 From: Matthew Schick Date: Sun, 16 Mar 2014 12:00:02 -0400 Subject: [PATCH 1/2] Add fwretract settings to M503 output --- Marlin/ConfigurationStore.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Marlin/ConfigurationStore.cpp b/Marlin/ConfigurationStore.cpp index 54e69c013..ff0de54ba 100644 --- a/Marlin/ConfigurationStore.cpp +++ b/Marlin/ConfigurationStore.cpp @@ -199,6 +199,21 @@ SERIAL_ECHOLNPGM("Scaling factors:"); SERIAL_ECHOPAIR(" D" ,unscalePID_d(Kd)); SERIAL_ECHOLN(""); #endif +#ifdef FWRETRACT + SERIAL_ECHO_START; + SERIAL_ECHOLNPGM("Retract: S=Length (mm) F:Speed (mm/m) Z: ZLift (mm)"); + SERIAL_ECHO_START; + SERIAL_ECHOPAIR(" M207 S",retract_length); + SERIAL_ECHOPAIR(" F" ,retract_feedrate); + SERIAL_ECHOPAIR(" Z" ,retract_zlift); + SERIAL_ECHOLN(""); + SERIAL_ECHO_START; + SERIAL_ECHOLNPGM("Recover: S=Extra length (mm) F:Speed (mm/m)"); + SERIAL_ECHO_START; + SERIAL_ECHOPAIR(" M208 S",retract_recover_length); + SERIAL_ECHOPAIR(" F" ,retract_recover_feedrate); + SERIAL_ECHOLN(""); +#endif } #endif From 0468f819504eeeada692ca180d94d93597113814 Mon Sep 17 00:00:00 2001 From: Matthew Schick Date: Fri, 4 Apr 2014 11:37:46 -0400 Subject: [PATCH 2/2] Update for pull request #837 --- Marlin/ConfigurationStore.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/ConfigurationStore.cpp b/Marlin/ConfigurationStore.cpp index ff0de54ba..20e68d09e 100644 --- a/Marlin/ConfigurationStore.cpp +++ b/Marlin/ConfigurationStore.cpp @@ -204,14 +204,14 @@ SERIAL_ECHOLNPGM("Scaling factors:"); SERIAL_ECHOLNPGM("Retract: S=Length (mm) F:Speed (mm/m) Z: ZLift (mm)"); SERIAL_ECHO_START; SERIAL_ECHOPAIR(" M207 S",retract_length); - SERIAL_ECHOPAIR(" F" ,retract_feedrate); + SERIAL_ECHOPAIR(" F" ,retract_feedrate*60); SERIAL_ECHOPAIR(" Z" ,retract_zlift); SERIAL_ECHOLN(""); SERIAL_ECHO_START; SERIAL_ECHOLNPGM("Recover: S=Extra length (mm) F:Speed (mm/m)"); SERIAL_ECHO_START; SERIAL_ECHOPAIR(" M208 S",retract_recover_length); - SERIAL_ECHOPAIR(" F" ,retract_recover_feedrate); + SERIAL_ECHOPAIR(" F" ,retract_recover_feedrate*60); SERIAL_ECHOLN(""); #endif }