From a29e8fddaad3db7197878cf6831be401eaae8623 Mon Sep 17 00:00:00 2001
From: lawgicau <lawgicau@gmail.com>
Date: Tue, 1 Sep 2020 14:48:45 +1000
Subject: [PATCH] Add remove T0 option for MMU

---
 calibration.html      |  5 +++++
 js/firstlayer.js      |  2 +-
 js/gcodeprocessing.js | 18 ++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/calibration.html b/calibration.html
index af82214..45c295d 100644
--- a/calibration.html
+++ b/calibration.html
@@ -176,6 +176,7 @@
             <p>If you have additional start commands, tick the box and enter the gcode. This can be used for an extruder prime sequence, overwriting the standard flow rate, setting K factor and more. Tick the box for more details.</p>
             <label>Additional start gcode:<input name="start" type="checkbox" onchange="toggle(!this.checked, '#firstlayerStart')" value="extraStart"></label>
             <label>Add M80 to turn PSU on:<input name="psuon" type="checkbox" value="on"></label>
+            <label>Remove <b>T0</b> from gcode (advanced users with MMU)<input name="removet0" type="checkbox"></label>
             <div id="firstlayerStart" class="startExp">
                 <p>For the majority of users, you can skip this section. Any gcode entered here will be inserted after temperatures are set and homing is complete. Start gcode is saved by the browser, you should only have to enter it once. Example uses include:</p>
                 <ul>
@@ -257,6 +258,7 @@
             <p>If you have additional start commands, tick the box and enter the gcode. This can be used for an extruder prime sequence, overwriting the standard flow rate, setting K factor and more. Tick the box for more details.</p>
             <label>Additional start gcode:<input name="start" type="checkbox" onchange="toggle(!this.checked, '#baselineStart')" value="extraStart"></label>
             <label>Add M80 to turn PSU on:<input name="psuon" type="checkbox" value="on"></label>
+            <label>Remove <b>T0</b> from gcode (advanced users with MMU)<input name="removet0" type="checkbox"></label>
             <div id="baselineStart" class="startExp">
                 <p>For the majority of users, you can skip this section. Any gcode entered here will be inserted after temperatures are set and homing is complete. Start gcode is saved by the browser, you should only have to enter it once. Example uses include:</p>
                 <ul>
@@ -700,6 +702,7 @@
             <p>If you have additional start commands, tick the box and enter the gcode. This can be used for an extruder prime sequence, overwriting the standard flow rate, setting K factor and more. Tick the box for more details.</p>
             <label>Additional start gcode:<input name="start" type="checkbox" onchange="toggle(!this.checked, '#retractionStart')" value="extraStart"></label>
             <label>Add M80 to turn PSU on:<input name="psuon" type="checkbox" value="on"></label>
+            <label>Remove <b>T0</b> from gcode (advanced users with MMU)<input name="removet0" type="checkbox"></label>
             <div id="retractionStart" class="startExp">
                 <p>For the majority of users, you can skip this section. Any gcode entered here will be inserted after temperatures are set and homing is complete. Start gcode is saved by the browser, you should only have to enter it once. Example uses include:</p>
                 <ul>
@@ -851,6 +854,7 @@
             <p>If you have additional start commands, tick the box and enter the gcode. This can be used for an extruder prime sequence, overwriting the standard flow rate, setting K factor and more. Tick the box for more details.</p>
             <label>Additional start gcode:<input name="start" type="checkbox" onchange="toggle(!this.checked, '#temperatureStart')" value="extraStart"></label>
             <label>Add M80 to turn PSU on:<input name="psuon" type="checkbox" value="on"></label>
+            <label>Remove <b>T0</b> from gcode (advanced users with MMU)<input name="removet0" type="checkbox"></label>
             <div id="temperatureStart" class="startExp">
                 <p>For the majority of users, you can skip this section. Any gcode entered here will be inserted after temperatures are set and homing is complete. Start gcode is saved by the browser, you should only have to enter it once. Example uses include:</p>
                 <ul>
@@ -1043,6 +1047,7 @@
             <p>If you have additional start commands, tick the box and enter the gcode. This can be used for an extruder prime sequence, overwriting the standard flow rate, setting K factor and more. Tick the box for more details.</p>
             <label>Additional start gcode:<input name="start" type="checkbox" onchange="toggle(!this.checked, '#accelerationStart')" value="extraStart"></label>
             <label>Add M80 to turn PSU on:<input name="psuon" type="checkbox" value="on"></label>
+            <label>Remove <b>T0</b> from gcode (advanced users with MMU)<input name="removet0" type="checkbox"></label>
             <div id="accelerationStart" class="startExp">
                 <p>For the majority of users, you can skip this section. Any gcode entered here will be inserted after temperatures are set and homing is complete. Start gcode is saved by the browser, you should only have to enter it once. Example uses include:</p>
                 <ul>
diff --git a/js/firstlayer.js b/js/firstlayer.js
index 475ce05..666cbd6 100644
--- a/js/firstlayer.js
+++ b/js/firstlayer.js
@@ -1,4 +1,4 @@
-var originalFirstlayerStart = `; G-Code originally generated by Simplify3D(R) Version 4.1.2, based on proposeed code by vector76
+var originalFirstlayerStart = `; G-Code originally generated by Simplify3D(R) Version 4.1.2, based on proposed code by vector76
 ;M80 ; power supply on
 G90
 M82
diff --git a/js/gcodeprocessing.js b/js/gcodeprocessing.js
index 95d846c..dd01e38 100644
--- a/js/gcodeprocessing.js
+++ b/js/gcodeprocessing.js
@@ -216,6 +216,9 @@ function processFirstlayer(){
     if(document.firstlayerForm.psuon.checked == true) {
         firstlayer = firstlayer.replace(/;M80/, "M80");
     }
+    if(document.firstlayerForm.removet0.checked == true) {
+        firstlayer = firstlayer.replace(/T0\n/, ";T0\n");
+    }
     if(document.firstlayerForm.start.checked == true) {
         firstlayer = firstlayer.replace(/;customstart/, "; custom start gcode\n"+customStart);
     }
@@ -337,6 +340,9 @@ function processBaseline(){
     if(document.baselineForm.psuon.checked == true) {
         baseline = baseline.replace(/;M80/, "M80");
     }
+    if(document.baselineForm.removet0.checked == true) {
+        baseline = baseline.replace(/T0\n/, ";T0\n");
+    }
     if(document.baselineForm.start.checked == true) {
         baseline = baseline.replace(/;customstart/, "; custom start gcode\n"+customStart);
     }
@@ -519,6 +525,9 @@ function processRetraction(){
     if(document.retractionForm.psuon.checked == true) {
         retraction = retraction.replace(/;M80/, "M80");
     }
+    if(document.retractionForm.removet0.checked == true) {
+        retraction = retraction.replace(/T0\n/, ";T0\n");
+    }
     if(document.retractionForm.start.checked == true) {
         retraction = retraction.replace(/;customstart/, "; custom start gcode\n"+customStart); 
     }
@@ -652,6 +661,9 @@ function processTemperature(){
     if(document.temperatureForm.psuon.checked == true) {
         temperature = temperature.replace(/;M80/, "M80");
     }
+    if(document.temperatureForm.removet0.checked == true) {
+        temperature = temperature.replace(/T0\n/, ";T0\n");
+    }
     if(document.temperatureForm.start.checked == true) {
         temperature = temperature.replace(/;customstart/, "; custom start gcode\n"+customStart);
     }
@@ -827,6 +839,9 @@ function processAcceleration(){
     if(document.accelerationForm.psuon.checked == true) {
         acceleration = acceleration.replace(/;M80/, "M80");
     }
+    if(document.accelerationForm.removet0.checked == true) {
+        acceleration = acceleration.replace(/T0\n/, ";T0\n");
+    }
     if(document.accelerationForm.start.checked == true) {
         acceleration = acceleration.replace(/;customstart/, "; custom start gcode\n"+customStart);
     }
@@ -863,6 +878,9 @@ function outputSettings(formName) {
     if(formName.psuon.checked == true) {
         string += "Turn on PSU with M80 active\n"
     }
+    if(formName.removet0.checked == true) {
+        string += "T0 command removed\n"
+    }
     if(formName.start.checked == true) {
         string += "Custom start gcode:\n";
         string += formName.startgcode.value+"\n";