Merge branch 'OpenBuilds:master' into master

CHANGELOG.txt

@@ -8,6 +8,7 @@ v1.0.381:
 - Improved Servo Calibration Wizard to take Grbl Settings into account, and start at center-of-travel for calibration tool (Fix #362)
 - Default all machine profiles to have Limits enabled by default - been a couple years since we've started including limit switches as standard
 - Added quick search to Grbl Settings table (Note new search overwrites any changes, make sure to save before changing search)
+- Fixed bug #368 Calibration Wizard repeated runs but without entering distance causes desync
 v1.0.380:
 - Test Fix for grblHAL startup alarm lock
 v1.0.379:

app/index.html

@@ -1591,37 +1591,37 @@
                     determine endmill diameter. </small>
                   <hr>
                   <small>Position the endmill above the hole in the probe plate as shown, just above the plate, clip
-                    the magnet to the collet, then click the <span class="fg-grayBlue">Confirm Probe Position</span> button to continue...</small>
+                    the magnet to the collet, then click the <span class="fg-grayBlue">Confirm Probe Position</span> button or touch the probe to enable the <span class="fg-grayBlue">Probe</span> button.</small>
                 </div>
                 <div id="probe-xyz" class="probe-tab-content">
                   <small>XYZ Probe Routine: This routine is used to find the XYZ origins</small>
                   <hr>
                   <small>Position the endmill above the hole in the probe plate as shown, just above the plate, clip
-                    the magnet to the collet, then click the <span class="fg-grayBlue">Confirm Probe Position</span> button to continue...</small>
+                    the magnet to the collet, then click the <span class="fg-grayBlue">Confirm Probe Position</span> button or touch the probe to enable the <span class="fg-grayBlue">Probe</span> button.</small>
                 </div>
                 <div id="probe-x" class="probe-tab-content" style="display: none;">
                   <small>X Probe Routine: This routine is used to find the X origin</small>
                   <hr>
                   <small>Position the endmill to the left of the probe plate as shown, clip the magnet to the collet,
-                    then click the <span class="fg-grayBlue">Confirm Probe Position</span> button to continue...</small>
+                    then click the <span class="fg-grayBlue">Confirm Probe Position</span> button or touch the probe to enable the <span class="fg-grayBlue">Probe</span> button.</small>
                 </div>
                 <div id="probe-y" class="probe-tab-content" style="display: none;">
                   <small>Y Probe Routine: This routine is used to find the Y origin</small>
                   <hr>
                   <small>Position the endmill in front of the probe plate as shown, clip the magnet to the collet, then
-                    click the <span class="fg-grayBlue">Confirm Probe Position</span> button to continue...</small>
+                    click the <span class="fg-grayBlue">Confirm Probe Position</span> button or touch the probe to enable the <span class="fg-grayBlue">Probe</span> button.</small>
                 </div>
                 <div id="probe-z" class="probe-tab-content" style="display: none;">
                   <small>Z Probe Routine: This routine is used to find the Z origin</small>
                   <hr>
                   <small>Position the endmill above the probe plate as shown, clip the magnet to the collet or the alligator clip to the bit, then click
-                    the <span class="fg-grayBlue">Confirm Probe Position</span> button to continue...</small>
+                    the <span class="fg-grayBlue">Confirm Probe Position</span> button or touch the probe to enable the <span class="fg-grayBlue">Probe</span> button.</small>
                 </div>
                 <div id="probe-endmill" class="probe-tab-content" style="display: none;">
                   <small>Endmill Probe Routine: This routine is used to find the Endmill Diameter</small>
                   <hr>
                   <small>Position the endmill above the hole in the probe plate as shown, just above the plate, clip
-                    the magnet to the collet, then click the <span class="fg-grayBlue">Confirm Probe Position</span> button to continue...</small>
+                    the magnet to the collet, then click the <span class="fg-grayBlue">Confirm Probe Position</span> button or touch the probe to enable the <span class="fg-grayBlue">Probe</span> button.</small>
                   <hr>
                   <small>
                     This operation will perform an XYZ probe to establish the plate position, then using the hole in the plate,
@@ -1966,4 +1966,4 @@
   <script src="/lib/furcanIconPicker/iconpicker-1.5.0.js"></script>
 
 </html>
-<!--  -->
+<!--  -->

app/js/grbl-settings-templates.js

@@ -948,7 +948,7 @@ var grblSettingsTemplate2 = {
   },
   536: {
     key: `$536`,
-    title: `Neopixel LED strip length, max: 255`,
+    title: `WS2812B LED strip length, max: 255`,
     description: `WS2812B LED strip length, max: 255`,
     template: `<input id="val-536-input" data-role="input" data-clear-button="false" data-append="LEDs" type="number" >`,
     utils: ``

app/wizards/calibration/calibrate-x.js

@@ -110,6 +110,10 @@ function xstepscalibrate() {
     }]
   });
 
+  // Restore value to entry field
+  $("#xcalmovedistance").val(xcalmovedistance);
+
+
   $("#xcalmovedistance").keyup(function() {
     xcalmovedistance = $("#xcalmovedistance").val();
     $(".xcalmovedistanceval").html(xcalmovedistance);

app/wizards/calibration/calibrate-y.js

@@ -109,6 +109,9 @@ function ystepscalibrate() {
     }]
   });
 
+  // Restore value to entry field
+  $("#ycalmovedistance").val(ycalmovedistance);
+
   $("#ycalmovedistance").keyup(function() {
     ycalmovedistance = $("#ycalmovedistance").val();
     $(".ycalmovedistanceval").html(ycalmovedistance);

app/wizards/calibration/calibrate-z.js

@@ -107,6 +107,9 @@ function zstepscalibrate() {
     }]
   });
 
+  // Restore value to entry field
+  $("#zcalmovedistance").val(zcalmovedistance);
+
   $("#zcalmovedistance").keyup(function() {
     zcalmovedistance = $("#zcalmovedistance").val();
     $(".zcalmovedistanceval").html(zcalmovedistance);

app/wizards/probe/probev2.js

@@ -31,6 +31,7 @@ var probemode = {
     position: "fl" // fl, fr, rl, rr, c
   },
   probe: xyzprobeplate,
+  interval: undefined,
 }
 
 $(document).ready(function() {
@@ -81,8 +82,23 @@ $("#probeunitxyz").change(function() {
 //   $(".needsXYZProbe").hide();
 // }
 
-function openProbeDialog() {
+function initProbeDialog() {
   Metro.dialog.open("#xyzProbeWindow");
+  $('#confirmNewProbeBtn')[0].innerHTML = "Confirm Probe Position";
+
+  probemode.interval = setInterval(() => {
+    if (laststatus.machine.inputs.contains("P")) {
+      $('#confirmNewProbeBtn').addClass("disabled");
+      $('#confirmNewProbeBtn')[0].innerHTML = "Touched";
+      $('#runNewProbeBtn').removeClass("disabled").focus();
+      clearInterval(probemode.interval);
+      probemode.interval = undefined;
+    }
+  }, 100);
+}
+
+function openProbeDialog() {
+  initProbeDialog();
   if (localStorage.getItem('probeType')) {
     probetype(localStorage.getItem('probeType'))
     if (localStorage.getItem('probeType') == "z") { // Z Touchplate
@@ -114,7 +130,7 @@ function openProbeDialog() {
 }
 
 function openProbeXDialog() {
-  Metro.dialog.open("#xyzProbeWindow");
+  initProbeDialog();
   if (localStorage.getItem('probeType')) {
     probetype(localStorage.getItem('probeType'))
     if (localStorage.getItem('probeType') == "z") {
@@ -140,7 +156,7 @@ function openProbeXDialog() {
 }
 
 function openProbeYDialog() {
-  Metro.dialog.open("#xyzProbeWindow");
+  initProbeDialog();
   if (localStorage.getItem('probeType')) {
     probetype(localStorage.getItem('probeType'))
     if (localStorage.getItem('probeType') == "z") {
@@ -166,7 +182,7 @@ function openProbeYDialog() {
 }
 
 function openProbeZDialog() {
-  Metro.dialog.open("#xyzProbeWindow");
+  initProbeDialog();
   if (localStorage.getItem('probeType')) {
     probetype(localStorage.getItem('probeType'))
     if (localStorage.getItem('probeType') == "z") {
@@ -408,8 +424,10 @@ function probetype(type) {
 }
 
 function confirmProbeInPlace(operation) {
-  $('#confirmNewProbeBtn').addClass("disabled")
+  $('#confirmNewProbeBtn').addClass("disabled");
   $('#runNewProbeBtn').removeClass("disabled").focus();
+  clearInterval(probemode.interval);
+  probemode.interval = undefined;
 }
 
 function resetJogModeAfterProbe() {
@@ -425,10 +443,13 @@ function resetJogModeAfterProbe() {
     }
   }
   $('#confirmNewProbeBtn').removeClass("disabled")
+  clearInterval(probemode.interval)
+  probemode.interval = undefined;
 }
 
 
 function runProbeNew() {
+  $('#confirmNewProbeBtn')[0].innerHTML = "Confirm Probe Position";
   resetJogModeAfterProbe()
   $("#consoletab").click()
   probemode.stock.x = $("#stockwidth").val();
@@ -713,4 +734,4 @@ function saveEditCustomProbe() {
   };
   localStorage.setItem('customProbe', JSON.stringify(customprobeplate));
   probetype('custom');
-}
+}