kopia lustrzana https://github.com/OpenBuilds/OpenBuilds-CONTROL
Fix #68 and fix some other minor bugs
openbuilds-engineer
rodzic
775000831d
commit
da0037f1b9
|
|
@ -1,3 +1,4 @@
|
|||
v1.0.157: Fix Grbl settings invert display: Bug #66,
|
||||
v1.0.156: Added Job Time Remaining functionality
|
||||
v1.0.155: Added Continuous Jog Functionality (Enable from the Keyboard Shortcuts icon on the top toolbar) (BETA)
|
||||
v1.0.154: added Keyboard Shortcuts Frontend
|
||||
|
|
|
|||
|
|
@ -705,43 +705,61 @@ function selectMachine(type) {
|
|||
};
|
||||
|
||||
function setMachineButton(type) {
|
||||
var overlaytype = "custom";
|
||||
if (type == "sphinx55") {
|
||||
template = `<img src="img/mch/` + type + `.png"/> OpenBuilds Sphinx 55`
|
||||
overlaytype = type;
|
||||
} else if (type == "sphinx1050") {
|
||||
template = `<img src="img/mch/` + type + `.png"/> OpenBuilds Sphinx 1050`
|
||||
overlaytype = type;
|
||||
} else if (type == "workbee1050") {
|
||||
template = `<img src="img/mch/` + type + `.png"/> OpenBuilds Workbee 1050`
|
||||
overlaytype = type;
|
||||
} else if (type == "workbee1010") {
|
||||
template = `<img src="img/mch/` + type + `.png"/> OpenBuilds Workbee 1010`
|
||||
overlaytype = type;
|
||||
} else if (type == "workbee1510") {
|
||||
template = `<img src="img/mch/` + type + `.png"/> OpenBuilds Workbee 1510`
|
||||
overlaytype = type;
|
||||
} else if (type == "acro55") {
|
||||
template = `<img src="img/mch/` + type + `.png"/> OpenBuilds Acro 55`
|
||||
overlaytype = type;
|
||||
} else if (type == "acro510") {
|
||||
template = `<img src="img/mch/` + type + `.png"/> OpenBuilds Acro 510`
|
||||
overlaytype = type;
|
||||
} else if (type == "acro1010") {
|
||||
template = `<img src="img/mch/` + type + `.png"/> OpenBuilds Acro 1010`
|
||||
overlaytype = type;
|
||||
} else if (type == "acro1510") {
|
||||
template = `<img src="img/mch/` + type + `.png"/> OpenBuilds Acro 1510`
|
||||
overlaytype = type;
|
||||
} else if (type == "acro1515") {
|
||||
template = `<img src="img/mch/` + type + `.png"/> OpenBuilds Acro 1515`
|
||||
overlaytype = type;
|
||||
} else if (type == "minimill") {
|
||||
template = `<img src="img/mch/` + type + `.png"/> OpenBuilds MiniMill`
|
||||
overlaytype = type;
|
||||
} else if (type == "cbeam") {
|
||||
template = `<img src="img/mch/` + type + `.png"/> OpenBuilds C-Beam Machine`
|
||||
overlaytype = type;
|
||||
} else if (type == "cbeamxl") {
|
||||
template = `<img src="img/mch/` + type + `.png"/> OpenBuilds C-Beam XL`
|
||||
overlaytype = type;
|
||||
} else if (type == "leadmachine55") {
|
||||
template = `<img src="img/mch/` + type + `.png"/> OpenBuilds Lead Machine 55`
|
||||
overlaytype = type;
|
||||
} else if (type == "leadmachine1010") {
|
||||
template = `<img src="img/mch/` + type + `.png"/> OpenBuilds Lead Machine 1010`
|
||||
overlaytype = type;
|
||||
} else if (type == "custom") {
|
||||
template = `<img src="img/mch/` + type + `.png"/> Custom Machine`
|
||||
overlaytype = type;
|
||||
} else {
|
||||
template = `<img src="img/mch/sphinx55.png"/> Select Machine`
|
||||
overlaytype = "custom"
|
||||
}
|
||||
$('#context_toggle2').html(template);
|
||||
$('#overlayimg').html(`<img src="img/mch/` + type + `.png" style="max-width:100%; max-height:100%;"/><span onclick="$('#grblTab').click()" style="position: absolute; top: 3px; right:3px; z-index: 1;" class="fas fa-cogs machineicon" style="text-shadow: 2px 2px 4px #cccccc;"></span>`)
|
||||
$('#overlayimg').html(`<img src="img/mch/` + overlaytype + `.png" style="max-width:100%; max-height:100%;"/><span onclick="$('#grblTab').click()" style="position: absolute; top: 3px; right:3px; z-index: 1;" class="fas fa-cogs machineicon" style="text-shadow: 2px 2px 4px #cccccc;"></span>`)
|
||||
};
|
||||
|
||||
function flashGrblfromTroubleshooting() {
|
||||
|
|
|
|||
|
|
@ -141,8 +141,8 @@ function grblPopulate() {
|
|||
<option value="0">[0] X:⚪ Y:⚪ Z:⚪</option>
|
||||
<option value="1">[1] X:⚫ Y:⚪ Z:⚪</option>
|
||||
<option value="2">[2] X:⚪ Y:⚫ Z:⚪</option>
|
||||
<option value="3">[3] X:⚪ Y:⚪ Z:⚫</option>
|
||||
<option value="4">[4] X:⚫ Y:⚫ Z:⚪</option>
|
||||
<option value="3">[3] X:⚫ Y:⚫ Z:⚪</option>
|
||||
<option value="4">[4] X:⚪ Y:⚪ Z:⚫</option>
|
||||
<option value="5">[5] X:⚫ Y:⚪ Z:⚫</option>
|
||||
<option value="6">[6] X:⚪ Y:⚫ Z:⚫</option>
|
||||
<option value="7">[7] X:⚫ Y:⚫ Z:⚫</option>
|
||||
|
|
@ -174,8 +174,8 @@ function grblPopulate() {
|
|||
<option value="0">[0] X:⚪ Y:⚪ Z:⚪</option>
|
||||
<option value="1">[1] X:⚫ Y:⚪ Z:⚪</option>
|
||||
<option value="2">[2] X:⚪ Y:⚫ Z:⚪</option>
|
||||
<option value="3">[3] X:⚪ Y:⚪ Z:⚫</option>
|
||||
<option value="4">[4] X:⚫ Y:⚫ Z:⚪</option>
|
||||
<option value="3">[3] X:⚫ Y:⚫ Z:⚪</option>
|
||||
<option value="4">[4] X:⚪ Y:⚪ Z:⚫</option>
|
||||
<option value="5">[5] X:⚫ Y:⚪ Z:⚫</option>
|
||||
<option value="6">[6] X:⚪ Y:⚫ Z:⚫</option>
|
||||
<option value="7">[7] X:⚫ Y:⚫ Z:⚫</option>
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ $(document).ready(function() {
|
|||
function bindKeys() {
|
||||
// Clear all current binds
|
||||
$(document).unbind('keydown');
|
||||
console.log("Refreshing Keybindings")
|
||||
// console.log("Refreshing Keybindings")
|
||||
|
||||
// Bind for Electron Devtools
|
||||
document.addEventListener('keydown', function(evt) {
|
||||
|
|
|
|||
|
|
@ -20,9 +20,9 @@ function getChangelog() {
|
|||
$("#changelog").html(template2);
|
||||
});
|
||||
|
||||
if (!Metro.dialog.isOpen('#settingsmodal')) {
|
||||
Metro.dialog.open('#splashModal')
|
||||
}
|
||||
// if (!Metro.dialog.isOpen('#settingsmodal')) {
|
||||
// Metro.dialog.open('#splashModal')
|
||||
// }
|
||||
}
|
||||
|
||||
$(document).ready(function() {
|
||||
|
|
@ -76,7 +76,7 @@ $(document).ready(function() {
|
|||
|
||||
|
||||
$.get("/gcode").done(function(data) {
|
||||
console.log(data.length)
|
||||
// console.log(data.length)
|
||||
if (data.length > 2) {
|
||||
editor.session.setValue(data);
|
||||
parseGcodeInWebWorker(data)
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@ $(document).ready(function() {
|
|||
function checkUpdate() {
|
||||
if (!isMac && webgl) {
|
||||
setTimeout(function() {
|
||||
console.log('checking for update')
|
||||
// console.log('checking for update')
|
||||
printLog("<span class='fg-red'>[ update ] </span><span class='fg-green'>Checking for Updates</span>")
|
||||
$.getJSON("https://api.github.com/repos/OpenBuilds/SW-Machine-Drivers/releases/latest?client_id=fbbb80debc1197222169&client_secret=7dc6e463422e933448f9a3a4150c8d2bbdd0f87c").done(function(release) {
|
||||
var availVersion = release.name.substr(1)
|
||||
var currentVersion = laststatus.driver.version
|
||||
console.log(versionCompare(availVersion, currentVersion), availVersion, currentVersion);
|
||||
// console.log(versionCompare(availVersion, currentVersion), availVersion, currentVersion);
|
||||
if (versionCompare(availVersion, currentVersion) == 1) {
|
||||
console.log('outdated')
|
||||
time = 10
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "OpenBuildsCONTROL",
|
||||
"version": "1.0.156",
|
||||
"version": "1.0.157",
|
||||
"license": "AGPL-3.0",
|
||||
"description": "Machine Interface Driver for OpenBuilds",
|
||||
"author": "github.com/openbuilds <webmaster@openbuilds.com>",
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue