From 929e1de2536b89f42e4b25dab5ad079fec86f74b Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 14 Sep 2017 20:33:25 +0200 Subject: [PATCH 1/3] special variable for saving/restoring feedmultiply using M220 --- Firmware/Marlin_main.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 3496a971c..16ddb4f15 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -394,6 +394,8 @@ static bool saved_extruder_relative_mode = false; static int saved_fanSpeed = 0; //!< Print fan speed //! @} +static int saved_feedmultiply_mm = 100; + //=========================================================================== //=============================Routines====================================== //=========================================================================== @@ -6082,8 +6084,12 @@ Sigma_Exit: { if(code_seen('S')) { + saved_feedmultiply_mm = feedmultiply; feedmultiply = code_value() ; } + if (code_seen('R')) { //restore previous feedmultiply + feedmultiply = saved_feedmultiply_mm; + } } break; case 221: // M221 S- set extrude factor override percentage From 8e239ce76f54ea0b261e3b4e7d3f0cdd30cec9a0 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 15 Sep 2017 11:29:35 +0200 Subject: [PATCH 2/3] changed M220 --- Firmware/Marlin_main.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 16ddb4f15..496f02032 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6080,11 +6080,15 @@ Sigma_Exit: SERIAL_ECHOLN(""); }break; #endif + case 220: // M220 S- set speed factor override percentage { - if(code_seen('S')) - { + if (code_seen('B')) //backup current speed factor + { saved_feedmultiply_mm = feedmultiply; + } + if(code_seen('S')) + { feedmultiply = code_value() ; } if (code_seen('R')) { //restore previous feedmultiply From d1d4a8c58cb11ad274ce4a8285e298e9a3de7906 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 29 Nov 2018 17:33:36 +0100 Subject: [PATCH 3/3] whitespace --- Firmware/Marlin_main.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 496f02032..25c005c59 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6083,17 +6083,17 @@ Sigma_Exit: case 220: // M220 S- set speed factor override percentage { - if (code_seen('B')) //backup current speed factor - { - saved_feedmultiply_mm = feedmultiply; - } + if (code_seen('B')) //backup current speed factor + { + saved_feedmultiply_mm = feedmultiply; + } if(code_seen('S')) { feedmultiply = code_value() ; } - if (code_seen('R')) { //restore previous feedmultiply - feedmultiply = saved_feedmultiply_mm; - } + if (code_seen('R')) { //restore previous feedmultiply + feedmultiply = saved_feedmultiply_mm; + } } break; case 221: // M221 S- set extrude factor override percentage