-
-
IP Addresses
-
- {#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
index a5f2950..1d5fa4a 100644
--- a/src/svelte-components/src/components/ConfigTemplatedInput.svelte
+++ b/src/svelte-components/src/components/ConfigTemplatedInput.svelte
@@ -1,131 +1,131 @@
{#if template}
-
{/if}
diff --git a/src/svelte-components/src/components/SettingsView.svelte b/src/svelte-components/src/components/SettingsView.svelte
index 31f87fc..a1c941d 100644
--- a/src/svelte-components/src/components/SettingsView.svelte
+++ b/src/svelte-components/src/components/SettingsView.svelte
@@ -1,14 +1,14 @@
@@ -17,81 +17,81 @@
Settings
diff --git a/src/svelte-components/src/components/TextFieldWithOptions.svelte b/src/svelte-components/src/components/TextFieldWithOptions.svelte
index 16d59ca..9a54ad5 100644
--- a/src/svelte-components/src/components/TextFieldWithOptions.svelte
+++ b/src/svelte-components/src/components/TextFieldWithOptions.svelte
@@ -1,90 +1,90 @@
-
showMenu(true)}
- on:focusout={() => showMenu(false)}
- use={[[virtualKeyboardChange, (newValue) => (value = newValue)]]}
- {...$$restProps}
- >
-
- {#if valid}
-
- {/if}
-
- {helperText}
-
+
showMenu(true)}
+ on:focusout={() => showMenu(false)}
+ use={[[virtualKeyboardChange, (newValue) => (value = newValue)]]}
+ {...$$restProps}
+ >
+
+ {#if valid}
+
+ {/if}
+
+ {helperText}
+
-
-
- {#each options as group}
-
- {#each group as option}
- - {
- value = option;
- showMenu(false);
+
+
+ {#each options as group}
+
+ {#each group as option}
+ - {
+ value = option;
+ showMenu(false);
- optionSelected = true;
- }}
- >
-
{option}
-
- {/each}
-
- {/each}
-
-
+ optionSelected = true;
+ }}
+ >
+ {option}
+
+ {/each}
+
+ {/each}
+
+
diff --git a/src/svelte-components/src/dialogs/ChangeHostnameDialog.svelte b/src/svelte-components/src/dialogs/ChangeHostnameDialog.svelte
index 2649c50..5912525 100644
--- a/src/svelte-components/src/dialogs/ChangeHostnameDialog.svelte
+++ b/src/svelte-components/src/dialogs/ChangeHostnameDialog.svelte
@@ -1,95 +1,104 @@
- Rebooting to apply the hostname change...
+ Rebooting to apply the hostname change...
- Change Hostname
+ Change Hostname
-
- (hostname = newValue)],
- ]}
- label="New Hostname"
- spellcheck="false"
- variant="filled"
- style="width: 100%;"
- />
-
+
+ (hostname = newValue)],
+ ]}
+ label="New Hostname"
+ spellcheck="false"
+ variant="filled"
+ style="width: 100%;"
+ />
+
-
-
- Cancel
-
-
- Confirm & Reboot
-
-
+
+
+ Cancel
+
+
+ Confirm & Reboot
+
+
diff --git a/src/svelte-components/src/dialogs/DialogHost.svelte b/src/svelte-components/src/dialogs/DialogHost.svelte
index 0dadf2f..2a1ad54 100644
--- a/src/svelte-components/src/dialogs/DialogHost.svelte
+++ b/src/svelte-components/src/dialogs/DialogHost.svelte
@@ -1,232 +1,235 @@
diff --git a/src/svelte-components/src/dialogs/HomeMachineDialog.svelte b/src/svelte-components/src/dialogs/HomeMachineDialog.svelte
index a5d36d8..cff5816 100644
--- a/src/svelte-components/src/dialogs/HomeMachineDialog.svelte
+++ b/src/svelte-components/src/dialogs/HomeMachineDialog.svelte
@@ -1,28 +1,33 @@
- Home Machine
+ Home Machine
- Home the machine?
+ Home the machine?
-
-
- Cancel
-
+
+
+ Cancel
+
-
- OK
-
-
+
+ OK
+
+
diff --git a/src/svelte-components/src/dialogs/ManualHomeAxisDialog.svelte b/src/svelte-components/src/dialogs/ManualHomeAxisDialog.svelte
index 1f8b487..30fabc9 100644
--- a/src/svelte-components/src/dialogs/ManualHomeAxisDialog.svelte
+++ b/src/svelte-components/src/dialogs/ManualHomeAxisDialog.svelte
@@ -1,51 +1,57 @@
- Manually Home {axis.toUpperCase()} Axis
-
- Set axis absolute position
+
+ Manually Home {axis.toUpperCase()} Axis
+
- (value = newValue)],
- ]}
- variant="filled"
- style="width: 100%;"
- />
-
+
+ Set axis absolute position
-
-
- Cancel
-
-
- Set
-
-
+ (value = newValue)],
+ ]}
+ variant="filled"
+ style="width: 100%;"
+ />
+
+
+
+
+ Cancel
+
+
+ Set
+
+
diff --git a/src/svelte-components/src/dialogs/MessageDialog.svelte b/src/svelte-components/src/dialogs/MessageDialog.svelte
index 7230ad8..db96511 100644
--- a/src/svelte-components/src/dialogs/MessageDialog.svelte
+++ b/src/svelte-components/src/dialogs/MessageDialog.svelte
@@ -1,31 +1,36 @@
- {title}
+ {title}
-
- {message}
-
+
+ {message}
+
- {#if !noaction}
-
-
- OK
-
-
- {/if}
+ {#if !noaction}
+
+
+ OK
+
+
+ {/if}
diff --git a/src/svelte-components/src/dialogs/ProbeDialog.svelte b/src/svelte-components/src/dialogs/ProbeDialog.svelte
index 07056ae..9342ac0 100644
--- a/src/svelte-components/src/dialogs/ProbeDialog.svelte
+++ b/src/svelte-components/src/dialogs/ProbeDialog.svelte
@@ -1,444 +1,455 @@
- Probing {probeType?.toUpperCase()}
+ Probing {probeType?.toUpperCase()}
-
-
-
Step {steps.indexOf(currentStep) + 1} of {steps.length}
-
- {#each steps as step}
- {stepLabels[step]}
- {/each}
-
-
-
- {#if currentStep === "CheckProbe"}
- Attach the probe magnet to the collet, then touch the probe block to the
- bit.
- {:else if currentStep === "BitDimensions"}
-
- {:else if currentStep === "PlaceProbeBlock"}
- {#if probeType === "xyz"}
- Place the probe block face up, on the lower-left corner of your
- workpiece.
- {:else}
- Place the probe block face down, with the bit above the recess.
+
+
+
+ Step {steps.indexOf(currentStep) + 1} of {steps.length}
+
+
+ {#each steps as step}
+
+ {stepLabels[step]}
+
+ {/each}
+
+
+
+ {#if currentStep === "CheckProbe"}
+ Attach the probe magnet to the collet, then touch the probe
+ block to the bit.
+ {:else if currentStep === "BitDimensions"}
+
+ {:else if currentStep === "PlaceProbeBlock"}
+ {#if probeType === "xyz"}
+ Place the probe block face up, on the lower-left corner of
+ your workpiece.
+ {:else}
+ Place the probe block face down, with the bit above the
+ recess.
+ {/if}
+
+
+ The probing procedure will begin as soon as you click
+ 'Next'.
+
+ {:else if currentStep === "Probe"}
+ Probing in progress...
+ {:else if currentStep === "Done"}
+ {#if $probingFailed}
+ Could not find the probe block during probing!
+
+
+ Make sure the tip of the bit is less than {metric
+ ? "25mm"
+ : "1 in"}
+ above the probe block, and try again.
+
+ {:else}
+ Don't forget to put away the probe!
+
+ {#if probeType === "xyz"}
+ The machine will now move to the XY origin.
+
+ Watch your hands!
+ {/if}
+ {/if}
+ {/if}
+
+
+
+
+ {#if showCancelButton}
+ ($cancelled = true)}>
+ Cancel
+
{/if}
-
- The probing procedure will begin as soon as you click 'Next'.
- {:else if currentStep === "Probe"}
- Probing in progress...
- {:else if currentStep === "Done"}
- {#if $probingFailed}
- Could not find the probe block during probing!
-
-
- Make sure the tip of the bit is less than {metric ? "25mm" : "1 in"}
- above the probe block, and try again.
-
- {:else}
- Don't forget to put away the probe!
-
- {#if probeType === "xyz"}
- The machine will now move to the XY origin.
-
- Watch your hands!
- {/if}
- {/if}
- {/if}
-
-
-
-
- {#if showCancelButton}
- ($cancelled = true)}>
- Cancel
-
- {/if}
- ($userAcknowledged = true)}
- >
-
- {nextButton.label}
-
-
-
+ ($userAcknowledged = true)}
+ >
+
+ {nextButton.label}
+
+
+
diff --git a/src/svelte-components/src/dialogs/ScreenRotationDialog.svelte b/src/svelte-components/src/dialogs/ScreenRotationDialog.svelte
index f06e922..e21949b 100644
--- a/src/svelte-components/src/dialogs/ScreenRotationDialog.svelte
+++ b/src/svelte-components/src/dialogs/ScreenRotationDialog.svelte
@@ -1,76 +1,81 @@
- Rebooting to apply the new screen rotation...
+ Rebooting to apply the new screen rotation...
- Screen Rotation
+ Screen Rotation
-
- {#each options as option}
-
-
-
- {option.label}
-
-
- {/each}
-
+
+ {#each options as option}
+
+
+
+ {option.label}
+
+
+ {/each}
+
-
-
- Cancel
-
-
- Confirm & Reboot
-
-
+
+
+ Cancel
+
+
+ Confirm & Reboot
+
+
diff --git a/src/svelte-components/src/dialogs/SetAxisPositionDialog.svelte b/src/svelte-components/src/dialogs/SetAxisPositionDialog.svelte
index 44ec66d..76f3cef 100644
--- a/src/svelte-components/src/dialogs/SetAxisPositionDialog.svelte
+++ b/src/svelte-components/src/dialogs/SetAxisPositionDialog.svelte
@@ -1,69 +1,75 @@
- Set {axis.toUpperCase()} Axis Position
-
- (value = newValue)],
- ]}
- spellcheck="false"
- variant="filled"
- style="width: 100%;"
- />
-
+
+ Set {axis.toUpperCase()} Axis Position
+
-
-
- Cancel
-
- {#if homed}
-
- Unhome
-
- {/if}
-
- Set
-
-
+
+ (value = newValue)],
+ ]}
+ spellcheck="false"
+ variant="filled"
+ style="width: 100%;"
+ />
+
+
+
+
+ Cancel
+
+ {#if homed}
+
+ Unhome
+
+ {/if}
+
+ Set
+
+
diff --git a/src/svelte-components/src/dialogs/SetTimeDialog.svelte b/src/svelte-components/src/dialogs/SetTimeDialog.svelte
index ed002e5..1ab5578 100644
--- a/src/svelte-components/src/dialogs/SetTimeDialog.svelte
+++ b/src/svelte-components/src/dialogs/SetTimeDialog.svelte
@@ -1,245 +1,256 @@
- Adjust Clock & Timezone
+ Adjust Clock & Timezone
-
- {#if loading}
-
-
-
- {:else}
- {#if networkTimeSynchronized}
-
- Because this controller is connected to the internet, the time is
- managed automatically, and cannot be manually set.
-
- {:else}
-
- Because this controller is not connected to the internet, you can
- manually set the time.
-
+
+ {#if loading}
+
+
+
+ {:else}
+ {#if networkTimeSynchronized}
+
+ Because this controller is connected to the internet, the
+ time is managed automatically, and cannot be manually set.
+
+ {:else}
+
+ Because this controller is not connected to the internet,
+ you can manually set the time.
+
-
- Note: any time the controller is turned off, the time will need to be
- reset. If you connect the controller to the internet, the time will be
- managed automatically.
-
+
+ Note: any time the controller is turned off, the time will
+ need to be reset. If you connect the controller to the
+ internet, the time will be managed automatically.
+
- Date & Time
- (value = newValue)],
- ]}
- label="Time"
- type="datetime-local"
- variant="filled"
- style="width: 100%;"
- />
- {/if}
+ Date & Time
+ (value = newValue),
+ ],
+ ]}
+ label="Time"
+ type="datetime-local"
+ variant="filled"
+ style="width: 100%;"
+ />
+ {/if}
-
- To display your local time correctly, the controller must know what
- timezone it is in.
-
+
+ To display your local time correctly, the controller must know
+ what timezone it is in.
+
-
-
Select your timezone
-
+ Select your timezone
+
+ (selectedTimezoneIndex = index)}
+ >
+ {timezones[index].label}
+
+
+
+ {/if}
+
+
+
+
+ Cancel
+
+
- (selectedTimezoneIndex = index)}
- >
- {timezones[index].label}
-
-
-
+
+
diff --git a/src/svelte-components/src/dialogs/ShutdownDialog.svelte b/src/svelte-components/src/dialogs/ShutdownDialog.svelte
index bf98e86..ca8528f 100644
--- a/src/svelte-components/src/dialogs/ShutdownDialog.svelte
+++ b/src/svelte-components/src/dialogs/ShutdownDialog.svelte
@@ -1,7 +1,7 @@
diff --git a/src/svelte-components/src/dialogs/WifiConnectionDialog.svelte b/src/svelte-components/src/dialogs/WifiConnectionDialog.svelte
index 67eee55..0c5d1a3 100644
--- a/src/svelte-components/src/dialogs/WifiConnectionDialog.svelte
+++ b/src/svelte-components/src/dialogs/WifiConnectionDialog.svelte
@@ -1,103 +1,115 @@
diff --git a/src/svelte-components/src/lib/NetworkInfo.ts b/src/svelte-components/src/lib/NetworkInfo.ts
index 3f8b122..6cf67e0 100644
--- a/src/svelte-components/src/lib/NetworkInfo.ts
+++ b/src/svelte-components/src/lib/NetworkInfo.ts
@@ -31,15 +31,15 @@ const empty: NetworkInfo = {
ssid: "",
networks: []
}
-}
+};
export const networkInfo = writable