diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 81a10ba..c91c0ec 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,5 @@ -v1.0.365: Increased Updater snooze to 8hr interval +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 v1.0.364: Fixed bug in Surfacing Wizard Freeze bug (Special thanks to Armaliteguy for providing debug info) v1.0.363: Renewed SSL certificates for API integration v1.0.362: Fixed typo in port left over from earlier test diff --git a/app/js/grbl-settings.js b/app/js/grbl-settings.js index ed7ea56..96de224 100644 --- a/app/js/grbl-settings.js +++ b/app/js/grbl-settings.js @@ -85,7 +85,7 @@ function grblSettings(data) { - if (grblParams['$22'] == 1) { + if (grblParams['$22'] > 0) { $('#gotozeroMPos').removeClass('disabled') $('#homeBtn').attr('disabled', false) $('#gotoXzeroMpos').removeClass('disabled') @@ -327,7 +327,7 @@ function grblPopulate() { $('#grblSettingsBadge').hide(); - if (grblParams['$21'] == 1 && grblParams['$22'] == 1) { + if (grblParams['$21'] == 1 && grblParams['$22'] > 0) { $('#limitsinstalled:checkbox').prop('checked', true); $('#gotozeroMPos').removeClass('disabled') $('#homeBtn').attr('disabled', false) diff --git a/grblStrings.js b/grblStrings.js index 6b04f8a..6770fe3 100644 --- a/grblStrings.js +++ b/grblStrings.js @@ -36,7 +36,8 @@ var grblErrorCodes = { 34: "A G2 or G3 arc, traced with the radius definition, had a mathematical error when computing the arc geometry. Try either breaking up the arc into semi-circles or quadrants, or redefine them with the arc offset definition.", 35: "A G2 or G3 arc, traced with the offset definition, is missing the IJK offset word in the selected plane to trace the arc.", 36: "There are unused, leftover G-code words that aren't used by any command in the block.", - 37: "The G43.1 dynamic tool length offset command cannot apply an offset to an axis other than its configured axis. The Grbl default axis is the Z-axis." + 37: "The G43.1 dynamic tool length offset command cannot apply an offset to an axis other than its configured axis. The Grbl default axis is the Z-axis.", + 46: "Home machine to continue" }; var grblAlarmCodes = { diff --git a/index.js b/index.js index 738afeb..82502e3 100644 --- a/index.js +++ b/index.js @@ -1,16 +1,15 @@ process.env.ELECTRON_DISABLE_SECURITY_WARNINGS = '1'; process.on('uncaughtException', function(err) { - showErrorDialog(err,attempts = 2) // make two attempts to show an uncaughtException in a dialog + showErrorDialog(err, attempts = 2) // make two attempts to show an uncaughtException in a dialog if (DEBUG) { debug_log(err) - } - else { + } else { console.log(err); } }) -function showErrorDialog(err,attempts) { +function showErrorDialog(err, attempts) { console.error('Attempting to show an error dialog.') if (!attempts) return; try { @@ -22,11 +21,12 @@ function showErrorDialog(err,attempts) { detail: `${err.message}\r\r\rIf you feel this shouldn't be happening, please report it at:\r\rhttps://github.com/OpenBuilds/OpenBuilds-CONTROL/issues`, }; let window = BrowserWindow.getFocusedWindow() - dialog.showMessageBoxSync(window,options) - } - catch(e) { + dialog.showMessageBoxSync(window, options) + } catch (e) { console.error(`An error occurred trying show an error, ho-boy. ${e}. We'll try again ${attempts} more time(s).`) - setTimeout(() => {showErrorDialog(err,--attempts)}, millisecondDelay = 2000); + setTimeout(() => { + showErrorDialog(err, --attempts) + }, millisecondDelay = 2000); } } @@ -47,9 +47,9 @@ function debug_log() { debug_log("Starting OpenBuilds CONTROL v" + require('./package').version) var config = {}; -config.webPorts = [3000,3020,3200,3220] +config.webPorts = [3000, 3020, 3200, 3220] config.webPortIdx = 0; -config.nextWebPort = function () { +config.nextWebPort = function() { config.webPort = config.webPorts[config.webPortIdx] config.webPortIdx++ if (config.webPortIdx == config.webPorts.length) { @@ -151,9 +151,10 @@ function httpServerSuccess() { } } -function httpServerError (error) { +function httpServerError(error) { + // If unable to start (port in use) - try next port in array from config.nextWebPort() console.error(error.message); - httpserver.listen(config.nextWebPort()); + httpserver.listen(config.nextWebPort()); } io.attach(httpserver); diff --git a/package.json b/package.json index e246bcf..e3cf621 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "OpenBuildsCONTROL", - "version": "1.0.365", + "version": "1.0.366", "license": "AGPL-3.0", "description": "OpenBuildsCONTROL CNC Machine Host Software", "author": "github.com/openbuilds ",