V1.0.381

OpenBuilds · Jul 19, 2024 · 61f415b · 61f415b
1 parent 8a3fcab
commit 61f415b
Show file tree

Hide file tree

Showing 15 changed files with 373 additions and 117 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,8 +1,13 @@
+v1.0.381:
+- Added additional board support to Flashing tools
+- Fixed linebreak on realtime feedrate indicator
+- Updated esptool for Windows
+- Improved USB ID Descriptions handling
+- Added more grblHAL settings descriptions
 v1.0.380:
-- Fix for grblHAL startup alarm lock
+- Test Fix for grblHAL startup alarm lock
 v1.0.379:
-- Major improvements to USB connection steps,
-- set up parser before checking for firmware
+- Major improvements to USB connection steps: set up parser before checking for firmware
 - Added more grblHAL errors/settings descriptions
 v1.0.378:
 - Test fix for 4X hanging on DTR connect

diff --git a/app/css/main.css b/app/css/main.css
@@ -19,7 +19,7 @@ body {
 
 /* Implemented as default https://thayneco.com/expand-usb-port-selector-in-openbuilds-control/  */
 #section-jog div:nth-child(2) label {
-  width: 350px;
+  width: 450px;
 }
 
 /* Fix dialog-actions alignment */

diff --git a/app/index.html b/app/index.html
@@ -538,7 +538,6 @@ <h1 style="position: fixed; top: 100px; left: 50%; transform: translateX(-50%);
                       <i class="fas fa-paint-brush"></i>
                     </span>
                     <span class="caption" id="currentThemeName">Dark<br>Mode</span>
-                    <span class="h6 badge bg-green fg-white"> <i class="fas fa-brush  fa-spin"></i> New!</span>
                   </button>
                 </div>
                 <span class="title">Theme</span>

diff --git a/app/js/grbl-settings-templates.js b/app/js/grbl-settings-templates.js
@@ -896,9 +896,44 @@ var grblSettingsTemplate2 = {
   372: {
     key: `$372`,
     title: `Invert I/O Port outputs as bitfield`,
-    description: ` Invert I/O Port outputs as bitfield`,
+    description: `Invert I/O Port outputs as bitfield`,
     template: `<input id="val-372-input" data-role="input" data-clear-button="false" data-append="bitfield" type="number" >`,
     utils: ``
+  },
+  140: {
+    key: `$140`,
+    title: `X-axis motor current in A, range: 0 - 3.0`,
+    description: `X-axis motor current in A, range: 0 - 3.0`,
+    template: `<input id="val-140-input" data-role="input" data-clear-button="false" data-append="amps" type="number" >`,
+    utils: ``
+  },
+  141: {
+    key: `$141`,
+    title: `Y-axis motor current in A, range: 0 - 3.0`,
+    description: `X-axis motor current in A, range: 0 - 3.0`,
+    template: `<input id="val-141-input" data-role="input" data-clear-button="false" data-append="amps" type="number" >`,
+    utils: ``
+  },
+  142: {
+    key: `$142`,
+    title: `Z-axis motor current in A, range: 0 - 3.0`,
+    description: `X-axis motor current in A, range: 0 - 3.0`,
+    template: `<input id="val-142-input" data-role="input" data-clear-button="false" data-append="amps" type="number" >`,
+    utils: ``
+  },
+  143: {
+    key: `$143`,
+    title: `X-axis motor current in A, range: 0 - 3.0`,
+    description: `A-axis motor current in A, range: 0 - 3.0`,
+    template: `<input id="val-143-input" data-role="input" data-clear-button="false" data-append="amps" type="number" >`,
+    utils: ``
+  },
+  536: {
+    key: `$536`,
+    title: `Neopixel strip 1 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: ``
   }
 
 }
diff --git a/app/js/grbl-settings.js b/app/js/grbl-settings.js
@@ -143,7 +143,6 @@ function grblPopulate() {
       <div class="cell-8">
          <a style="width: 100%;" class="button dropdown-toggle bd-dark dark outline" id="context_toggle2"><img src="img/mch/sphinx55.png"/> Select Machine</a>
          <ul class="ribbon-dropdown" data-role="dropdown" data-duration="100">
-            <li><a href="#" onclick="selectMachine('custom');"><img src="img/mch/custom.png" width="16px"/>  Custom Machine</a></li>
             <li>
                <a href="#" class="dropdown-toggle"><img src="img/mch/acro55.png" width="16px"/> OpenBuilds Acro</a>
                <ul class="ribbon-dropdown" data-role="dropdown">
@@ -196,6 +195,7 @@ function grblPopulate() {
                   <li onclick="selectMachine('workbee1510');"><a href="#"><img src="img/mch/workbee1510.png" width="16px"/>  OpenBuilds WorkBee 1510</a></li>
                </ul>
             </li>
+            <li><a href="#" onclick="selectMachine('custom');"><img src="img/mch/custom.png" width="16px"/>  CUSTOM Machine</a></li>
          </ul>
       </div>
       <div class="cell-4">
@@ -209,7 +209,7 @@ function grblPopulate() {
 <h6 class="fg-dark"><i class="fas fa-cogs fg-lightOrange"></i> 2.  Customize Profile (Optional)<br><small>Customise your Grbl settings below. For custom machines, modifications and also for fine tuning your machine profile. Remember to make a BACKUP so you don't lose your customized settings</small></h6>
 
 <div id="grblSettingsTableView" style="overflow-y: scroll; height: calc(100vh - 460px); max-height: calc(100vh - 460px);">
-   <table class="table compact striped row-hover row-border" data-show-rows-steps="false" data-rows="200" data-show-pagination="false" data-show-table-info="false" data-show-search="false">
+   <table class="table compact striped row-hover row-border" data-show-rows-steps="false" data-rows="200" data-show-pagination="false" data-show-table-info="false" data-show-search="true">
 
       <tbody>
 

diff --git a/app/js/websocket.js b/app/js/websocket.js
@@ -705,10 +705,10 @@ function initSocket() {
     }
 
     if (unit == "mm") {
-      $("#realFeed").html(status.machine.overrides.realFeed + " mm/min");
+      $("#realFeed").html(status.machine.overrides.realFeed + "mm/min");
       //$("#realSpeed").html("S=" + status.machine.overrides.realSpindle);
     } else if (unit == "in") {
-      $("#realFeed").html((status.machine.overrides.realFeed / 25.4).toFixed(0) + " in/min");
+      $("#realFeed").html((status.machine.overrides.realFeed / 25.4).toFixed(0) + "in/min");
       //$("#realSpeed").html(("S=" + status.machine.overrides.realSpindle / 25.4).toFixed(0) + "in/min");
     }
 
@@ -959,17 +959,6 @@ function initSocket() {
 
   socket.on("interfaceOutdated", function(status) {
     console.log("interfaceOutdated", status)
-    openFlashingTool();
-    var select = $("#flashController").data("select").val("interface")
-    //status.interface.firmware.installedVersion
-    //status.interface.firmware.availVersion
-    var template = `We've detected that you are connected to an OpenBuilds Interface on port ` + status.comms.interfaces.activePort + `.<p>
-    It's firmware is currently out of date. You are running <code>v` + status.interface.firmware.installedVersion + `</code> and you can now update to <code>v` + status.interface.firmware.availVersion + `</code>.
-    Use the wizard below to update the firmware:
-    <hr>
-    `
-
-    $("#FlashDialogMsg").html(template);
   })
 
   $('#sendCommand').on('click', function() {
@@ -1149,12 +1138,11 @@ function populatePortsMenu() {
     } else {
       response += `<optgroup label="USB Ports">`
       for (i = 0; i < laststatus.comms.interfaces.ports.length; i++) {
-        var port = friendlyPort(i)
         var lastUsedPort = localStorage.getItem('lastUsedPort');
         if (laststatus.comms.interfaces.ports[i].path == lastUsedPort) {
-          response += `<option value="` + laststatus.comms.interfaces.ports[i].path + `" selected>` + laststatus.comms.interfaces.ports[i].path.replace("/dev/tty.", "") + " " + port.note + `</option>`;
+          response += `<option value="` + laststatus.comms.interfaces.ports[i].path + `" selected>` + laststatus.comms.interfaces.ports[i].path.replace("/dev/tty.", "") + " " + laststatus.comms.interfaces.ports[i].note + `</option>`;
         } else {
-          response += `<option value="` + laststatus.comms.interfaces.ports[i].path + `">` + laststatus.comms.interfaces.ports[i].path.replace("/dev/tty.", "") + " " + port.note + `</option>`;
+          response += `<option value="` + laststatus.comms.interfaces.ports[i].path + `">` + laststatus.comms.interfaces.ports[i].path.replace("/dev/tty.", "") + " " + laststatus.comms.interfaces.ports[i].note + `</option>`;
         }
 
 
@@ -1212,80 +1200,6 @@ function spindleOverride(step) {
   }
 }
 
-function friendlyPort(i) {
-  // var likely = false;
-  var img = 'usb.png';
-  var note = '';
-  var manufacturer = laststatus.comms.interfaces.ports[i].manufacturer
-  if (manufacturer == `(Standard port types)`) {
-    img = 'serial.png'
-    note = 'Motherboard Serial Port';
-  } else if (laststatus.comms.interfaces.ports[i].productId && laststatus.comms.interfaces.ports[i].vendorId) {
-    if (laststatus.comms.interfaces.ports[i].productId == '6015' && laststatus.comms.interfaces.ports[i].vendorId == '1D50') {
-      // found Smoothieboard
-      img = 'smoothieboard.png';
-      note = 'Smoothieware USB Port (Not Supported)';
-    }
-    if (laststatus.comms.interfaces.ports[i].productId == '6001' && laststatus.comms.interfaces.ports[i].vendorId == '0403') {
-      // found FTDI FT232
-      img = 'usb.png';
-      note = 'FTDI USB to Serial';
-    }
-    if (laststatus.comms.interfaces.ports[i].productId == '6015' && laststatus.comms.interfaces.ports[i].vendorId == '0403') {
-      // found FTDI FT230x
-      img = 'usb.png';
-      note = 'FTDI USD to Serial';
-    }
-    if (laststatus.comms.interfaces.ports[i].productId == '606D' && laststatus.comms.interfaces.ports[i].vendorId == '1D50') {
-      // found TinyG G2
-      img = 'usb.png';
-      note = 'Tiny G2';
-    }
-    if (laststatus.comms.interfaces.ports[i].productId == '003D' && laststatus.comms.interfaces.ports[i].vendorId == '2341') {
-      // found Arduino Due Prog Port
-      img = 'due.png';
-      note = 'Arduino Due Prog';
-    }
-    if (laststatus.comms.interfaces.ports[i].productId == '0043' && laststatus.comms.interfaces.ports[i].vendorId == '2341' || laststatus.comms.interfaces.ports[i].productId == '0001' && laststatus.comms.interfaces.ports[i].vendorId == '2341' || laststatus.comms.interfaces.ports[i].productId == '0043' && laststatus.comms.interfaces.ports[i].vendorId == '2A03') {
-      // found Arduino Uno
-      img = 'uno.png';
-      note = 'Arduino Uno';
-    }
-    if (laststatus.comms.interfaces.ports[i].productId == '2341' && laststatus.comms.interfaces.ports[i].vendorId == '0042') {
-      // found Arduino Mega
-      img = 'mega.png';
-      note = 'Arduino Mega';
-    }
-    if (laststatus.comms.interfaces.ports[i].productId == '7523' && laststatus.comms.interfaces.ports[i].vendorId == '1A86') {
-      // found CH340
-      img = 'uno.png';
-      note = 'WCH.cn CH340 USB to UART';
-    }
-    if (laststatus.comms.interfaces.ports[i].productId == 'EA60' && laststatus.comms.interfaces.ports[i].vendorId == '10C4') {
-      // found CP2102
-      img = 'silabs.png';
-      note = 'Silicon Labs USB to UART';
-    }
-    if (laststatus.comms.interfaces.ports[i].productId == '000A' && laststatus.comms.interfaces.ports[i].vendorId == '2E8A') {
-      // found CP2102
-      img = 'pipico.png';
-      note = 'Raspberry Pi Pico CDC UART (Not Supported)';
-    }
-    if (laststatus.comms.interfaces.ports[i].productId == '2303' && laststatus.comms.interfaces.ports[i].vendorId == '067B') {
-      // found CP2102
-      // img = 'nodemcu.png';
-      note = 'Prolific USB to Serial';
-    }
-  } else {
-    img = "usb.png";
-  }
-
-  return {
-    img: img,
-    note: note
-  };
-}
-
 function escapeHTML(html) {
   return document.createElement('div').appendChild(document.createTextNode(html)).parentNode.innerHTML;
 }