kopia lustrzana https://github.com/OpenBuilds/OpenBuilds-CONTROL
openbuilds-engineer
rodzic
cfb8683ac7
commit
3f9122c389
|
|
@ -1,3 +1,4 @@
|
|||
v1.0.368: Updated grblHAL firmware images to 20230501, updated grblHAL Settings templates, added 3-Axes with Door firmware, Fixed bug in Firmware flashing tool for Interface > Firmware Version when offline, Updated included Interface firmware version
|
||||
v1.0.367: Fixed 'indexOf' startup Bug - removed Port Conflict Detection
|
||||
v1.0.366: Improved grblHAL integration (Additional Homing Enable Masks)
|
||||
v1.0.365: Increased Updater snooze to 8hr interval, Improved port-confict handling, Improved Recovery wizard to deal with Laser files
|
||||
|
|
|
|||
|
|
@ -722,5 +722,173 @@ var grblSettingsTemplate2 = {
|
|||
description: `Ganged axes direction invert as bitfield`,
|
||||
template: `<input id="val-8-input" data-role="input" data-clear-button="false" data-append="bitfield" type="number" >`,
|
||||
utils: ``
|
||||
},
|
||||
9: {
|
||||
key: `$9`,
|
||||
title: `PWM Spindle as bitfield where setting bit 0 enables the rest`,
|
||||
description: `PWM Spindle as bitfield where setting bit 0 enables the rest`,
|
||||
template: `<input id="val-9-input" data-role="input" data-clear-button="false" data-append="bitfield" type="number" >`,
|
||||
utils: ``
|
||||
},
|
||||
320: {
|
||||
key: `$320`,
|
||||
title: `Hostname, max: 64`,
|
||||
description: `Hostname, max: 64`,
|
||||
template: `<input id="val-320-input" data-role="input" data-clear-button="false" data-append="text" type="text" >`,
|
||||
utils: ``
|
||||
},
|
||||
322: {
|
||||
key: `$322`,
|
||||
title: `IP Address`,
|
||||
description: `IP Address`,
|
||||
template: `<input id="val-322-input" data-role="input" data-clear-button="false" data-append="ip" type="text" >`,
|
||||
utils: ``
|
||||
},
|
||||
323: {
|
||||
key: `$323`,
|
||||
title: `Gateway`,
|
||||
description: `Gateway as IP address, reboot required`,
|
||||
template: `<input id="val-323-input" data-role="input" data-clear-button="false" data-append="ip" type="text" >`,
|
||||
utils: ``
|
||||
},
|
||||
324: {
|
||||
key: `$324`,
|
||||
title: `Netmask`,
|
||||
description: `Netmask as IP address, reboot required`,
|
||||
template: `<input id="val-324-input" data-role="input" data-clear-button="false" data-append="bitfield" type="text" >`,
|
||||
utils: ``
|
||||
},
|
||||
325: {
|
||||
key: `$325`,
|
||||
title: `Telnet port`,
|
||||
description: `Telnet port, range: 1 - 65535 reboot required`,
|
||||
template: `<input id="val-325-input" data-role="input" data-clear-button="false" data-append="netmask" type="number" >`,
|
||||
utils: ``
|
||||
},
|
||||
326: {
|
||||
key: `$326`,
|
||||
title: `HTTP port`,
|
||||
description: `HTTP port, range: 1 - 65535, reboot required`,
|
||||
template: `<input id="val-326-input" data-role="input" data-clear-button="false" data-append="port" type="number" >`,
|
||||
utils: ``
|
||||
},
|
||||
327: {
|
||||
key: `$327`,
|
||||
title: `Websocket port`,
|
||||
description: `Websocket port, range: 1 - 65535, reboot require`,
|
||||
template: `<input id="val-327-input" data-role="input" data-clear-button="false" data-append="port" type="number" >`,
|
||||
utils: ``
|
||||
},
|
||||
346: {
|
||||
key: `$346`,
|
||||
title: `Restore position after M6 as boolean`,
|
||||
description: `Restore position after M6 as boolean`,
|
||||
template: `<input id="val-346-input" data-role="input" data-clear-button="false" data-append="bool" type="number" >`,
|
||||
utils: ``
|
||||
},
|
||||
396: {
|
||||
key: `$396`,
|
||||
title: `WebUI timeout in minutes`,
|
||||
description: `WebUI timeout in minutes`,
|
||||
template: `<input id="val-396-input" data-role="input" data-clear-button="false" data-append="min" type="number" >`,
|
||||
utils: ``
|
||||
},
|
||||
397: {
|
||||
key: `$397`,
|
||||
title: `WebUI auto report interval in milliseconds`,
|
||||
description: `WebUI auto report interval in milliseconds, max: 9999, reboot required`,
|
||||
template: `<input id="val-397-input" data-role="input" data-clear-button="false" data-append="ms" type="number" >`,
|
||||
utils: ``
|
||||
},
|
||||
398: {
|
||||
key: `$398`,
|
||||
title: `Planner buffer blocks`,
|
||||
description: `Planner buffer blocks, range: 30 - 1000, reboot required`,
|
||||
template: `<input id="val-398-input" data-role="input" data-clear-button="false" data-append="blocks" type="number" >`,
|
||||
utils: ``
|
||||
},
|
||||
481: {
|
||||
key: `$481`,
|
||||
title: `Autoreport interval in ms`,
|
||||
description: `Autoreport interval in ms, range: 100 - 1000, reboot required`,
|
||||
template: `<input id="val-481-input" data-role="input" data-clear-button="false" data-append="ms" type="number" >`,
|
||||
utils: ``
|
||||
},
|
||||
376: {
|
||||
key: `$376`,
|
||||
title: `Rotational axes as bitfield`,
|
||||
description: `Autoreport interval in ms, range: 100 - 1000, reboot required`,
|
||||
template: `<input id="val-376-input" data-role="input" data-clear-button="false" data-append="bitfield" type="number" >`,
|
||||
utils: ``
|
||||
},
|
||||
41: {
|
||||
key: `$41`,
|
||||
title: `Parking cycle as bitfield where setting bit 0 enables the rest`,
|
||||
description: `Parking cycle: Enable (1), Enable parking override control (2), Deactivate upon init (4)`,
|
||||
template: `<input id="val-41-input" data-role="input" data-clear-button="false" data-append="bitfield" type="number" >`,
|
||||
utils: ``
|
||||
},
|
||||
42: {
|
||||
key: `$42`,
|
||||
title: `Parking axis`,
|
||||
description: `Parking axis: X=1, Y=2, Z=4`,
|
||||
template: `<input id="val-42-input" data-role="input" data-clear-button="false" data-append="bitfield" type="number" >`,
|
||||
utils: ``
|
||||
},
|
||||
56: {
|
||||
key: `$56`,
|
||||
title: `Parking pull-out distance in mm`,
|
||||
description: ``,
|
||||
template: `<input id="val-56-input" data-role="input" data-clear-button="false" data-append="mm" type="number" >`,
|
||||
utils: ``
|
||||
},
|
||||
57: {
|
||||
key: `$57`,
|
||||
title: `Parking pull-out rate in mm/min`,
|
||||
description: ``,
|
||||
template: `<input id="val-57-input" data-role="input" data-clear-button="false" data-append="mm/min" type="number" >`,
|
||||
utils: ``
|
||||
},
|
||||
58: {
|
||||
key: `$58`,
|
||||
title: `Parking target in mm`,
|
||||
description: `Parking target in mm`,
|
||||
template: `<input id="val-58-input" data-role="input" data-clear-button="false" data-append="mm" type="number" >`,
|
||||
utils: ``
|
||||
},
|
||||
59: {
|
||||
key: `$59`,
|
||||
title: `Parking fast rate in mm/min`,
|
||||
description: `Parking fast rate in mm/min`,
|
||||
template: `<input id="val-59-input" data-role="input" data-clear-button="false" data-append="mm/min" type="number" >`,
|
||||
utils: ``
|
||||
},
|
||||
60: {
|
||||
key: `$60`,
|
||||
title: `Restore overrides`,
|
||||
description: `Restore overrides`,
|
||||
template: `<input id="val-60-input" data-role="input" data-clear-button="false" data-append="bool" type="number" >`,
|
||||
utils: ``
|
||||
},
|
||||
61: {
|
||||
key: `$61`,
|
||||
title: `Safety door options as bitfield`,
|
||||
description: `Ignore when idle (1), Keep coolant state on open (2)`,
|
||||
template: `<input id="val-61-input" data-role="input" data-clear-button="false" data-append="bitfield" type="number" >`,
|
||||
utils: ``
|
||||
},
|
||||
392: {
|
||||
key: `$392`,
|
||||
title: `Spindle on delay in s`,
|
||||
description: `Spindle on delay in s`,
|
||||
template: `<input id="val-392-input" data-role="input" data-clear-button="false" data-append="sec" type="number" >`,
|
||||
utils: ``
|
||||
},
|
||||
393: {
|
||||
key: `$393`,
|
||||
title: `Coolant on delay in s`,
|
||||
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: ``
|
||||
}
|
||||
}
|
||||
|
|
@ -35,8 +35,8 @@ function openFlashingTool() {
|
|||
|
||||
<p class="small mb-4">You can use this wizard to flash Firmware onto compatible controllers. Only use with care, or when instructed by Support</p>
|
||||
<ul data-role="tabs" data-expand="true">
|
||||
<li><a href="#" onclick="flashToolBoard('blackbox4x');"><img src="/wizards/flashingtool2/img/bb4x-icon.png"> BlackBox 4X</a></li>
|
||||
<li><a href="#" onclick="flashToolBoard('blackboxx32');"><img src="/wizards/flashingtool2/img/bbx32-icon.png"> BlackBox X32</a></li>
|
||||
<li><a href="#" onclick="flashToolBoard('blackbox4x');"><img src="/wizards/flashingtool2/img/bb4x-icon.png"> BlackBox 4X</a></li>
|
||||
<li><a href="#" onclick="flashToolBoard('interfacev1');"><img src="/wizards/flashingtool2/img/interfacev1-icon.png"> Interface</a></li>
|
||||
</ul>
|
||||
|
||||
|
|
@ -59,7 +59,7 @@ function openFlashingTool() {
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row" id="flash-tool-grbl-row">
|
||||
<div class="row" id="flash-tool-grbl-row" style="display: none;">
|
||||
<div class="cell-md-3 mb-1">Machine Style</div>
|
||||
<div class="cell-md-9 mb-1">
|
||||
<select data-prepend=" <i class='fas fa-cube'></i>" data-role="select" data-filter="false" id="grblAxesCount" data-editable="true">
|
||||
|
|
@ -72,13 +72,13 @@ function openFlashingTool() {
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row" id="flash-tool-grblhal-row" style="display: none;">
|
||||
<div class="row" id="flash-tool-grblhal-row">
|
||||
<div class="cell-md-3 mb-1">Machine Style</div>
|
||||
<div class="cell-md-9 mb-1">
|
||||
<select data-prepend=" <i class='fas fa-cube'></i>" data-role="select" data-filter="false" id="grblHalAxesCount" data-editable="true">
|
||||
<option value="3axes-grblhal">3 Axes CNC/Laser: Dual-Y with XYZ Axis Homing</option>
|
||||
<!-- option value="2axes-grblhal">2 Axes CNC/Laser: Dual-Y with Z-Axis Homing Disabled</option -->
|
||||
<option value="4axes-grblhal">4 Axes CNC/Laser: with XYZA Axis Homing</option>
|
||||
<option value="3axes-grblhal">2/3 Axes CNC/Laser: Dual-Y</option>
|
||||
<option value="3axes-grblhal-door">2/3 Axes CNC/Laser: Dual-Y with Door Switch</option>
|
||||
<option value="4axes-grblhal">4 Axes CNC/Laser (Y2 Motor as A, Z Limit shared for A)</option>
|
||||
<option value="custom">Custom: firmware .BIN file</option>
|
||||
</select>
|
||||
</div>
|
||||
|
|
@ -133,20 +133,16 @@ function openFlashingTool() {
|
|||
|
||||
$("#grblAxesCount").on("change", function() {
|
||||
if (this.value == "custom") {
|
||||
$("#flash-tool-door-row").hide();
|
||||
$("#flash-tool-custom-row").show();
|
||||
} else {
|
||||
$("#flash-tool-door-row").show();
|
||||
$("#flash-tool-custom-row").hide();
|
||||
}
|
||||
});
|
||||
|
||||
$("#grblHalAxesCount").on("change", function() {
|
||||
if (this.value == "custom") {
|
||||
$("#flash-tool-door-row").hide();
|
||||
$("#flash-tool-custom-row").show();
|
||||
} else {
|
||||
$("#flash-tool-door-row").show();
|
||||
$("#flash-tool-custom-row").hide();
|
||||
}
|
||||
});
|
||||
|
|
@ -160,13 +156,14 @@ function openFlashingTool() {
|
|||
});
|
||||
|
||||
setTimeout(function() {
|
||||
var opts = `<option value="custom">Custom: firmware binary file</option>`;
|
||||
|
||||
var opts = `<option value="bundle">Bundled version</option>
|
||||
<option value="custom">Custom: firmware binary file</option>`;
|
||||
if (parseFloat(laststatus.interface.firmware.availVersion) > 0) {
|
||||
opts += `<option value="online" selected>Latest available v` + laststatus.interface.firmware.availVersion + `</option>`;
|
||||
var fwselect = $("#interfaceFirmwareVer").data("select");
|
||||
fwselect.data(opts);
|
||||
}
|
||||
var fwselect = $("#interfaceFirmwareVer").data("select");
|
||||
fwselect.data(opts);
|
||||
|
||||
populatePortsMenu();
|
||||
|
||||
}, 200);
|
||||
|
|
@ -242,8 +239,8 @@ function flashFirmwarefromWizard() {
|
|||
|
||||
if ($("#grblHalAxesCount").val() == "3axes-grblhal") {
|
||||
var filename = "grblhal-grbl3axis.bin";
|
||||
} else if ($("#grblHalAxesCount").val() == "2axes-grblhal") {
|
||||
var filename = "";
|
||||
} else if ($("#grblHalAxesCount").val() == "3axes-grblhal-door") {
|
||||
var filename = "grblhal-grbl3axis-door.bin";
|
||||
} else if ($("#grblHalAxesCount").val() == "4axes-grblhal") {
|
||||
var filename = "grblhal-grbl4axis.bin";
|
||||
}
|
||||
|
|
|
|||
BIN
firmware.bin
BIN
firmware.bin
Plik binarny nie jest wyświetlany.
|
|
@ -143,7 +143,23 @@ var grblSettingCodes = {
|
|||
73: "Wifi Mode", // Off/Station
|
||||
74: "SSID",
|
||||
75: "PSK",
|
||||
65: "Require homing sequence to be executed at startup"
|
||||
65: "Require homing sequence to be executed at startup",
|
||||
8: "Ganged axes direction invert as bitfield",
|
||||
9: "PWM Spindle as bitfield where setting bit 0 enables the rest",
|
||||
320: "Hostname, max: 64",
|
||||
322: "IP Address",
|
||||
323: "Gateway",
|
||||
324: "Netmask",
|
||||
325: "Telnet port",
|
||||
326: "HTTP port",
|
||||
327: "Websocket port",
|
||||
346: "Restore position after M6 as boolean",
|
||||
396: "WebUI timeout in minutes",
|
||||
397: "WebUI auto report interval in milliseconds",
|
||||
398: "Planner buffer blocks",
|
||||
481: "Autoreport interval in ms",
|
||||
376: "Rotational axes as bitfield",
|
||||
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
Plik binarny nie jest wyświetlany.
Plik binarny nie jest wyświetlany.
Plik binarny nie jest wyświetlany.
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "OpenBuildsCONTROL",
|
||||
"version": "1.0.367",
|
||||
"version": "1.0.368",
|
||||
"license": "AGPL-3.0",
|
||||
"description": "OpenBuildsCONTROL CNC Machine Host Software",
|
||||
"author": "github.com/openbuilds <support@openbuilds.com>",
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue