From b0765f7512a92d5ca1f1a5df579b764499ed8d41 Mon Sep 17 00:00:00 2001
From: lawgicau <lawgicau@gmail.com>
Date: Tue, 13 Jul 2021 15:36:45 +1000
Subject: [PATCH] Add custom end gcode

#208
---
 calibration.html      | 61 ++++++++++++++++++++++++++++++++++++++++++-
 js/commongcode.js     |  3 ++-
 js/gcodeprocessing.js | 20 ++++++++++++++
 3 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/calibration.html b/calibration.html
index b3b3ccb..df61b07 100644
--- a/calibration.html
+++ b/calibration.html
@@ -235,7 +235,18 @@
                 <label>Retraction speed (mm/sec): <input type="number" name="retspeed" value="40" min="5" max="150" step="1"></label></p>
                 <p><label>Extra restart distance (mm): <input type="number" name="retdistextra" min="-10" max="10" value="0" step="0.1"></label>
                 <label>Z hop (mm): <input type="number" name="zhop" min="0" max="10" value="0" step="0.1"></label></p>
-
+                <h4>Additional end gcode</h4>
+                <p>If you have additional end commands, tick the box and enter the gcode.</p>
+                <label>Additional end gcode:<input name="end" type="checkbox" onchange="toggle(!this.checked, '#firstlayerEnd')" value="extraEnd"></label>
+                <div id="firstlayerEnd" class="endExp">
+                    <p>For the majority of users, you can skip this section. Any gcode entered here will be inserted at the very end of the file.</p>
+                    <textarea name="endgcode"></textarea>
+                </div>
+                <script>
+                    if(document.firstlayerForm.start.checked == false){
+                        $("#firstlayerEnd").hide();
+                    }
+                </script>
             <p><input type="button" onclick="processFirstlayer()" value="Download Gcode"></p>
             <p><input type="button" onclick="resetFormToDefaults(form)" value="Reset parameters"> <input type="button" onclick="outputSettings(form)" value="Output Settings Summary"></p>
         </form>
@@ -322,6 +333,18 @@
             <label>Retraction speed (mm/sec): <input type="number" name="retspeed" value="40" min="5" max="150" step="1"></label></p>
             <p><label>Extra restart distance (mm): <input type="number" name="retdistextra" min="-10" max="10" value="0" step="0.1"></label>
             <label>Z hop (mm): <input type="number" name="zhop" min="0" max="10" value="0" step="0.1"></label></p>
+            <h4>Additional end gcode</h4>
+            <p>If you have additional end commands, tick the box and enter the gcode.</p>
+            <label>Additional end gcode:<input name="end" type="checkbox" onchange="toggle(!this.checked, '#baselineEnd')" value="extraEnd"></label>
+            <div id="baselineEnd" class="endExp">
+                <p>For the majority of users, you can skip this section. Any gcode entered here will be inserted at the very end of the file.</p>
+                <textarea name="endgcode"></textarea>
+            </div>
+            <script>
+                if(document.baselineForm.start.checked == false){
+                    $("#baselineEnd").hide();
+                }
+            </script>
             <p><input type="button" onclick="processBaseline()" value="Download Gcode"></p>
             <p><input type="button" onclick="resetFormToDefaults(form)" value="Reset parameters"> <input type="button" onclick="outputSettings(form)" value="Output Settings Summary"></p>
         </form>
@@ -851,6 +874,18 @@
                     </tr>
                 </tbody>
             </table>
+            <h4>Additional end gcode</h4>
+            <p>If you have additional end commands, tick the box and enter the gcode.</p>
+            <label>Additional end gcode:<input name="end" type="checkbox" onchange="toggle(!this.checked, '#retractionEnd')" value="extraEnd"></label>
+            <div id="retractionEnd" class="endExp">
+                <p>For the majority of users, you can skip this section. Any gcode entered here will be inserted at the very end of the file.</p>
+                <textarea name="endgcode"></textarea>
+            </div>
+            <script>
+                if(document.retractionForm.start.checked == false){
+                    $("#retractionEnd").hide();
+                }
+            </script>
             <p><input type="button" onclick="processRetraction()" value="Download Gcode"></p>
             <p><input type="button" onclick="resetFormToDefaults(form)" value="Reset parameters"> <input type="button" onclick="outputSettings(form)" value="Output Settings Summary"></p>
         </form>
@@ -987,6 +1022,18 @@
                     </tr>
                 </tbody>
             </table>
+            <h4>Additional end gcode</h4>
+            <p>If you have additional end commands, tick the box and enter the gcode.</p>
+            <label>Additional end gcode:<input name="end" type="checkbox" onchange="toggle(!this.checked, '#temperatureEnd')" value="extraEnd"></label>
+            <div id="temperatureEnd" class="endExp">
+                <p>For the majority of users, you can skip this section. Any gcode entered here will be inserted at the very end of the file.</p>
+                <textarea name="endgcode"></textarea>
+            </div>
+            <script>
+                if(document.temperatureForm.start.checked == false){
+                    $("#temperatureEnd").hide();
+                }
+            </script>
             <p><input type="button" onclick="processTemperature()" value="Download Gcode"></p>
             <p><input type="button" onclick="resetFormToDefaults(form)" value="Reset parameters"> <input type="button" onclick="outputSettings(form)" value="Output Settings Summary"></p>
         </form>
@@ -1215,6 +1262,18 @@
                     </tr>
                 </tbody>
             </table>
+            <h4>Additional end gcode</h4>
+            <p>If you have additional end commands, tick the box and enter the gcode.</p>
+            <label>Additional end gcode:<input name="end" type="checkbox" onchange="toggle(!this.checked, '#accelerationEnd')" value="extraEnd"></label>
+            <div id="accelerationEnd" class="endExp">
+                <p>For the majority of users, you can skip this section. Any gcode entered here will be inserted at the very end of the file.</p>
+                <textarea name="endgcode"></textarea>
+            </div>
+            <script>
+                if(document.accelerationForm.start.checked == false){
+                    $("#accelerationEnd").hide();
+                }
+            </script>
             <p><input type="button" onclick="processAcceleration()" value="Download Gcode"></p>
             <p><input type="button" onclick="resetFormToDefaults(form)" value="Reset parameters"> <input type="button" onclick="outputSettings(form)" value="Output Settings Summary"></p>
         </form>
diff --git a/js/commongcode.js b/js/commongcode.js
index 866f68b..0178dfe 100644
--- a/js/commongcode.js
+++ b/js/commongcode.js
@@ -19,4 +19,5 @@ M106 S0 ; turn off cooling fan
 M104 S0 ; turn off extruder
 M140 S0 ; turn off bed
 M84 ; disable motors
-M501 ; restore previous EEPROM values`
\ No newline at end of file
+M501 ; restore previous EEPROM values
+;customend`
\ No newline at end of file
diff --git a/js/gcodeprocessing.js b/js/gcodeprocessing.js
index 6e31597..7e60e40 100644
--- a/js/gcodeprocessing.js
+++ b/js/gcodeprocessing.js
@@ -117,6 +117,7 @@ function processFirstlayer(){
     var zhop = document.firstlayerForm.zhop.value;
     var abl = document.firstlayerForm.abl.value;
     var customStart = document.firstlayerForm.startgcode.value;
+    var customEnd = document.firstlayerForm.endgcode.value;
     var firstlayerStart = commonStart;
     var skirts = "";
     var squares = "";
@@ -228,6 +229,9 @@ function processFirstlayer(){
     if(document.firstlayerForm.start.checked == true) {
         firstlayer = firstlayer.replace(/;customstart/, "; custom start gcode\n"+customStart);
     }
+    if(document.firstlayerForm.end.checked == true) {
+        firstlayer = firstlayer.replace(/;customend/, "; custom end gcode\n"+customEnd);
+    }
     downloadFile('firstlayer.gcode', firstlayer);
 }
 
@@ -247,6 +251,7 @@ function processBaseline(){
     var fanPercentage = document.baselineForm.fanSpeed.value;
     var fanSpeed = Math.round(fanPercentage*2.55);
     var customStart = document.baselineForm.startgcode.value;
+    var customEnd = document.baselineForm.endgcode.value;
     var baseline = commonStart;
     switch(nozzleLayer){
         case '40_20':
@@ -359,6 +364,9 @@ function processBaseline(){
     if(document.baselineForm.start.checked == true) {
         baseline = baseline.replace(/;customstart/, "; custom start gcode\n"+customStart);
     }
+    if(document.baselineForm.end.checked == true) {
+        baseline = baseline.replace(/;customend/, "; custom end gcode\n"+customEnd);
+    }
     downloadFile('baseline.gcode', baseline);
 }
 
@@ -404,6 +412,7 @@ function processRetraction(){
     var f4 = document.retractionForm.ret_f4.value*60;
     var f5 = document.retractionForm.ret_f5.value;
     var customStart = document.retractionForm.startgcode.value;
+    var customEnd = document.retractionForm.endgcode.value;
     var retraction = commonStart;
     switch(nozzleLayer){
         case "40_20":
@@ -554,6 +563,9 @@ function processRetraction(){
     if(document.retractionForm.start.checked == true) {
         retraction = retraction.replace(/;customstart/, "; custom start gcode\n"+customStart); 
     }
+    if(document.retractionForm.end.checked == true) {
+        retraction = retraction.replace(/;customend/, "; custom end gcode\n"+customEnd);
+    }
     downloadFile('retraction.gcode', retraction);
 }
 
@@ -578,6 +590,7 @@ function processTemperature(){
     var d1 = document.temperatureForm.temp_d1.value;
     var e1 = document.temperatureForm.temp_e1.value;
     var customStart = document.temperatureForm.startgcode.value;
+    var customEnd = document.temperatureForm.endgcode.value;
     var temperature = commonStart;
     switch(nozzleLayer){
         case '40_20':
@@ -698,6 +711,9 @@ function processTemperature(){
     if(document.temperatureForm.start.checked == true) {
         temperature = temperature.replace(/;customstart/, "; custom start gcode\n"+customStart);
     }
+    if(document.temperatureForm.end.checked == true) {
+        temperature = temperature.replace(/;customend/, "; custom end gcode\n"+customEnd);
+    }
     downloadFile('temperature.gcode', temperature);
 }
 
@@ -743,6 +759,7 @@ function processAcceleration(){
     var f3 = document.accelerationForm.accel_f3.value;
     var f4 = document.accelerationForm.accel_f4.value;
     var customStart = document.accelerationForm.startgcode.value;
+    var customEnd = document.accelerationForm.endgcode.value;
     var acceleration = commonStart;
     switch(nozzleLayer){
         case '40_20':
@@ -882,6 +899,9 @@ function processAcceleration(){
     if(document.accelerationForm.start.checked == true) {
         acceleration = acceleration.replace(/;customstart/, "; custom start gcode\n"+customStart);
     }
+    if(document.accelerationForm.end.checked == true) {
+        acceleration = acceleration.replace(/;customend/, "; custom end gcode\n"+customEnd);
+    }
     downloadFile('acceleration.gcode', acceleration);
 }