From 05080fc7a857d29fae4fdc6ab650bbd96981c918 Mon Sep 17 00:00:00 2001
From: Mike Olthoff <mike@olthoff.ca>
Date: Sat, 15 Aug 2020 10:31:01 -0700
Subject: [PATCH 1/2] Add Unified Bed Leveling Mesh Slot 1 to ABL

---
 calibration.html      |  4 ++++
 js/gcodeprocessing.js | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/calibration.html b/calibration.html
index ebfd211..39a8c85 100644
--- a/calibration.html
+++ b/calibration.html
@@ -158,6 +158,7 @@
                 <option value="2">Restore saved mesh - M420 S1</option>
                 <option value="3">Prusa MK3 - G28 W followed by M80</option>
                 <option value="4">Prusa Mini - Only heat nozzle to 170, then G29</option>
+                <option value="5">Unified Bed Leveling - Load Saved Mesh then 3 Probe Tilt </option>
             </select>
             <h4>Retraction</h4>
             <p>If you don't know what to enter here, you can leave the retraction speed at 40 mm/sec. For a bowden tube printer, 6mm is a likely retraction distance. For direct drive, a starting value of 1mm may be suitable.</p>
@@ -520,6 +521,7 @@
                 <option value="2">Restore saved mesh - M420 S1</option>
                 <option value="3">Prusa MK3 - G28 W followed by M80</option>
                 <option value="4">Prusa Mini - Only heat nozzle to 170, then G29</option>
+                <option value="5">Unified Bed Leveling - Load Saved Mesh then 3 Probe Tilt </option>
             </select>
             <h4>Retraction</h4>
             <p>For intial tests, you can leave the retraction speed at 40 mm/sec. For a bowden tube printer, 6mm is a likely retraction distance. For direct drive, a starting value of 1mm may be suitable. Vary either side of this for each segment.</p>
@@ -629,6 +631,7 @@
                 <option value="2">Restore saved mesh - M420 S1</option>
                 <option value="3">Prusa MK3 - G28 W followed by M80</option>
                 <option value="4">Prusa Mini - Only heat nozzle to 170, then G29</option>
+                <option value="5">Unified Bed Leveling - Load Saved Mesh then 3 Probe Tilt </option>
             </select>
             <h4>Retraction</h4>
             <p>For intial tests, you can leave the retraction speed at 40 mm/sec. For a bowden tube printer, 6mm is a likely retraction distance. For direct drive, a starting value of 1mm may be suitable. If you are following this guide in order, you should already know your ideal retraction values.</p>
@@ -790,6 +793,7 @@
                 <option value="2">Restore saved mesh - M420 S1</option>
                 <option value="3">Prusa MK3 - G28 W followed by M80</option>
                 <option value="4">Prusa Mini - Only heat nozzle to 170, then G29</option>
+                <option value="5">Unified Bed Leveling - Load Saved Mesh then 3 Probe Tilt </option>
             </select>
             <h4>Retraction</h4>
             <p>For intial tests, you can leave the retraction speed at 40 mm/sec. For a bowden tube printer, 6mm is a likely retraction distance. For direct drive, a starting value of 1mm may be suitable. If you are following this guide in order, you should already know your ideal retraction values.</p>
diff --git a/js/gcodeprocessing.js b/js/gcodeprocessing.js
index 930e8a0..5c464c6 100644
--- a/js/gcodeprocessing.js
+++ b/js/gcodeprocessing.js
@@ -123,6 +123,9 @@ function processBaseline(){
         baseline = baseline.replace(/;G29 ; probe ABL/, "G29 ; probe ABL");
         baseline = baseline.replace(/;M420 S1 ; restore ABL mesh/, "M109 S"+hotendTemp+" T0");
     }
+    if(abl == 5){
+        baseline = baseline.replace(/;G29 ; probe ABL/, "G29 L1 Load the mesh stored in slot 1\nG29 J ; Probe 3 points to tilt mesh");
+    }
 
     if(centre == true){
         var baselineArray = baseline.split(/\n/g);
@@ -225,6 +228,9 @@ function processRetraction(){
         retraction = retraction.replace(/;G29 ; probe ABL/, "G29 ; probe ABL");
         retraction = retraction.replace(/;M420 S1 ; restore ABL mesh/, "M109 S"+hotendTemp+" T0");
     }
+    if(abl == 5){
+        retraction = retraction.replace(/;G29 ; probe ABL/, "G29 L1 Load the mesh stored in slot 1\nG29 J ; Probe 3 points to tilt mesh");
+    }
 
     if(centre == true){
         var retractionArray = retraction.split(/\n/g);
@@ -324,6 +330,9 @@ function processTemperature(){
         temperature = temperature.replace(/;G29 ; probe ABL/, "G29 ; probe ABL");
         temperature = temperature.replace(/;M420 S1 ; restore ABL mesh/, "M109 S500 T0");
     }
+    if(abl == 5){
+        temperature = temperature.replace(/;G29 ; probe ABL/, "G29 L1 Load the mesh stored in slot 1\nG29 J ; Probe 3 points to tilt mesh");
+    }
     temperature = temperature.replace(/M140 S60/g, "M140 S"+bedTemp);
     temperature = temperature.replace(/M190 S60/g, "M190 S"+bedTemp);
     temperature = temperature.replace(/G1 E-5.0000 F2400/g, "G1 E-"+retDist+" F"+retSpeed);
@@ -454,6 +463,9 @@ function processAcceleration(){
         acceleration = acceleration.replace(/;G29 ; probe ABL/, "G29 ; probe ABL");
         acceleration = acceleration.replace(/;M420 S1 ; restore ABL mesh/, "M109 S"+hotendTemp+" T0");
     }
+    if(abl == 5){
+        acceleration = acceleration.replace(/;G29 ; probe ABL/, "G29 L1 Load the mesh stored in slot 1\nG29 J ; Probe 3 points to tilt mesh");
+    }
 
     if(centre == true){
         var accelerationArray = acceleration.split(/\n/g);

From 5ce198f70af24010a774cf5240c938aada90f834 Mon Sep 17 00:00:00 2001
From: Mike Olthoff <mike@olthoff.ca>
Date: Sat, 15 Aug 2020 14:18:43 -0700
Subject: [PATCH 2/2] Add Missing ; for Comments

---
 js/gcodeprocessing.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/gcodeprocessing.js b/js/gcodeprocessing.js
index 5c464c6..e7705e0 100644
--- a/js/gcodeprocessing.js
+++ b/js/gcodeprocessing.js
@@ -124,7 +124,7 @@ function processBaseline(){
         baseline = baseline.replace(/;M420 S1 ; restore ABL mesh/, "M109 S"+hotendTemp+" T0");
     }
     if(abl == 5){
-        baseline = baseline.replace(/;G29 ; probe ABL/, "G29 L1 Load the mesh stored in slot 1\nG29 J ; Probe 3 points to tilt mesh");
+        baseline = baseline.replace(/;G29 ; probe ABL/, "G29 L1 ; Load the mesh stored in slot 1\nG29 J ; Probe 3 points to tilt mesh");
     }
 
     if(centre == true){
@@ -229,7 +229,7 @@ function processRetraction(){
         retraction = retraction.replace(/;M420 S1 ; restore ABL mesh/, "M109 S"+hotendTemp+" T0");
     }
     if(abl == 5){
-        retraction = retraction.replace(/;G29 ; probe ABL/, "G29 L1 Load the mesh stored in slot 1\nG29 J ; Probe 3 points to tilt mesh");
+        retraction = retraction.replace(/;G29 ; probe ABL/, "G29 L1 ; Load the mesh stored in slot 1\nG29 J ; Probe 3 points to tilt mesh");
     }
 
     if(centre == true){
@@ -331,7 +331,7 @@ function processTemperature(){
         temperature = temperature.replace(/;M420 S1 ; restore ABL mesh/, "M109 S500 T0");
     }
     if(abl == 5){
-        temperature = temperature.replace(/;G29 ; probe ABL/, "G29 L1 Load the mesh stored in slot 1\nG29 J ; Probe 3 points to tilt mesh");
+        temperature = temperature.replace(/;G29 ; probe ABL/, "G29 L1 ; Load the mesh stored in slot 1\nG29 J ; Probe 3 points to tilt mesh");
     }
     temperature = temperature.replace(/M140 S60/g, "M140 S"+bedTemp);
     temperature = temperature.replace(/M190 S60/g, "M190 S"+bedTemp);
@@ -464,7 +464,7 @@ function processAcceleration(){
         acceleration = acceleration.replace(/;M420 S1 ; restore ABL mesh/, "M109 S"+hotendTemp+" T0");
     }
     if(abl == 5){
-        acceleration = acceleration.replace(/;G29 ; probe ABL/, "G29 L1 Load the mesh stored in slot 1\nG29 J ; Probe 3 points to tilt mesh");
+        acceleration = acceleration.replace(/;G29 ; probe ABL/, "G29 L1 ; Load the mesh stored in slot 1\nG29 J ; Probe 3 points to tilt mesh");
     }
 
     if(centre == true){