From 1d3176cd9f747d2345d16e2569a684517316b883 Mon Sep 17 00:00:00 2001
From: teachingtechYT <lawgicau@gmail.com>
Date: Mon, 23 Aug 2021 17:50:17 +1000
Subject: [PATCH] Fix custom feedrate ignored in first layer test

---
 js/gcodeprocessing.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/js/gcodeprocessing.js b/js/gcodeprocessing.js
index 1ff24eb..7be5f01 100644
--- a/js/gcodeprocessing.js
+++ b/js/gcodeprocessing.js
@@ -333,12 +333,25 @@ function processGcode(formName) {
             squares += square;
         }
         gcode = gcode+squares;
+        if(feedMod != 1){
+            var gcodeArray = gcode.split(/\n/g);
+            var regexp = /F[0-9]+/;
+            gcodeArray.forEach(function(index, item){
+                if(gcodeArray[item].search(/F/) > -1){
+                    var value = parseFloat(gcodeArray[item].match(regexp)[0].substring(1));
+                    if(value != 1200){
+                        gcodeArray[item] = gcodeArray[item].replace(regexp, "F"+String(value*feedMod)+" ; custom feedrate")
+                    }
+                }
+            });
+            gcode = gcodeArray.join("\n");
+        }
         gcode = gcode.replace(/;retract1\nG1 Z[0-9\.]+ F1200/g, ";retract1\n;zhop1");
             if(zhop > 0){
                 gcode = gcode.replace(/;zhop1/g, "G91;\nG1 Z"+zhop+" F1200; custom z hop\nG90;");
             }  
-            gcode = gcode.replace(/;retract1/g, "G1 E-"+retDist+" F"+retSpeed+" ; custom retraction");
-            gcode = gcode.replace(/;unretract1/g, "G1 E"+retDistExtra+" F"+retSpeed+" ; custom un-retraction/prime");
+        gcode = gcode.replace(/;retract1/g, "G1 E-"+retDist+" F"+retSpeed+" ; custom retraction");
+        gcode = gcode.replace(/;unretract1/g, "G1 E"+retDistExtra+" F"+retSpeed+" ; custom un-retraction/prime");
     }
     // assign correct gcode source
     if(name == "baselineForm"){