From 7d553fcf9e02a5d9f4d76c72dc843a9fd7d5ac35 Mon Sep 17 00:00:00 2001
From: lawgicau <lawgicau@gmail.com>
Date: Sun, 16 Aug 2020 14:20:15 +1000
Subject: [PATCH] Rewrite temp change logic to avoid possible double up and
 ignored user values

---
 js/gcodeprocessing.js | 24 ++++++++++++------------
 js/temperature.js     | 12 ++++++------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/js/gcodeprocessing.js b/js/gcodeprocessing.js
index 46bc01b..358d9dd 100644
--- a/js/gcodeprocessing.js
+++ b/js/gcodeprocessing.js
@@ -322,10 +322,10 @@ function processTemperature(){
     if(abl == 4){
         temperature = temperature.replace(/G28 ; home all axes/, "M109 S170 T0 ; probing temperature\nG28 ; home all");
         temperature = temperature.replace(/;G29 ; probe ABL/, "G29 ; probe ABL");
-        temperature = temperature.replace(/;M420 S1 ; restore ABL mesh/, "M109 S500 T0");
+        temperature = temperature.replace(/;M420 S1 ; restore ABL mesh/, "tempmini");
     }
-    temperature = temperature.replace(/M140 S60/g, "M140 S"+bedTemp);
-    temperature = temperature.replace(/M190 S60/g, "M190 S"+bedTemp);
+    temperature = temperature.replace(/M140 S60/, "M140 S"+bedTemp);
+    temperature = temperature.replace(/M190 S60/, "M190 S"+bedTemp);
     temperature = temperature.replace(/G1 E-5.0000 F2400/g, "G1 E-"+retDist+" F"+retSpeed);
     temperature = temperature.replace(/G1 E0.0000 F2400/g, "G1 E0.0000 F"+retSpeed);
 
@@ -371,17 +371,17 @@ function processTemperature(){
         }   
     }
     if(abl != 4){
-        temperature = temperature.replace(/M104 S190/g, "M104 S"+a1);
-        temperature = temperature.replace(/M109 S190/g, "M109 S"+a1);
+        temperature = temperature.replace(/temp1a/, "M104 S"+a1+" T0");
+        temperature = temperature.replace(/temp1b/, "M109 S"+a1+" T0");
     } else {
-        temperature = temperature.replace(/M104 S190/g, "; Prusa Mini");
-        temperature = temperature.replace(/M109 S190/g, "; Prusa Mini");
-        temperature = temperature.replace(/M109 S500/g, "M109 S"+a1);
+        temperature = temperature.replace(/temp1a/, "; Prusa Mini");
+        temperature = temperature.replace(/temp1b/, "; Prusa Mini");
+        temperature = temperature.replace(/tempmini/, "M109 S"+a1+" T0");
     }
-    temperature = temperature.replace(/M104 S195/g, "M104 S"+b1);
-    temperature = temperature.replace(/M104 S200/g, "M104 S"+c1);
-    temperature = temperature.replace(/M104 S205/g, "M104 S"+d1);
-    temperature = temperature.replace(/M104 S210/g, "M104 S"+e1);
+    temperature = temperature.replace(/temp2/, "M104 S"+b1+" T0");
+    temperature = temperature.replace(/temp3/, "M104 S"+c1+" T0");
+    temperature = temperature.replace(/temp4/, "M104 S"+d1+" T0");
+    temperature = temperature.replace(/temp5/, "M104 S"+e1+" T0");
     downloadFile('temperature.gcode', temperature);
 }
 
diff --git a/js/temperature.js b/js/temperature.js
index 03d222d..7049de9 100644
--- a/js/temperature.js
+++ b/js/temperature.js
@@ -4,8 +4,8 @@ M82
 M106 S0
 M140 S60
 M190 S60
-M104 S190 T0
-M109 S190 T0
+temp1a
+temp1b
 G28 ; home all axes
 ;G29 ; probe ABL
 ;M420 S1 ; restore ABL mesh 
@@ -8154,7 +8154,7 @@ G92 E0.0000
 G1 E-5.0000 F2400
 ; process Color1-6-2
 ; layer 51, Z = 10.200
-M104 S195 T0
+temp2
 ; feature inner perimeter
 ; tool H0.200 W0.480
 G1 Z10.400 F1200
@@ -12148,7 +12148,7 @@ G92 E0.0000
 G1 E-5.0000 F2400
 ; process Color1-6-3
 ; layer 91, Z = 18.200
-M104 S200 T0
+temp3
 ; feature inner perimeter
 ; tool H0.200 W0.480
 G1 Z18.400 F1200
@@ -16142,7 +16142,7 @@ G92 E0.0000
 G1 E-5.0000 F2400
 ; process Color1-6-4
 ; layer 131, Z = 26.200
-M104 S205 T0
+temp4
 ; feature inner perimeter
 ; tool H0.200 W0.480
 G1 Z26.400 F1200
@@ -20136,7 +20136,7 @@ G92 E0.0000
 G1 E-5.0000 F2400
 ; process Color1-6-5
 ; layer 171, Z = 34.200
-M104 S210 T0
+temp5
 ; feature inner perimeter
 ; tool H0.200 W0.480
 G1 Z34.400 F1200