Changed DROs to 3-decimals, updated Grbl Settings for newest binary

pull/348/head
unknown 2024-04-08 16:36:02 +02:00
rodzic e769dba2f2
commit a2f56f97d3
4 zmienionych plików z 60 dodań i 11 usunięć

Wyświetl plik

@ -890,5 +890,49 @@ var grblSettingsTemplate2 = {
description: `Coolant on delay in s`,
template: `<input id="val-393-input" data-role="input" data-clear-button="false" data-append="sec" type="number" >`,
utils: ``
},
337: {
key: `$337`,
title: `WiFi Access Point (AP) BSSID`,
description: `Optional WiFi Access Point BSSID (MAC) to connect to, colon delimited values. NOTE: A hard reset of the controller is required after changing this setting.`,
template: `<input id="val-337-input" data-role="input" data-clear-button="false" data-append="MAC" type="text" >`,
utils: ``
},
394: {
key: `$394`,
title: `Spindle on delay in s, range: 0.5 - 20`,
description: `Delay to allow spindle to restart after feed hold is canceled.`,
template: `<input id="val-394-input" data-role="input" data-clear-button="false" data-append="sec" type="number" >`,
utils: ``
},
673: {
key: `$673`,
title: `Coolant on delay in s, range: 0.5 - 20`,
description: `Delay to allow coolant to restart after feed hold is canceled.`,
template: `<input id="val-673-input" data-role="input" data-clear-button="false" data-append="sec" type="number" >`,
utils: ``
},
484: {
key: `$484`,
title: `Unlock required after E-Stop as boolean`,
description: `If set unlock (by sending $X) is required after resetting a cleared E-Stop condition.`,
template: `<input id="val-484-input" data-role="input" data-clear-button="false" data-append="bool" type="number" >`,
utils: ``
},
486: {
key: `$486`,
title: `Unlock required after E-Stop as boolean`,
description: `Lock coordinate systems against accidental changes. 0 - G59.1 (1) / 1 - G59.2 (2) / 2 - G59.3 (4)`,
template: `<input id="val-486-input" data-role="input" data-clear-button="false" data-append="bitfield" type="number" >`,
utils: ``
},
650: {
key: `$650`,
title: `File systems options as bitfield`,
description: `Auto mount SD card on startup. 0 - Auto mount SD card (1) / 1 - Hide LittleFS (2)`,
template: `<input id="val-650-input" data-role="input" data-clear-button="false" data-append="bitfield" type="number" >`,
utils: ``
}
}

Wyświetl plik

@ -633,21 +633,21 @@ function initSocket() {
if (!disableDROupdates) {
if (unit == "mm") {
var xpos = status.machine.position.work.x.toFixed(2) + unit;
var ypos = status.machine.position.work.y.toFixed(2) + unit;
var zpos = status.machine.position.work.z.toFixed(2) + unit;
var apos = status.machine.position.work.a.toFixed(2) + "deg";
var xpos = status.machine.position.work.x.toFixed(3) + unit;
var ypos = status.machine.position.work.y.toFixed(3) + unit;
var zpos = status.machine.position.work.z.toFixed(3) + unit;
var apos = status.machine.position.work.a.toFixed(3) + "deg";
$(" #xPos ").attr('title', 'X Machine: ' + (status.machine.position.work.x + status.machine.position.offset.x).toFixed(2) + unit + "/ X Work: " + xpos);
$(" #yPos ").attr('title', 'Y Machine: ' + (status.machine.position.work.y + status.machine.position.offset.y).toFixed(2) + unit + "/ Y Work: " + ypos);
$(" #zPos ").attr('title', 'Z Machine: ' + (status.machine.position.work.z + status.machine.position.offset.z).toFixed(2) + unit + "/ Z Work: " + zpos);
$(" #aPos ").attr('title', 'A Machine: ' + (status.machine.position.work.a + status.machine.position.offset.a).toFixed(2) + "deg" + "/ A Work: " + apos);
$(" #xPos ").attr('title', 'X Machine: ' + (status.machine.position.work.x + status.machine.position.offset.x).toFixed(3) + unit + "/ X Work: " + xpos);
$(" #yPos ").attr('title', 'Y Machine: ' + (status.machine.position.work.y + status.machine.position.offset.y).toFixed(3) + unit + "/ Y Work: " + ypos);
$(" #zPos ").attr('title', 'Z Machine: ' + (status.machine.position.work.z + status.machine.position.offset.z).toFixed(3) + unit + "/ Z Work: " + zpos);
$(" #aPos ").attr('title', 'A Machine: ' + (status.machine.position.work.a + status.machine.position.offset.a).toFixed(3) + "deg" + "/ A Work: " + apos);
} else if (unit == "in") {
var xpos = (status.machine.position.work.x / 25.4).toFixed(3) + unit;
var ypos = (status.machine.position.work.y / 25.4).toFixed(3) + unit;
var zpos = (status.machine.position.work.z / 25.4).toFixed(3) + unit;
var apos = status.machine.position.work.a.toFixed(2) + "deg";
var apos = status.machine.position.work.a.toFixed(3) + "deg";
$(" #xPos ").attr('title', 'X Machine: ' + ((status.machine.position.work.x / 25.4) + (status.machine.position.offset.x / 25.4)).toFixed(3) + unit + "/ X Work: " + xpos);
$(" #yPos ").attr('title', 'Y Machine: ' + ((status.machine.position.work.y / 25.4) + (status.machine.position.offset.y / 25.4)).toFixed(3) + unit + "/ Y Work: " + ypos);

Wyświetl plik

@ -159,7 +159,12 @@ var grblSettingCodes = {
398: "Planner buffer blocks",
481: "Autoreport interval in ms",
376: "Rotational axes as bitfield",
337: "WiFi Access Point (AP) BSSID (MAC Address)",
394: "Spindle on delay in s after Feedhold resume",
484: "Unlock required after E-Stop as boolean",
486: "Lock coordinate systems against accidental changes",
650: "File systems options as bitfield", // Auto mount SD?
673: "Coolant on delay in s after Feedhold resume"
};

Wyświetl plik

@ -58,7 +58,7 @@ config.nextWebPort = function() {
return config.webPort;
}
config.webPort = process.env.WEB_PORT || config.nextWebPort();
config.posDecimals = process.env.DRO_DECIMALS || 2;
config.posDecimals = process.env.DRO_DECIMALS || 3;
config.grblWaitTime = 0.5;
config.firmwareWaitTime = 4;