diff --git a/app2/src/lib/components/Visualization.svelte b/app2/src/lib/components/Visualization.svelte index c741359..c787277 100644 --- a/app2/src/lib/components/Visualization.svelte +++ b/app2/src/lib/components/Visualization.svelte @@ -2,7 +2,7 @@ import { onDestroy, onMount } from 'svelte'; import { BufferGeometry, Line, LineBasicMaterial, Vector3, type NormalBufferAttributes } from 'three'; import uzip from 'uzip'; - import { model } from '$lib/stores'; + import { model, servoAnglesOut } from '$lib/stores'; import { footColor, isEmbeddedApp, toeWorldPositions } from '$lib/utilities'; import { fileService } from '$lib/services'; import { servoAngles, mpu, jointNames } from '$lib/stores'; @@ -71,7 +71,7 @@ const updateAngles = (name: string, angle: number) => { modelTargetAngles[$jointNames.indexOf(name)] = angle * (180 / Math.PI); - servoAngles.set(modelTargetAngles) + servoAnglesOut.set(modelTargetAngles) }; const createScene = async () => { diff --git a/app2/src/lib/stores/socket-store.ts b/app2/src/lib/stores/socket-store.ts index e296147..94e9740 100644 --- a/app2/src/lib/stores/socket-store.ts +++ b/app2/src/lib/stores/socket-store.ts @@ -2,6 +2,9 @@ import { writable, type Writable } from 'svelte/store'; import { type angles } from '$lib/models'; export const isConnected = writable(false); +export const servoAnglesOut: Writable = writable([ + 0, 45, -90, 0, 45, -90, 0, 45, -90, 0, 45, -90 +]); export const servoAngles: Writable = writable([ 0, 45, -90, 0, 45, -90, 0, 45, -90, 0, 45, -90 ]); diff --git a/app2/src/routes/+layout.svelte b/app2/src/routes/+layout.svelte index 5a4697c..ed163f2 100644 --- a/app2/src/routes/+layout.svelte +++ b/app2/src/routes/+layout.svelte @@ -15,7 +15,7 @@ import Statusbar from './statusbar.svelte'; import Login from './login.svelte'; import { get, type Writable } from 'svelte/store'; - import { isConnected, mode, outControllerData, servoAngles, socketData } from '$lib/stores'; + import { isConnected, mode, outControllerData, servoAngles, servoAnglesOut, socketData } from '$lib/stores'; import { throttler } from '$lib/utilities'; export let data: LayoutData; @@ -30,7 +30,7 @@ connectToSocket() addPublisher(outControllerData, "controller") addPublisher(mode as unknown as Writable, "mode") - addPublisher(servoAngles as unknown as Writable, "angles") + addPublisher(servoAnglesOut as unknown as Writable, "angles") }); const connectToSocket = () => { diff --git a/app2/src/routes/statusbar.svelte b/app2/src/routes/statusbar.svelte index c7e4752..4907fb8 100644 --- a/app2/src/routes/statusbar.svelte +++ b/app2/src/routes/statusbar.svelte @@ -11,6 +11,8 @@ import RssiIndicator from '$lib/components/RSSIIndicator.svelte'; import BatteryIndicator from '$lib/components/BatteryIndicator.svelte'; import UpdateIndicator from '$lib/components/UpdateIndicator.svelte'; + import MdiWeatherSunny from '~icons/mdi/weather-sunny'; + import MdiMoonAndStars from '~icons/mdi/moon-and-stars'; async function postSleep() { const response = await fetch('/rest/sleep', { @@ -48,6 +50,13 @@
+
+ +
{#if $telemetry.rssi.disconnected}