diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 95b4ab34..43f01518 100644
--- 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
index 13b003a3..efbcbaca 100644
--- 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
index 736f3147..2a8c8094 100644
--- a/app/index.html
+++ b/app/index.html
@@ -538,7 +538,6 @@
Dark Mode
- New!Theme
diff --git a/app/js/grbl-settings-templates.js b/app/js/grbl-settings-templates.js
index 40014356..e96c47f3 100644
--- 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: ``,
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: ``,
+ 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: ``,
+ 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: ``,
+ 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: ``,
+ utils: ``
+ },
+ 536: {
+ key: `$536`,
+ title: `Neopixel strip 1 length, max: 255`,
+ description: `WS2812B LED strip length, max: 255`,
+ template: ``,
+ utils: ``
}
}
\ No newline at end of file
diff --git a/app/js/grbl-settings.js b/app/js/grbl-settings.js
index 2224d8ab..0865d803 100644
--- a/app/js/grbl-settings.js
+++ b/app/js/grbl-settings.js
@@ -143,7 +143,6 @@ function grblPopulate() {
2. Customize Profile (Optional) 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
-
+
diff --git a/app/js/websocket.js b/app/js/websocket.js
index 02691d3c..6a6b10d7 100644
--- 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 + `.
- It's firmware is currently out of date. You are running v` + status.interface.firmware.installedVersion + ` and you can now update to v` + status.interface.firmware.availVersion + `.
- Use the wizard below to update the firmware:
-