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 }; - }, - }, - }, - - events: { - "config-changed": function () { - this.modified = true; + data: function() { + return { + status: "connecting", + currentView: "loading", + display_units: localStorage.getItem("display_units") || "METRIC", + index: -1, + modified: false, + template: require("../resources/config-template.json"), + config: { + settings: { units: "METRIC" }, + motors: [ {}, {}, {}, {} ], + version: "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 + }; + }, + }, }, - connected: function () { - this.update(); + watch: { + display_units: function(value) { + localStorage.setItem("display_units", value); + SvelteComponents.setDisplayUnits(value); + }, }, - update: function () { - this.update(); - }, + events: { + "config-changed": function() { + this.modified = true; + }, - check: async function () { - try { - const response = await fetch("https://raw.githubusercontent.com/OneFinityCNC/onefinity-release/master/latest.txt", { - cache: "no-cache" - }); + send: function(msg) { + if (this.status == "connected") { + this.sock.send(msg); + } + }, - this.latestVersion = (await response.text()).trim(); - } catch (err) { - this.latestVersion = ""; - } - }, + connected: function() { + this.update(); + }, - upgrade: function () { - this.confirmUpgrade = true; - }, + update: function() { + this.update(); + }, - upload: function (firmware) { - this.firmware = firmware; - this.firmwareName = firmware.name; - this.confirmUpload = true; - }, + check: async function() { + try { + const response = await fetch("https://raw.githubusercontent.com/OneFinityCNC/onefinity-release/master/latest.txt", { + cache: "no-cache" + }); - error: function (msg) { - // Honor user error blocking - if (Date.now() - this.errorTimeoutStart < this.errorTimeout * 1000) - return; + this.latestVersion = (await response.text()).trim(); + } catch (err) { + this.latestVersion = ""; + } + }, - // Wait at least 1 sec to pop up repeated errors - if (1 < msg.repeat && Date.now() - msg.ts < 1000) { - return; - } + upgrade: function() { + this.confirmUpgrade = true; + }, - // Popup error dialog - this.errorShow = true; - this.errorMessage = msg.msg; - }, - }, + upload: function(firmware) { + this.firmware = firmware; + this.firmwareName = firmware.name; + this.confirmUpload = true; + }, - computed: { - popupMessages: function () { - const msgs = []; - - for (let i = 0; i < this.state.messages.length; i++) { - const text = this.state.messages[i].text; - if (!/^#/.test(text)) { - msgs.push(text); - } - } - - return msgs; - }, - }, - - ready: function () { - $(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); - }, - - toggle_crosshair: function (e) { - e.preventDefault(); - this.crosshair = !this.crosshair; - cookie.set("crosshair", this.crosshair); - }, - - estop: function () { - if (this.state.xx == "ESTOPPED") api.put("clear"); - else api.put("estop"); - }, - - upgrade_confirmed: async function () { - this.confirmUpgrade = false; - - try { - await api.put("upgrade"); - this.firmwareUpgrading = true; - } catch (err) { - api.alert("Error during upgrade."); - console.error("Error during upgrade", err); - } - }, - - upload_confirmed: function () { - this.confirmUpload = false; - - const form = new FormData(); - form.append("firmware", this.firmware); - - $.ajax({ - 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) - ); - }, - - show_upgrade: function () { - if (!this.latestVersion) return false; - return is_newer_version(this.config.version, this.latestVersion); - }, - - update: async function () { - const config = await api.get("config/load"); - - update_object(this.config, config, true); - this.parse_hash(); - - if (!this.checkedUpgrade) { - this.checkedUpgrade = true; - - var check = this.config.admin["auto-check-upgrade"]; - if (typeof check == "undefined" || check) this.$emit("check"); - } - - }, - - shutdown: function () { - this.confirmShutdown = false; - api.put("shutdown"); - }, - - reboot: function () { - this.confirmShutdown = false; - api.put("reboot"); - }, - - connect: function () { - this.sock = new Sock(`//${location.host}/sockjs`); - - this.sock.onmessage = (e) => { - 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); - } - - delete e.data.log; - } - - // Check for session ID change on controller - 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" - ) { - location.hostname = this.hostname; + error: function(msg) { + // Honor user error blocking + if (Date.now() - this.errorTimeoutStart < this.errorTimeout * 1000) { + return; } - location.reload(); - } - } + // Wait at least 1 sec to pop up repeated errors + if (1 < msg.repeat && Date.now() - msg.ts < 1000) { + return; + } - // 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); - } - - 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"); - } - } - - this.$broadcast("update"); - }; - - this.sock.onopen = () => { - this.status = "connected"; - this.$emit(this.status); - this.$broadcast(this.status); - }; - - this.sock.onclose = () => { - this.status = "disconnected"; - this.$emit(this.status); - this.$broadcast(this.status); - }; + // Popup error dialog + this.errorShow = true; + this.errorMessage = msg.msg; + }, }, - parse_hash: function () { - var hash = location.hash.substr(1); + computed: { + popupMessages: function() { + const msgs = []; - if (!hash.trim().length) { - location.hash = "control"; - return; - } + for (let i = 0; i < this.state.messages.length; i++) { + const text = this.state.messages[i].text; + if (!/^#/.test(text)) { + msgs.push(text); + } + } - var parts = hash.split(":"); - - if (parts.length == 2) this.index = parts[1]; - - this.currentView = parts[0]; + return msgs; + }, }, - save: 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"]; + ready: function() { + window.onhashchange = () => this.parse_hash(); + this.connect(); - this.config["selected-tool-settings"][selected_tool] = settings; - - api - .put("config/save", this.config) - .done( - function (data) { - this.modified = false; - }.bind(this) - ) - .fail(function (error) { - api.alert("Save failed", error); + SvelteComponents.registerControllerMethods({ + dispatch: (...args) => this.$dispatch(...args) }); }, - close_messages: function (action) { - if (action == "stop") api.put("stop"); - if (action == "continue") api.put("unpause"); + methods: { + block_error_dialog: function() { + this.errorTimeoutStart = Date.now(); + this.errorShow = false; + }, - // Acknowledge messages - if (this.state.messages.length) { - var id = this.state.messages.slice(-1)[0].id; - api.put("message/" + id + "/ack"); - } + toggle_video: function() { + 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); + }, + + estop: function() { + if (this.state.xx == "ESTOPPED") { + api.put("clear"); + } else { + api.put("estop"); + } + }, + + upgrade_confirmed: async function() { + this.confirmUpgrade = false; + + try { + await api.put("upgrade"); + this.firmwareUpgrading = true; + } catch (error) { + console.error("Error during upgrade:", error); + alert("Error during upgrade"); + } + }, + + upload_confirmed: async function() { + this.confirmUpload = false; + + const form = new FormData(); + form.append("firmware", this.firmware); + + try { + await api.put("firmware/update", form); + this.firmwareUpgrading = true; + } catch (error) { + console.error("Firmware update failed:", error); + alert("Firmware update failed"); + } + }, + + show_upgrade: function() { + if (!this.latestVersion) { + return false; + } + + return is_newer_version(this.config.version, this.latestVersion); + }, + + showShutdownDialog: function() { + SvelteComponents.showDialog("Shutdown"); + }, + + update: async function() { + const config = await api.get("config/load"); + + update_object(this.config, config, true); + this.parse_hash(); + + if (!this.checkedUpgrade) { + this.checkedUpgrade = true; + + const check = this.config.admin["auto-check-upgrade"]; + if (typeof check == "undefined" || check) { + this.$emit("check"); + } + } + + SvelteComponents.handleConfigUpdate(this.config); + }, + + connect: function() { + this.sock = new Sock(`//${location.host}/sockjs`); + + this.sock.onmessage = (e) => { + if (typeof e.data != "object") { + return; + } + + if ("log" in e.data) { + if (e.data.log.msg !== "Switch not found") { + this.$broadcast("log", e.data.log); + } + } + + // Check for session ID change on controller + if ("sid" in e.data) { + if (typeof this.sid == "undefined") { + this.sid = e.data.sid; + } else if (this.sid != e.data.sid) { + if (this.hostname && location.hostname !== "localhost") { + location.hostname = this.hostname; + } + + location.reload(); + } + } + + update_object(this.state, e.data, false); + + SvelteComponents.handleControllerStateUpdate(this.state); + + delete this.state.log; + + this.$broadcast("update"); + }; + + this.sock.onopen = () => { + this.status = "connected"; + this.$emit(this.status); + this.$broadcast(this.status); + }; + + this.sock.onclose = () => { + this.status = "disconnected"; + this.$emit(this.status); + this.$broadcast(this.status); + }; + }, + + parse_hash: function() { + const hash = location.hash.substr(1); + + if (!hash.trim().length) { + location.hash = "control"; + return; + } + + const parts = hash.split(":"); + + if (parts.length == 2) { + this.index = parts[1]; + } + + this.currentView = parts[0]; + }, + + 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"]; + + this.config["selected-tool-settings"][selected_tool] = settings; + + try { + await api.put("config/save", this.config); + this.modified = false; + } catch (error) { + console.error("Save failed:", error); + alert("Save failed"); + } + }, + + close_messages: function(action) { + if (action == "stop") { + api.put("stop"); + } + + if (action == "continue") { + api.put("unpause"); + } + + // Acknowledge messages + if (this.state.messages.length) { + const id = this.state.messages.slice(-1)[0].id; + api.put(`message/${id}/ack`); + } + }, }, - }, }); diff --git a/src/js/axis-control.js b/src/js/axis-control.js index c6fa5c3..81a9bed 100644 --- a/src/js/axis-control.js +++ b/src/js/axis-control.js @@ -1,65 +1,37 @@ -/******************************************************************************\ - - 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
-
Network Info
+Network Info
-
-
-
-
-
- {$networkInfo.hostname}
-
-
-
+
-
+
-
+
+
+
+ {$networkInfo.hostname}
+
+
+
+
-
- Rebooting to apply the hostname change...
+
+ Rebooting to apply the hostname change...
diff --git a/src/svelte-components/src/dialogs/DialogHost.svelte b/src/svelte-components/src/dialogs/DialogHost.svelte
new file mode 100644
index 0000000..2a1ad54
--- /dev/null
+++ b/src/svelte-components/src/dialogs/DialogHost.svelte
@@ -0,0 +1,244 @@
+
+
+
+
+
+ Rebooting to apply the new screen rotation...
+
+
+
+
+
diff --git a/src/svelte-components/src/dialogs/SetAxisPositionDialog.svelte b/src/svelte-components/src/dialogs/SetAxisPositionDialog.svelte
new file mode 100644
index 0000000..76f3cef
--- /dev/null
+++ b/src/svelte-components/src/dialogs/SetAxisPositionDialog.svelte
@@ -0,0 +1,75 @@
+
+
+
diff --git a/src/svelte-components/src/dialogs/SetTimeDialog.svelte b/src/svelte-components/src/dialogs/SetTimeDialog.svelte
new file mode 100644
index 0000000..1ab5578
--- /dev/null
+++ b/src/svelte-components/src/dialogs/SetTimeDialog.svelte
@@ -0,0 +1,256 @@
+
+
+
+
+
diff --git a/src/svelte-components/src/dialogs/ShutdownDialog.svelte b/src/svelte-components/src/dialogs/ShutdownDialog.svelte
new file mode 100644
index 0000000..ca8528f
--- /dev/null
+++ b/src/svelte-components/src/dialogs/ShutdownDialog.svelte
@@ -0,0 +1,38 @@
+
+
+
diff --git a/src/svelte-components/src/dialogs/UploadDialog.svelte b/src/svelte-components/src/dialogs/UploadDialog.svelte
new file mode 100644
index 0000000..4e4fa0d
--- /dev/null
+++ b/src/svelte-components/src/dialogs/UploadDialog.svelte
@@ -0,0 +1,83 @@
+
+
+
diff --git a/src/svelte-components/src/dialogs/WifiConnectionDialog.svelte b/src/svelte-components/src/dialogs/WifiConnectionDialog.svelte
index cc14505..0c5d1a3 100644
--- a/src/svelte-components/src/dialogs/WifiConnectionDialog.svelte
+++ b/src/svelte-components/src/dialogs/WifiConnectionDialog.svelte
@@ -1,101 +1,115 @@
-
- Rebooting to apply Wifi changes...
+
+ Rebooting to apply Wifi changes...
diff --git a/src/svelte-components/src/lib/ConfigStore.ts b/src/svelte-components/src/lib/ConfigStore.ts
new file mode 100644
index 0000000..19a2f8c
--- /dev/null
+++ b/src/svelte-components/src/lib/ConfigStore.ts
@@ -0,0 +1,14 @@
+import { writable } from "svelte/store";
+
+type DisplayUnits = "METRIC" | "IMPERIAL";
+
+export const Config = writable>({});
+export const DisplayUnits = writable();
+
+export function handleConfigUpdate(config: Record) {
+ Config.set(config);
+}
+
+export function setDisplayUnits(value: DisplayUnits) {
+ DisplayUnits.set(value);
+}
\ No newline at end of file
diff --git a/src/svelte-components/src/lib/ControllerState.ts b/src/svelte-components/src/lib/ControllerState.ts
new file mode 100644
index 0000000..ede3089
--- /dev/null
+++ b/src/svelte-components/src/lib/ControllerState.ts
@@ -0,0 +1,36 @@
+import { get, writable } from "svelte/store";
+import { processNetworkInfo } from "./NetworkInfo";
+
+export const networkInfo = writable({});
+
+export const probingActive = writable(false);
+export const probeContacted = writable(false);
+export const probingStarted = writable(false);
+export const probingFailed = writable(false);
+export const probingComplete = writable(false);
+
+export function handleControllerStateUpdate(state: Record) {
+ if (state.networkInfo) {
+ processNetworkInfo(state.networkInfo);
+ delete state.networkInfo;
+ }
+
+ if (get(probingActive)) {
+ if (state.pw === 0) {
+ probeContacted.set(true);
+ }
+
+ if (state.log?.msg === "Switch not found") {
+ probingFailed.set(true);
+ }
+
+ if (state.cycle !== "idle") {
+ probingStarted.set(true);
+ }
+
+ if (state.cycle === "idle" && get(probingStarted)) {
+ probingStarted.set(false);
+ probingComplete.set(true);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/svelte-components/src/lib/CustomActions.ts b/src/svelte-components/src/lib/CustomActions.ts
new file mode 100644
index 0000000..a3a405e
--- /dev/null
+++ b/src/svelte-components/src/lib/CustomActions.ts
@@ -0,0 +1,9 @@
+export function virtualKeyboardChange(node: HTMLElement, cb: (value: any) => void) {
+ const input = node.querySelector("input");
+ if (!input) {
+ console.error("Could not find the textfield's :", node);
+ throw new Error("Could not find the textfield's ");
+ }
+
+ input.addEventListener("keyup", () => cb(input.value));
+}
diff --git a/src/svelte-components/src/lib/NetworkInfo.ts b/src/svelte-components/src/lib/NetworkInfo.ts
index 1d84f3b..6cf67e0 100644
--- a/src/svelte-components/src/lib/NetworkInfo.ts
+++ b/src/svelte-components/src/lib/NetworkInfo.ts
@@ -1,5 +1,4 @@
-import { readable } from "svelte/store";
-import * as api from "./api";
+import { writable } from "svelte/store";
export type WifiNetwork = {
Quality: string;
@@ -32,62 +31,51 @@ const empty: NetworkInfo = {
ssid: "",
networks: []
}
-}
+};
-export const networkInfo = readable(empty, (set) => {
- getNetworkInfo();
- const networkInfoIntervalId = setInterval(getNetworkInfo, 5000);
+export const networkInfo = writable(empty);
- async function getNetworkInfo() {
- const networksByName: Record = {}
+export function processNetworkInfo(rawNetworkInfo: NetworkInfo) {
+ const now = Date.now();
+ const networksByName: Record = {};
- try {
- const networkInfo: NetworkInfo = await api.GET("network");
+ for (const network of rawNetworkInfo.wifi.networks) {
+ if (network.Name) {
+ network.lastSeen = now;
+ network.active = rawNetworkInfo.wifi.ssid === network.Name;
- const now = Date.now();
- for (let network of networkInfo.wifi.networks) {
- if (network.Name) {
- network.lastSeen = now;
- network.active = networkInfo.wifi.ssid === network.Name;
- networksByName[network.Name] = network;
- }
+ // There can be many entries for the same ssid, so
+ // we want to take the one with the highest quality
+ const currentNetwork = networksByName[network.Name] ?? { Quality: 0 };
+ if (network.Quality >= currentNetwork.Quality) {
+ networksByName[network.Name] = network;
}
-
- for (let network of Object.values(networksByName)) {
- if (network.lastSeen - now > 30000) {
- delete networksByName[network.Name];
- }
- }
-
- set({
- ipAddresses: networkInfo.ipAddresses,
- hostname: networkInfo.hostname,
- wifi: {
- ssid: networkInfo.wifi.ssid,
- networks: Object.values(networksByName).sort((a, b) => {
- switch (true) {
- case a.active:
- return -1;
-
- case b.active:
- return 1;
-
- default:
- return a.Name.localeCompare(b.Name);
- }
- })
- }
- });
- } catch (error) {
- console.debug("Failed to fetch network info", error);
}
}
- return () => {
- clearInterval(networkInfoIntervalId);
+ for (const network of Object.values(networksByName)) {
+ if (network.lastSeen - now > 30000) {
+ delete networksByName[network.Name];
+ }
}
-})
-export function init() {
- return networkInfo.subscribe(() => ({}));
+ networkInfo.set({
+ ipAddresses: rawNetworkInfo.ipAddresses,
+ hostname: rawNetworkInfo.hostname,
+ wifi: {
+ ssid: rawNetworkInfo.wifi.ssid,
+ networks: Object.values(networksByName).sort((a, b) => {
+ switch (true) {
+ case a.active:
+ return -1;
+
+ case b.active:
+ return 1;
+
+ default:
+ return a.Name.localeCompare(b.Name);
+ }
+ })
+ }
+ });
}
diff --git a/src/svelte-components/src/lib/RegexHelpers.ts b/src/svelte-components/src/lib/RegexHelpers.ts
new file mode 100644
index 0000000..d8f53c2
--- /dev/null
+++ b/src/svelte-components/src/lib/RegexHelpers.ts
@@ -0,0 +1,85 @@
+function numberWithUnitToMetric() {
+ return this.metric ? this.value : this.value * 25.4;
+}
+
+function isPojo(value) {
+ if (value === null || typeof value !== "object") {
+ return false;
+ }
+
+ return Object.getPrototypeOf(value) === Object.prototype;
+}
+
+const fractions = [
+ { value: 0.75, formatted: "3/4" },
+ { value: 0.625, formatted: "5/8" },
+ { value: 0.5, formatted: "1/2" },
+ { value: 0.375, formatted: "3/8" },
+ { value: 0.25, formatted: "1/4" },
+ { value: 0.1875, formatted: "3/16" },
+ { value: 0.125, formatted: "1/8" },
+ { value: 0.09375, formatted: "3/32" },
+ { value: 0.0625, formatted: "1/16" },
+ { value: 0.03125, formatted: "1/32" },
+];
+
+function formatFraction(value: number) {
+ const fraction = fractions.find(f => f.value === value);
+
+ return fraction ? fraction.formatted : value.toString();
+}
+
+export const numberWithUnit = {
+ regex: /^\s*(?:(\d+)\s*\/\s*(\d+)|(\d*\.\d+)|(\d+(?:\.\d+)?))\s*("|in|inch|inches|mm|millimeters)\s*$/,
+ parse: function(str: string) {
+ // eslint-disable-next-line prefer-const
+ let [ , numerator, denominator, decimal1, decimal2, unit ]: any = str?.match(numberWithUnit.regex) ?? [];
+
+ numerator = Number.parseFloat(numerator);
+ denominator = Number.parseFloat(denominator);
+ decimal1 = Number.parseFloat(decimal1);
+ decimal2 = Number.parseFloat(decimal2);
+
+ const metric = (unit ?? "").includes("m");
+
+ switch (true) {
+ case isFinite(numerator) && isFinite(denominator):
+ return {
+ value: numerator / denominator,
+ metric,
+ toMetric: numberWithUnitToMetric
+ };
+
+ case isFinite(decimal1) && decimal1 !== 0:
+ return {
+ value: decimal1,
+ metric,
+ toMetric: numberWithUnitToMetric
+ };
+
+ case isFinite(decimal2) && decimal2 !== 0:
+ return {
+ value: decimal2,
+ metric,
+ toMetric: numberWithUnitToMetric
+ };
+
+ default:
+ return undefined;
+ }
+ },
+ normalize: function(str) {
+ const value = this.parse(str);
+
+ switch (true) {
+ case !isPojo(value):
+ return "";
+
+ case value.metric:
+ return `${value.value} mm`;
+
+ default:
+ return `${formatFraction(value.value)} in`;
+ }
+ }
+};
diff --git a/src/svelte-components/src/lib/RegisterControllerMethods.ts b/src/svelte-components/src/lib/RegisterControllerMethods.ts
new file mode 100644
index 0000000..fe5388a
--- /dev/null
+++ b/src/svelte-components/src/lib/RegisterControllerMethods.ts
@@ -0,0 +1,44 @@
+interface RegisterableControllerMethods {
+ stop: () => void;
+ send: (gcode: string) => void;
+ dispatch: (event: string, ...args: any[]) => void;
+ isAxisHomed: (axis: string) => boolean;
+ unhome: (axis: string) => void;
+ set_position: (axis: string, value: number) => void;
+ set_home: (axis: string, value: number) => void;
+}
+
+interface ControllerMethods extends RegisterableControllerMethods {
+ gotoZero: (axes: "xy" | "z") => void;
+}
+
+export let ControllerMethods: ControllerMethods;
+
+export function registerControllerMethods(methods: Partial) {
+ ControllerMethods = {
+ ...ControllerMethods,
+ ...methods,
+ gotoZero
+ };
+}
+
+function gotoZero(axes: "xy" | "z") {
+ let axesClause = "";
+ switch (axes.toLowerCase()) {
+ case "xy":
+ axesClause = "X0Y0";
+ break;
+
+ case "z":
+ axesClause = "Z0";
+ break;
+
+ default:
+ throw new Error(`Invalid axes: ${axes}`);
+ }
+
+ ControllerMethods.send(`
+ G90
+ G0 ${axesClause}
+ `);
+}
\ No newline at end of file
diff --git a/src/svelte-components/src/lib/StoreHelpers.ts b/src/svelte-components/src/lib/StoreHelpers.ts
new file mode 100644
index 0000000..78604a5
--- /dev/null
+++ b/src/svelte-components/src/lib/StoreHelpers.ts
@@ -0,0 +1,18 @@
+import { get, type Writable } from "svelte/store";
+
+export function listenForChange(writable: Writable, cb: (value: T) => void) {
+ const priorValue = get(writable);
+
+ const unsubscribe = writable.subscribe((value) => {
+ if (value !== priorValue) {
+ unsubscribe();
+ cb(value);
+ }
+ });
+}
+
+export function waitForChange(writable: Writable): Promise {
+ return new Promise((resolve) => {
+ listenForChange(writable, (value) => resolve(value));
+ });
+}
diff --git a/src/svelte-components/src/lib/api.ts b/src/svelte-components/src/lib/api.ts
index c24ed01..42cc851 100644
--- a/src/svelte-components/src/lib/api.ts
+++ b/src/svelte-components/src/lib/api.ts
@@ -6,36 +6,36 @@ async function doFetch(method: HttpMethod, url: string, data: any, config: Reque
...config,
method,
cache: "no-cache",
- body: (typeof data === 'object')
+ body: (typeof data === "object")
? JSON.stringify(data)
: undefined,
- headers: (typeof data === 'object')
+ headers: (typeof data === "object")
? {
- "Content-Type": 'application/json; charset=utf-8'
+ "Content-Type": "application/json; charset=utf-8"
}
: {}
});
return await response.json();
} catch (error) {
- console.debug('API Error: ' + url + ': ' + error);
+ console.debug(`API Error: ${url}: ${error}`);
throw error;
}
}
-export async function GET(url: string, config: RequestInit = {}) {
- return doFetch('GET', url, undefined, config);
+export function GET(url: string, config: RequestInit = {}) {
+ return doFetch("GET", url, undefined, config);
}
-export async function PUT(url: string, data: any = undefined, config: RequestInit = {}) {
- return doFetch('PUT', url, data, config);
+export function PUT(url: string, data: any = undefined, config: RequestInit = {}) {
+ return doFetch("PUT", url, data, config);
}
-export async function POST(url: string, data: any = undefined, config: RequestInit = {}) {
- return doFetch('POST', url, data, config);
+export function POST(url: string, data: any = undefined, config: RequestInit = {}) {
+ return doFetch("POST", url, data, config);
}
-export async function DELETE(url: string, config = {}) {
- return doFetch('DELETE', url, undefined, config);
+export function DELETE(url: string, config = {}) {
+ return doFetch("DELETE", url, undefined, config);
}
diff --git a/src/svelte-components/src/main.ts b/src/svelte-components/src/main.ts
index 35ff8bf..adf162e 100644
--- a/src/svelte-components/src/main.ts
+++ b/src/svelte-components/src/main.ts
@@ -1,15 +1,35 @@
-import 'polyfill-object.fromentries';
-import AdminNetworkView from './components/AdminNetworkView.svelte';
-import { init as initNetworkInfo } from './lib/NetworkInfo';
+import "polyfill-object.fromentries";
+import matchAll from "string.prototype.matchall";
-export function create(component: string, target: HTMLElement, props: Record) {
- switch (component) {
- case "AdminNetworkView":
- return new AdminNetworkView({ target, props });
+matchAll.shim();
- default:
- throw new Error("Unknown component");
- }
+import AdminNetworkView from "$components/AdminNetworkView.svelte";
+import SettingsView from "$components/SettingsView.svelte";
+import DialogHost, { showDialog } from "$dialogs/DialogHost.svelte";
+import { handleConfigUpdate, setDisplayUnits } from "$lib/ConfigStore";
+import { handleControllerStateUpdate } from "$lib/ControllerState";
+import { registerControllerMethods } from "$lib/RegisterControllerMethods";
+
+export function createComponent(component: string, target: HTMLElement, props: Record) {
+ switch (component) {
+ case "AdminNetworkView":
+ return new AdminNetworkView({ target, props });
+
+ case "SettingsView":
+ return new SettingsView({ target, props });
+
+ case "DialogHost":
+ return new DialogHost({ target, props });
+
+ default:
+ throw new Error("Unknown component");
+ }
}
-export { initNetworkInfo };
+export {
+ showDialog,
+ handleControllerStateUpdate,
+ handleConfigUpdate,
+ registerControllerMethods,
+ setDisplayUnits
+};
diff --git a/src/svelte-components/src/svgs/probe-bit-diameter.svg b/src/svelte-components/src/svgs/probe-bit-diameter.svg
new file mode 100644
index 0000000..9aafbf5
--- /dev/null
+++ b/src/svelte-components/src/svgs/probe-bit-diameter.svg
@@ -0,0 +1,75 @@
+
\ No newline at end of file
diff --git a/src/svelte-components/src/svgs/probe-check-xyz.svg b/src/svelte-components/src/svgs/probe-check-xyz.svg
new file mode 100644
index 0000000..0c7b52b
--- /dev/null
+++ b/src/svelte-components/src/svgs/probe-check-xyz.svg
@@ -0,0 +1,243 @@
+
\ No newline at end of file
diff --git a/src/svelte-components/src/svgs/probe-check-z.svg b/src/svelte-components/src/svgs/probe-check-z.svg
new file mode 100644
index 0000000..41409a9
--- /dev/null
+++ b/src/svelte-components/src/svgs/probe-check-z.svg
@@ -0,0 +1,275 @@
+
+
\ No newline at end of file
diff --git a/src/svelte-components/src/svgs/probe-place-xyz.svg b/src/svelte-components/src/svgs/probe-place-xyz.svg
new file mode 100644
index 0000000..eb73088
--- /dev/null
+++ b/src/svelte-components/src/svgs/probe-place-xyz.svg
@@ -0,0 +1,49 @@
+
\ No newline at end of file
diff --git a/src/svelte-components/src/svgs/probe-place-z.svg b/src/svelte-components/src/svgs/probe-place-z.svg
new file mode 100644
index 0000000..1a44aa0
--- /dev/null
+++ b/src/svelte-components/src/svgs/probe-place-z.svg
@@ -0,0 +1,60 @@
+
\ No newline at end of file
diff --git a/src/svelte-components/src/svgs/probe-put-away-xyz.svg b/src/svelte-components/src/svgs/probe-put-away-xyz.svg
new file mode 100644
index 0000000..0dabfe0
--- /dev/null
+++ b/src/svelte-components/src/svgs/probe-put-away-xyz.svg
@@ -0,0 +1,115 @@
+
\ No newline at end of file
diff --git a/src/svelte-components/src/svgs/probe-put-away-z.svg b/src/svelte-components/src/svgs/probe-put-away-z.svg
new file mode 100644
index 0000000..f7f01c3
--- /dev/null
+++ b/src/svelte-components/src/svgs/probe-put-away-z.svg
@@ -0,0 +1,134 @@
+
\ No newline at end of file
diff --git a/src/svelte-components/src/theme/_smui-theme.scss b/src/svelte-components/src/theme/_smui-theme.scss
index a9e871c..df1fdfe 100644
--- a/src/svelte-components/src/theme/_smui-theme.scss
+++ b/src/svelte-components/src/theme/_smui-theme.scss
@@ -1,9 +1,9 @@
-@use 'sass:color';
+@use "sass:color";
-@use '@material/theme/color-palette';
+@use "@material/theme/color-palette";
// Svelte Colors!
-@use '@material/theme/index' as theme with (
+@use "@material/theme/index" as theme with (
$primary: #0078e7,
$secondary: #676778,
$surface: #fff,
@@ -13,10 +13,34 @@
);
@use "@material/elevation/mdc-elevation";
-
@use "@material/list";
+
@include list.deprecated-core-styles;
:root {
--mdc-theme-text-primary-on-background: #777;
-}
\ No newline at end of file
+
+ .mdc-dialog .mdc-dialog__container {
+ transition: margin-bottom 0.5s;
+ }
+
+ .mdc-dialog .mdc-dialog__content {
+ color: #777;
+ }
+
+ .mdc-dialog .mdc-dialog__title {
+ color: #777;
+ font-weight: bold;
+ }
+
+ input::-webkit-outer-spin-button,
+ input::-webkit-inner-spin-button {
+ -webkit-appearance: none;
+ margin: 0;
+ }
+
+ /* Firefox */
+ input[type="number"] {
+ -moz-appearance: textfield;
+ }
+}
diff --git a/src/svelte-components/svelte.config.js b/src/svelte-components/svelte.config.js
index 3630bb3..a32b2e8 100644
--- a/src/svelte-components/svelte.config.js
+++ b/src/svelte-components/svelte.config.js
@@ -1,7 +1,7 @@
-import sveltePreprocess from 'svelte-preprocess'
+import sveltePreprocess from "svelte-preprocess";
export default {
- // Consult https://github.com/sveltejs/svelte-preprocess
- // for more information about preprocessors
- preprocess: sveltePreprocess()
-}
+ // Consult https://github.com/sveltejs/svelte-preprocess
+ // for more information about preprocessors
+ preprocess: sveltePreprocess()
+};
diff --git a/src/svelte-components/tsconfig.json b/src/svelte-components/tsconfig.json
index 4878d84..5bcd848 100644
--- a/src/svelte-components/tsconfig.json
+++ b/src/svelte-components/tsconfig.json
@@ -6,6 +6,11 @@
"module": "esnext",
"resolveJsonModule": true,
"baseUrl": ".",
+ "paths": {
+ "$lib/*": ["src/lib/*"],
+ "$components/*": ["src/components/*"],
+ "$dialogs/*": ["src/dialogs/*"]
+ },
/**
* Typecheck JS in `.svelte` and `.js` files by default.
* Disable checkJs if you'd like to use dynamic types in JS.
diff --git a/src/svelte-components/vite.config.ts b/src/svelte-components/vite.config.ts
index 33ccea6..846eea0 100644
--- a/src/svelte-components/vite.config.ts
+++ b/src/svelte-components/vite.config.ts
@@ -1,19 +1,26 @@
-import { defineConfig } from 'vite'
-import { svelte } from '@sveltejs/vite-plugin-svelte'
-import { resolve } from 'path';
+import { defineConfig } from "vite";
+import { svelte } from "@sveltejs/vite-plugin-svelte";
+import { resolve } from "path";
// https://vitejs.dev/config/
export default defineConfig({
- plugins: [
- svelte()
- ],
- build: {
- target: "chrome60",
- lib: {
- entry: resolve(__dirname, 'src/main.ts'),
- name: 'SvelteComponents',
- formats: ['iife'],
- fileName: () => "index.js"
+ plugins: [
+ svelte()
+ ],
+ resolve: {
+ alias: {
+ $lib: resolve("./src/lib"),
+ $dialogs: resolve("./src/dialogs"),
+ $components: resolve("./src/components")
+ }
+ },
+ build: {
+ target: "chrome60",
+ lib: {
+ entry: resolve(__dirname, "src/main.ts"),
+ name: "SvelteComponents",
+ formats: [ "iife" ],
+ fileName: () => "index.js"
+ }
}
- }
-})
+});
-
-
- {#each $networkInfo.ipAddresses as ipAddress}
-
+
-
-
- {ipAddress}
-
-
- {/each}
-
+
-
+
+
+ {#each $networkInfo.ipAddresses as ipAddress}
+
+
+
+ {ipAddress}
+
+
+ {/each}
+
-
diff --git a/src/svelte-components/src/components/ConfigTemplatedInput.svelte b/src/svelte-components/src/components/ConfigTemplatedInput.svelte
new file mode 100644
index 0000000..1d5fa4a
--- /dev/null
+++ b/src/svelte-components/src/components/ConfigTemplatedInput.svelte
@@ -0,0 +1,131 @@
+
+
+{#if template}
+
-
-
-
-
-
- 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}
-
+
-
+
+
+
+
+
+ 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)}
+ >
+
+ + +
+{network.Name} + {#if network.Encryption !== "Open"} + + + + {/if} +
+ {/each}
+ {/if}
+
+
+
+ {#if template.values}
+
+ {:else if template.type === "bool"}
+
+ {:else if template.type === "float"}
+
+ {:else if template.type === "int"}
+
+ {:else if template.type === "string"}
+
+ {:else if template.type == "text"}
+
+ {/if}
+
+
+
+
+{/if}
diff --git a/src/svelte-components/src/components/SettingsView.svelte b/src/svelte-components/src/components/SettingsView.svelte
new file mode 100644
index 0000000..a1c941d
--- /dev/null
+++ b/src/svelte-components/src/components/SettingsView.svelte
@@ -0,0 +1,97 @@
+
+
+Settings
+ +
+
diff --git a/src/svelte-components/src/components/TextFieldWithOptions.svelte b/src/svelte-components/src/components/TextFieldWithOptions.svelte
new file mode 100644
index 0000000..9a54ad5
--- /dev/null
+++ b/src/svelte-components/src/components/TextFieldWithOptions.svelte
@@ -0,0 +1,90 @@
+
+
+
+
+
diff --git a/src/svelte-components/src/dialogs/ChangeHostnameDialog.svelte b/src/svelte-components/src/dialogs/ChangeHostnameDialog.svelte
index 18627f4..5912525 100644
--- a/src/svelte-components/src/dialogs/ChangeHostnameDialog.svelte
+++ b/src/svelte-components/src/dialogs/ChangeHostnameDialog.svelte
@@ -1,94 +1,104 @@
-User Interface
+ + + + + + +Path Accuracy
+ + ++ Lower max-deviation to follow the programmed path more precisely + but at a slower speed. +
+ ++ In order to improve traversal speed, the path planner may merge + consecutive moves or round off sharp corners if doing so would deviate + from the program path by less than max-deviation. +
+ ++ GCode commands + G61, G61.1 + and G64 also affect + path planning accuracy. +
+ +Cornering Speed (Advanced)
+ + ++ Junction acceleration limits the cornering speed the planner will allow. + Increasing this value will allow for faster traversal of corners but may + cause the planner to violate axis jerk limits and stall the motors. Use + with caution. +
+