Loading...
' }, - 'control-view': require('./control-view'), - 'settings-view': require('./settings-view'), - 'motor-view': require('./motor-view'), - 'tool-view': require('./tool-view'), - 'io-view': require('./io-view'), - 'admin-general-view': require('./admin-general-view'), - 'admin-network-view': require('./admin-network-view'), - 'help-view': { template: '#help-view-template' }, - 'cheat-sheet-view': { - template: '#cheat-sheet-view-template', - data: function () { return { showUnimplemented: false } } - } + estop: { template: "#estop-template" }, + "loading-view": { template: "Loading...
" }, + "control-view": require("./control-view"), + "settings-view": require("./settings-view"), + "motor-view": require("./motor-view"), + "tool-view": require("./tool-view"), + "io-view": require("./io-view"), + "admin-general-view": require("./admin-general-view"), + "admin-network-view": require("./admin-network-view"), + "help-view": { template: "#help-view-template" }, + "cheat-sheet-view": { + template: "#cheat-sheet-view-template", + data: function () { + return { + showUnimplemented: false + }; + }, + }, + }, + + watch: { + display_units: function (value) { + localStorage.setItem("display_units", value); + }, }, events: { - 'config-changed': function () { + "config-changed": function () { this.modified = true; }, - 'hostname-changed': function (hostname) { - this.hostname = hostname - }, - send: function (msg) { - if (this.status == 'connected') { - console.debug('>', msg); + if (this.status == "connected") { this.sock.send(msg); } }, connected: function () { - this.update() + this.update(); }, update: function () { - this.update() + this.update(); }, - check: function () { - this.latestVersion = ''; + check: async function () { + try { + const response = await fetch("https://raw.githubusercontent.com/OneFinityCNC/onefinity-release/master/latest.txt", { + cache: "no-cache" + }); - $.ajax({ - type: 'GET', - url: 'https://raw.githubusercontent.com/OneFinityCNC/onefinity-release/master/latest.txt', - data: { hid: this.state.hid }, - cache: false - - }).done(function (data) { - this.latestVersion = data; - this.$broadcast('latest_version', data); - }.bind(this)) + this.latestVersion = (await response.text()).trim(); + } catch (err) { + this.latestVersion = ""; + } }, upgrade: function () { @@ -221,7 +193,7 @@ module.exports = new Vue({ // Popup error dialog this.errorShow = true; this.errorMessage = msg.msg; - } + }, }, computed: { @@ -236,49 +208,45 @@ module.exports = new Vue({ } return msgs; - } + }, }, ready: function () { - $(window).on('hashchange', this.parse_hash); + $(window).on("hashchange", this.parse_hash); this.connect(); }, methods: { - metric: function () { - return this.config.settings.units != 'IMPERIAL' - }, - block_error_dialog: function () { this.errorTimeoutStart = Date.now(); this.errorShow = false; }, toggle_video: function (e) { - if (this.video_size == 'small') this.video_size = 'large'; - else if (this.video_size == 'large') this.video_size = 'small'; - cookie.set('video-size', this.video_size); + if (this.video_size == "small") this.video_size = "large"; + else if (this.video_size == "large") this.video_size = "small"; + cookie.set("video-size", this.video_size); }, toggle_crosshair: function (e) { e.preventDefault(); this.crosshair = !this.crosshair; - cookie.set('crosshair', this.crosshair); + cookie.set("crosshair", this.crosshair); }, estop: function () { - if (this.state.xx == 'ESTOPPED') api.put('clear'); - else api.put('estop'); + if (this.state.xx == "ESTOPPED") api.put("clear"); + else api.put("estop"); }, upgrade_confirmed: async function () { this.confirmUpgrade = false; try { - await api.put('upgrade'); + await api.put("upgrade"); this.firmwareUpgrading = true; } catch (err) { - api.alert('Error during upgrade.'); + api.alert("Error during upgrade."); console.error("Error during upgrade", err); } }, @@ -287,22 +255,27 @@ module.exports = new Vue({ this.confirmUpload = false; const form = new FormData(); - form.append('firmware', this.firmware); + form.append("firmware", this.firmware); $.ajax({ - url: '/api/firmware/update', - type: 'PUT', + url: "/api/firmware/update", + type: "PUT", data: form, cache: false, contentType: false, - processData: false - - }).success(function () { - this.firmwareUpgrading = true; - }.bind(this)).error(function (err) { - api.alert('Firmware update failed'); - console.error('Firmware update failed', err); - }.bind(this)) + processData: false, + }) + .success( + function () { + this.firmwareUpgrading = true; + }.bind(this) + ) + .error( + function (err) { + api.alert("Firmware update failed"); + console.error("Firmware update failed", err); + }.bind(this) + ); }, show_upgrade: function () { @@ -310,97 +283,64 @@ module.exports = new Vue({ return is_newer_version(this.config.version, this.latestVersion); }, - update: function () { - api.get('config/load').done(function (config) { - update_object(this.config, config, true); - this.parse_hash(); + update: async function () { + const config = await api.get("config/load"); - if (!this.checkedUpgrade) { - this.checkedUpgrade = true; + update_object(this.config, config, true); + this.parse_hash(); - var check = this.config.admin['auto-check-upgrade']; - if (typeof check == 'undefined' || check) - this.$emit('check'); + if (!this.devModChecked) { + this.devModChecked = true; + if (this.config.devmode) { + SvelteComponents.createComponent("Devmode", + document.getElementById("svelte-devmode-host") + ); } + } - this.check_ip_address(); - this.check_ssid(); - }.bind(this)) - }, + if (!this.checkedUpgrade) { + this.checkedUpgrade = true; - check_ip_address: function () { - $.ajax({ - type: 'GET', - url: 'hostinfo.txt', - data: { hid: this.state.hid }, - cache: false + var check = this.config.admin["auto-check-upgrade"]; + if (typeof check == "undefined" || check) this.$emit("check"); + } - }).done(function (data) { - console.debug('>', data); - this.ipAddress = 'IP:' + data; - this.$broadcast('ipAddress', data); - }.bind(this)) - }, - - check_ssid: function () { - $.ajax({ - type: 'GET', - url: 'ssidinfo.txt', - data: { hid: this.state.hid }, - cache: false - - }).done(function (data) { - console.debug('>', data); - this.wifiSSID = 'SSID:' + data; - this.$broadcast('wifiSSID', data); - }.bind(this)) - }, - - get_ip_address: function () { - console.debug('get_ip>', this.ipAddress); - return this.ipAddress; - }, - - get_ssid: function () { - console.debug('get_ssid>', this.wifiSSID); - return this.wifiSSID; + SvelteComponents.handleConfigUpdate(this.config); }, shutdown: function () { this.confirmShutdown = false; - api.put('shutdown'); - + api.put("shutdown"); }, reboot: function () { this.confirmShutdown = false; - api.put('reboot'); + api.put("reboot"); }, connect: function () { this.sock = new Sock(`//${location.host}/sockjs`); this.sock.onmessage = (e) => { - if (typeof e.data != 'object') { + if (typeof e.data != "object") { return; } - if ('log' in e.data) { - if (e.data.log.msg === "Switch not found") { - this.$broadcast('probing_failed'); - } else { - this.$broadcast('log', e.data.log); + if ("log" in e.data) { + if (e.data.log.msg !== "Switch not found") { + this.$broadcast("log", e.data.log); } - - delete e.data.log; } // Check for session ID change on controller - if ('sid' in e.data) { - if (typeof this.sid == 'undefined') { + if ("sid" in e.data) { + if (typeof this.sid == "undefined") { this.sid = e.data.sid; } else if (this.sid != e.data.sid) { - if (typeof this.hostname !== 'undefined' && location.hostname !== 'localhost') { + if ( + typeof this.hostname !== "undefined" && + location.hostname !== "localhost" + ) { location.hostname = this.hostname; } @@ -408,49 +348,23 @@ module.exports = new Vue({ } } - // Set this to true to get console output of changes to the state - const debugStateChanges = false; - if (debugStateChanges) { - const data = omit(e.data, [ - 'vdd', - 'vin', - 'vout', - 'motor', - 'temp', - 'heartbeat', - 'load1', - 'load2', - 'rpi_temp' - ]); - if (Object.keys(data).length > 0) { - console.log(JSON.stringify(data, null, 4)); - } - } - update_object(this.state, e.data, false); - if (this.state.pw === 0) { - Vue.set(this.state, "saw_probe_connected", true); - } + SvelteComponents.handleControllerStateUpdate(this.state); - if (this.state.cycle === 'idle') { - if (this.state.wait_for_probing_complete) { - Vue.set(this.state, "wait_for_probing_complete", false); - this.$broadcast("probing_complete"); - } - } + delete this.state.log; - this.$broadcast('update'); + this.$broadcast("update"); }; this.sock.onopen = () => { - this.status = 'connected'; + this.status = "connected"; this.$emit(this.status); this.$broadcast(this.status); }; this.sock.onclose = () => { - this.status = 'disconnected'; + this.status = "disconnected"; this.$emit(this.status); this.$broadcast(this.status); }; @@ -460,47 +374,51 @@ module.exports = new Vue({ var hash = location.hash.substr(1); if (!hash.trim().length) { - location.hash = 'control'; + location.hash = "control"; return; } - var parts = hash.split(':'); + var parts = hash.split(":"); if (parts.length == 2) this.index = parts[1]; this.currentView = parts[0]; }, - save: function () { - const selected_tool = this.config.tool['selected-tool']; - const saveModbus = selected_tool !== "pwm" && + save: async function () { + const selected_tool = this.config.tool["selected-tool"]; + const saveModbus = + selected_tool !== "pwm" && selected_tool !== "laser" && selected_tool !== "router"; const settings = { - ['tool']: { ...this.config.tool }, - ['pwm-spindle']: { ...this.config['pwm-spindle'] }, - ['modbus-spindle']: saveModbus ? { ...this.config['modbus-spindle'] } : undefined - } - delete settings.tool['tool-type']; + ["tool"]: { ...this.config.tool }, + ["pwm-spindle"]: { ...this.config["pwm-spindle"] }, + ["modbus-spindle"]: saveModbus + ? { ...this.config["modbus-spindle"] } + : undefined, + }; + delete settings.tool["tool-type"]; - this.config['selected-tool-settings'][selected_tool] = settings; + this.config["selected-tool-settings"][selected_tool] = settings; - api.put('config/save', this.config).done(function (data) { + try { + await api.put("config/save", this.config); this.modified = false; - }.bind(this)).fail(function (error) { - api.alert('Save failed', error); - }); + } catch (error) { + api.alert("Save failed", error); + } }, close_messages: function (action) { - if (action == 'stop') api.put('stop'); - if (action == 'continue') api.put('unpause'); + if (action == "stop") api.put("stop"); + if (action == "continue") api.put("unpause"); // Acknowledge messages if (this.state.messages.length) { - var id = this.state.messages.slice(-1)[0].id - api.put('message/' + id + '/ack'); + var id = this.state.messages.slice(-1)[0].id; + api.put("message/" + id + "/ack"); } - } - } -}) + }, + }, +}); diff --git a/src/js/axis-vars.js b/src/js/axis-vars.js index 99eff79..0f10539 100644 --- a/src/js/axis-vars.js +++ b/src/js/axis-vars.js @@ -1,107 +1,72 @@ -/******************************************************************************\ - - This file is part of the Buildbotics firmware. - - Copyright (c) 2015 - 2018, Buildbotics LLC - All rights reserved. - - This file ("the software") is free software: you can redistribute it - and/or modify it under the terms of the GNU General Public License, - version 2 as published by the Free Software Foundation. You should - have received a copy of the GNU General Public License, version 2 - along with the software. If not, see
+
+
+
diff --git a/src/svelte-components/src/components/Devmode.svelte b/src/svelte-components/src/components/Devmode.svelte
new file mode 100644
index 0000000..43adbd5
--- /dev/null
+++ b/src/svelte-components/src/components/Devmode.svelte
@@ -0,0 +1,23 @@
+
+
+Network Info
+ +
+
+
+
+
+
+
+ {$networkInfo.hostname}
+
+
+
+
+
+
+
+
+
+
+ {#each $networkInfo.ipAddresses as ipAddress}
+
+
+
+
+ {ipAddress}
+
+
+ {/each}
+
+
+
+
+
+
+
+
+
+ Click on a Wi-Fi network to connect or disconnect.
+
+
+ -
+ {#if $networkInfo.wifi.networks.length === 0}
+
-
+
Scanning... +
+ {:else}
+ {#each $networkInfo.wifi.networks as network}
+ - onNetworkSelected(network)}
+ >
+
+ wifi + + {getWifiStrengthIcon(network)} + +
+{network.Name} + {#if network.Encryption !== "Open"} + + lock + + {/if} +
+ {/each}
+ {/if}
+
+
+
+
+
diff --git a/src/svelte-components/src/components/DimensionInput.svelte b/src/svelte-components/src/components/DimensionInput.svelte
new file mode 100644
index 0000000..e700e73
--- /dev/null
+++ b/src/svelte-components/src/components/DimensionInput.svelte
@@ -0,0 +1,93 @@
+
+
+
+
+
+
diff --git a/src/svelte-components/src/dialogs/ChangeHostnameDialog.svelte b/src/svelte-components/src/dialogs/ChangeHostnameDialog.svelte
new file mode 100644
index 0000000..de8930b
--- /dev/null
+++ b/src/svelte-components/src/dialogs/ChangeHostnameDialog.svelte
@@ -0,0 +1,94 @@
+
+
+
+ menu.setOpen(true)}
+ />
+
+
+
+