v1.0.214

CHANGELOG.txt

@@ -1,4 +1,4 @@
-v1.0.214: Fixed bug with Z-Zero plate probing routine
+v1.0.214: Fixed bug with Z-Zero plate probing routine, added Z Plate thickness setting back
 v1.0.213: Updated Authenticode Signing certificate
 v1.0.212: Major updates to dependency versions (SerialPort8, Electron 8)
 v1.0.211: Mobile Jog: added space between jog rose and step size,  Update mobile to new Probe wizards, Updates to Mobile Jog Page, Updated SSL Certificates, fixed bug #114 (Tooltip incorrect)

app/index.html

@@ -1329,6 +1329,11 @@
                 <div class="pos-relative">
                   <div data-role="collapse" data-toggle-element="#toggle-probe-advanced" data-collapsed="true" id="toggle-probe-advanced-content">
 
+                    <div id="zplatesettings" class="probe-tab-content">
+                      <label>Plate Thickness</label>
+                      <input id="z0platethickness" type="number" value="20" data-role="input" data-append="mm" data-prepend="<i class='fas fa-ruler-vertical'></i>" data-clear-button="false">
+                    </div>
+
                     <div id="xyzdatum" class="probe-tab-content">
 
                       <small>Where is the XY Zero Datum / Origin in your CAM setup, relevant to the front-left corner we are

app/js/probev2.js

@@ -32,8 +32,12 @@ var probemode = {
 
 $(document).ready(function() {
   if (localStorage.getItem('probeType')) {
-    console.log("Enabling XYZ Probing")
-    $(".needsXYZProbe").show()
+    if (localStorage.getItem('probeType') == "z") {
+      $(".needsXYZProbe").hide()
+    } else {
+      console.log("Enabling XYZ Probing")
+      $(".needsXYZProbe").show()
+    }
   } else {
     console.log("Disabling XYZ Probing")
     $(".needsXYZProbe").hide()
@@ -145,6 +149,7 @@ function probeautotab() {
   $(".probe-tab-content").hide();
   $("#probe-auto").show();
   $("#xyzdatum").show();
+  $("#zplatesettings").hide();
   $(".img-probe").hide();
   $("#img-probe-auto").show();
   $("#toggle-probe-advanced").show();
@@ -162,6 +167,7 @@ function probexyztab() {
   $(".probe-tab-content").hide();
   $("#probe-xyz").show();
   $("#xyzdatum").show();
+  $("#zplatesettings").hide();
   $(".img-probe").hide();
   $("#img-probe-xyz").show();
   $("#toggle-probe-advanced").show();
@@ -180,6 +186,7 @@ function probextab() {
   $(".probe-tab-content").hide();
   $("#probe-x").show();
   $("#xyzdatum").hide();
+  $("#zplatesettings").hide();
   $(".img-probe").hide();
   $("#img-probe-x").show();
   $("#toggle-probe-advanced").hide();
@@ -193,6 +200,7 @@ function probeytab() {
   $(".probe-tab-content").hide();
   $("#probe-y").show();
   $("#xyzdatum").hide();
+  $("#zplatesettings").hide();
   $(".img-probe").hide();
   $("#img-probe-y").show();
   $("#toggle-probe-advanced").hide();
@@ -206,6 +214,8 @@ function probeztab() {
   $(".probe-tab-content").hide();
   $("#probe-z").show();
   $("#xyzdatum").hide();
+  $("#zplatesettings").hide();
+  $("#zplatesettings").hide();
   $(".img-probe").hide();
   $("#img-probe-z").show();
   $("#toggle-probe-advanced").hide();
@@ -219,11 +229,12 @@ function probezplatetab() {
   $(".probe-tab-content").hide();
   $("#probe-z").show();
   $("#xyzdatum").hide();
+  $("#zplatesettings").show();
   $(".img-probe").hide();
   $("#img-probe-zplate").show();
-  $("#toggle-probe-advanced").hide();
+  $("#toggle-probe-advanced").show();
   $("#endmilldiameterform").hide();
-  $("#toggle-probe-advanced-content").data('collapse').expand()
+  $("#toggle-probe-advanced-content").data('collapse').collapse()
 }
 
 function probeendmilltab() {
@@ -232,6 +243,7 @@ function probeendmilltab() {
   $(".probe-tab-content").hide();
   $("#probe-endmill").show();
   $("#xyzdatum").hide();
+  $("#zplatesettings").hide();
   $(".img-probe").hide();
   $("#img-probe-endmill").show();
   $("#toggle-probe-advanced").hide();
@@ -481,6 +493,10 @@ function runProbeNew() {
 
   if (probemode.mode == "zplate") {
     var zoffset = probemode.probe.zoffset // not *-1 as its offset in z pos
+    var thickness = $('#z0platethickness').val()
+    if (thickness != probemode.probe.zoffset) {
+      zoffset = thickness; // custom value from Advanced
+    }
 
     var zmacro = `
     ; Header

index.js

@@ -467,6 +467,7 @@ io.on("connection", function(socket) {
 
   iosocket = socket;
 
+
   if (status.machine.firmware.type == 'grbl') {
 
     // handle Grbl RESET external input
@@ -1693,7 +1694,7 @@ function readFile(path) {
 
 function machineSend(gcode) {
   // console.time('MachineSend');
-  //debug_log("SENDING: " + gcode)
+  // debug_log("SENDING: " + gcode)
   if (port.isOpen) {
     if (gcode.match(/T([\d.]+)/i)) {
       var tool = parseFloat(RegExp.$1);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "OpenBuildsCONTROL",
-  "version": "1.0.213",
+  "version": "1.0.214",
   "license": "AGPL-3.0",
   "description": "Machine Interface Driver for OpenBuilds",
   "author": "github.com/openbuilds <webmaster@openbuilds.com>",