From 5b9bbf0e950666a4bb391341a0d76d13d9f256a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9C=5BChristy?= <“[christy.guirguis@ucalgary.ca]”> Date: Sat, 18 Jan 2025 10:49:15 -0700 Subject: [PATCH 01/22] removed about page --- RocketControlUnitGUI/package-lock.json | 123 +++++------------- RocketControlUnitGUI/package.json | 1 + .../src/routes/+layout.svelte | 4 - .../src/routes/about/+page.svelte | 11 -- RocketControlUnitGUI/static/icons/info.png | Bin 16062 -> 0 bytes 5 files changed, 36 insertions(+), 103 deletions(-) delete mode 100644 RocketControlUnitGUI/src/routes/about/+page.svelte delete mode 100644 RocketControlUnitGUI/static/icons/info.png diff --git a/RocketControlUnitGUI/package-lock.json b/RocketControlUnitGUI/package-lock.json index 223ec43..b515d3d 100644 --- a/RocketControlUnitGUI/package-lock.json +++ b/RocketControlUnitGUI/package-lock.json @@ -33,6 +33,7 @@ "tailwindcss": "3.3.5", "tslib": "^2.4.1", "typescript": "^5.0.0", + "vite": "^5.4.11", "vite-plugin-tailwind-purgecss": "^0.2.1" } }, @@ -78,12 +79,10 @@ "ppc64" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "aix" ], - "peer": true, "engines": { "node": ">=12" } @@ -96,12 +95,10 @@ "arm" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "android" ], - "peer": true, "engines": { "node": ">=12" } @@ -114,12 +111,10 @@ "arm64" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "android" ], - "peer": true, "engines": { "node": ">=12" } @@ -132,12 +127,10 @@ "x64" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "android" ], - "peer": true, "engines": { "node": ">=12" } @@ -150,12 +143,10 @@ "arm64" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "darwin" ], - "peer": true, "engines": { "node": ">=12" } @@ -168,12 +159,10 @@ "x64" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "darwin" ], - "peer": true, "engines": { "node": ">=12" } @@ -186,12 +175,10 @@ "arm64" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "freebsd" ], - "peer": true, "engines": { "node": ">=12" } @@ -204,12 +191,10 @@ "x64" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "freebsd" ], - "peer": true, "engines": { "node": ">=12" } @@ -222,12 +207,10 @@ "arm" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "linux" ], - "peer": true, "engines": { "node": ">=12" } @@ -240,12 +223,10 @@ "arm64" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "linux" ], - "peer": true, "engines": { "node": ">=12" } @@ -258,12 +239,10 @@ "ia32" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "linux" ], - "peer": true, "engines": { "node": ">=12" } @@ -276,12 +255,10 @@ "loong64" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "linux" ], - "peer": true, "engines": { "node": ">=12" } @@ -294,12 +271,10 @@ "mips64el" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "linux" ], - "peer": true, "engines": { "node": ">=12" } @@ -312,12 +287,10 @@ "ppc64" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "linux" ], - "peer": true, "engines": { "node": ">=12" } @@ -330,12 +303,10 @@ "riscv64" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "linux" ], - "peer": true, "engines": { "node": ">=12" } @@ -348,12 +319,10 @@ "s390x" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "linux" ], - "peer": true, "engines": { "node": ">=12" } @@ -366,12 +335,10 @@ "x64" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "linux" ], - "peer": true, "engines": { "node": ">=12" } @@ -384,12 +351,10 @@ "x64" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "netbsd" ], - "peer": true, "engines": { "node": ">=12" } @@ -402,12 +367,10 @@ "x64" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "openbsd" ], - "peer": true, "engines": { "node": ">=12" } @@ -420,12 +383,10 @@ "x64" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "sunos" ], - "peer": true, "engines": { "node": ">=12" } @@ -438,12 +399,10 @@ "arm64" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "win32" ], - "peer": true, "engines": { "node": ">=12" } @@ -456,12 +415,10 @@ "ia32" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "win32" ], - "peer": true, "engines": { "node": ">=12" } @@ -474,12 +431,10 @@ "x64" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "win32" ], - "peer": true, "engines": { "node": ">=12" } @@ -1197,9 +1152,9 @@ } }, "node_modules/@sveltejs/vite-plugin-svelte-inspector": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte-inspector/-/vite-plugin-svelte-inspector-2.0.0.tgz", - "integrity": "sha512-gjr9ZFg1BSlIpfZ4PRewigrvYmHWbDrq2uvvPB1AmTWKuM+dI1JXQSUu2pIrYLb/QncyiIGkFDFKTwJ0XqQZZg==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte-inspector/-/vite-plugin-svelte-inspector-2.1.0.tgz", + "integrity": "sha512-9QX28IymvBlSCqsCll5t0kQVxipsfhFFL+L2t3nTWfXnddYwxBuAEtTtlaVQpRz9c37BhJjltSeY4AJSC03SSg==", "dev": true, "peer": true, "dependencies": { @@ -2056,8 +2011,6 @@ "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==", "dev": true, "hasInstallScript": true, - "license": "MIT", - "peer": true, "bin": { "esbuild": "bin/esbuild" }, @@ -3161,9 +3114,9 @@ } }, "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "dev": true, "funding": [ { @@ -3391,11 +3344,10 @@ } }, "node_modules/picocolors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", - "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", - "dev": true, - "license": "ISC" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "dev": true }, "node_modules/picomatch": { "version": "2.3.1", @@ -3525,6 +3477,15 @@ } } }, + "node_modules/postcss-load-config/node_modules/yaml": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, "node_modules/postcss-nested": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz", @@ -4558,18 +4519,6 @@ "node": ">=4" } }, - "node_modules/tailwindcss/node_modules/yaml": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.1.tgz", - "integrity": "sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==", - "dev": true, - "bin": { - "yaml": "bin.mjs" - }, - "engines": { - "node": ">= 14" - } - }, "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", @@ -4744,12 +4693,10 @@ "dev": true }, "node_modules/vite": { - "version": "5.4.8", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.8.tgz", - "integrity": "sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==", + "version": "5.4.11", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz", + "integrity": "sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==", "dev": true, - "license": "MIT", - "peer": true, "dependencies": { "esbuild": "^0.21.3", "postcss": "^8.4.43", @@ -4836,15 +4783,14 @@ "os": [ "darwin" ], - "peer": true, "engines": { "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, "node_modules/vite/node_modules/postcss": { - "version": "8.4.47", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz", - "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==", + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz", + "integrity": "sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==", "dev": true, "funding": [ { @@ -4860,11 +4806,9 @@ "url": "https://github.com/sponsors/ai" } ], - "license": "MIT", - "peer": true, "dependencies": { - "nanoid": "^3.3.7", - "picocolors": "^1.1.0", + "nanoid": "^3.3.8", + "picocolors": "^1.1.1", "source-map-js": "^1.2.1" }, "engines": { @@ -5008,12 +4952,15 @@ "dev": true }, "node_modules/yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz", + "integrity": "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==", "dev": true, + "bin": { + "yaml": "bin.mjs" + }, "engines": { - "node": ">= 6" + "node": ">= 14" } }, "node_modules/yocto-queue": { diff --git a/RocketControlUnitGUI/package.json b/RocketControlUnitGUI/package.json index d25c48d..1f0f3cb 100644 --- a/RocketControlUnitGUI/package.json +++ b/RocketControlUnitGUI/package.json @@ -33,6 +33,7 @@ "tailwindcss": "3.3.5", "tslib": "^2.4.1", "typescript": "^5.0.0", + "vite": "^5.4.11", "vite-plugin-tailwind-purgecss": "^0.2.1" }, "type": "module", diff --git a/RocketControlUnitGUI/src/routes/+layout.svelte b/RocketControlUnitGUI/src/routes/+layout.svelte index afeb5ac..9c6cf0a 100644 --- a/RocketControlUnitGUI/src/routes/+layout.svelte +++ b/RocketControlUnitGUI/src/routes/+layout.svelte @@ -69,10 +69,6 @@ Icon - - - Icon - diff --git a/RocketControlUnitGUI/src/routes/about/+page.svelte b/RocketControlUnitGUI/src/routes/about/+page.svelte deleted file mode 100644 index d536c8c..0000000 --- a/RocketControlUnitGUI/src/routes/about/+page.svelte +++ /dev/null @@ -1,11 +0,0 @@ - - - - - -
-

ABOUT

-
\ No newline at end of file diff --git a/RocketControlUnitGUI/static/icons/info.png b/RocketControlUnitGUI/static/icons/info.png deleted file mode 100644 index bbaff80c866b8dc2ad2e7295a193050cd4c3b2ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16062 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 Date: Sat, 18 Jan 2025 11:30:52 -0700 Subject: [PATCH 02/22] added new hybrid png --- .../src/lib/components/NewHybrid.svelte | 664 ++++++++++++++++++ RocketControlUnitGUI/src/routes/+page.svelte | 17 +- .../src/styles/display.postcss | 9 +- 3 files changed, 681 insertions(+), 9 deletions(-) create mode 100644 RocketControlUnitGUI/src/lib/components/NewHybrid.svelte diff --git a/RocketControlUnitGUI/src/lib/components/NewHybrid.svelte b/RocketControlUnitGUI/src/lib/components/NewHybrid.svelte new file mode 100644 index 0000000..0da3ec0 --- /dev/null +++ b/RocketControlUnitGUI/src/lib/components/NewHybrid.svelte @@ -0,0 +1,664 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/RocketControlUnitGUI/src/routes/+page.svelte b/RocketControlUnitGUI/src/routes/+page.svelte index 31176b1..f2d8827 100644 --- a/RocketControlUnitGUI/src/routes/+page.svelte +++ b/RocketControlUnitGUI/src/routes/+page.svelte @@ -1,6 +1,6 @@
@@ -440,6 +452,34 @@

{timer_remaining_display}

+ {#if $currentState === "RS_IGNITION" || $currentState === "RS_TEST" || $currentState === "RS_ABORT" || $currentState === "RS_LAUNCH" || $currentState === "RS_BURN" || $currentState === "RS_COAST" || $currentState === "RS_RECOVERY"} +
+ + {box1_display} + +
+ +
+ + {box2_display} + +
+ {/if} +
+
+

{battery_display}

+
+ +
+ + handleSliderChange( + e, + 'NODE_DMB', + 'RSC_POWER_TRANSITION_ONBOARD', + 'RSC_POWER_TRANSITION_EXTERNAL' + )} + > + {power_display} + +
+ {#if $currentState == "RS_PRELAUNCH"} +
+

{mev_display}

+
+

{battery_display}

diff --git a/RocketControlUnitGUI/src/styles/display.postcss b/RocketControlUnitGUI/src/styles/display.postcss index 803eec3..536db9f 100644 --- a/RocketControlUnitGUI/src/styles/display.postcss +++ b/RocketControlUnitGUI/src/styles/display.postcss @@ -316,3 +316,27 @@ transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900)); font-size: 16px; } + +.mev_status { + position: absolute; + top: calc(var(--container-width) * 0.109); + left: 91%; + transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500)); + font-size: 14px; +} + +.battery_voltage { + position: absolute; + top: calc(var(--container-width) * 0.09); + left: 91%; + transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500)); + font-size: 14px; +} + +.power_source_slider { + position: absolute; + top: calc(var(--container-width) * 0.066); + left: 93.4%; + transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900)); + font-size: 16px; +} \ No newline at end of file From dd80ddcfa90f692784fa03ef575a74baf20dbd87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9C=5BChristy?= <“[christy.guirguis@ucalgary.ca]”> Date: Sat, 8 Feb 2025 14:20:43 -0700 Subject: [PATCH 22/22] added controls for t valves, and named pneumonic valves --- .../src/lib/components/Diagram.svelte | 265 ++++++++++-------- RocketControlUnitGUI/src/lib/stores.ts | 28 +- RocketControlUnitGUI/src/routes/+page.svelte | 115 +++++--- .../src/styles/display.postcss | 39 ++- 4 files changed, 269 insertions(+), 178 deletions(-) diff --git a/RocketControlUnitGUI/src/lib/components/Diagram.svelte b/RocketControlUnitGUI/src/lib/components/Diagram.svelte index 0fd8f0a..c5c3c8a 100644 --- a/RocketControlUnitGUI/src/lib/components/Diagram.svelte +++ b/RocketControlUnitGUI/src/lib/components/Diagram.svelte @@ -39,22 +39,22 @@ - + - + - - + + - + - + - - + + @@ -282,111 +282,110 @@ - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -402,10 +401,10 @@ - + - + @@ -416,29 +415,29 @@ - + - + - + - + - + - + @@ -466,10 +465,10 @@ - + - + @@ -509,10 +508,10 @@ - + - + @@ -520,16 +519,16 @@ - + - + - + - + @@ -544,19 +543,19 @@ - + - + - + - + @@ -566,10 +565,10 @@ - + - + @@ -577,22 +576,22 @@ - + - + - + - + - + - + @@ -601,79 +600,79 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -683,10 +682,10 @@ - + - + @@ -696,10 +695,10 @@ - + - + @@ -710,23 +709,23 @@ - + - + - + - + - + - + @@ -738,34 +737,76 @@ - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -809,7 +850,7 @@ - + @@ -819,7 +860,7 @@ - + diff --git a/RocketControlUnitGUI/src/lib/stores.ts b/RocketControlUnitGUI/src/lib/stores.ts index 22f36e9..56225f4 100644 --- a/RocketControlUnitGUI/src/lib/stores.ts +++ b/RocketControlUnitGUI/src/lib/stores.ts @@ -5,12 +5,14 @@ export const auth = writable(false); export interface Stores { ac2_open: Writable; - pbv1_open: Writable; - pbv2_open: Writable; - pbv3_open: Writable; - pbv4_open: Writable; - pbv5_open: Writable; - pbv6_open: Writable; + pv1_open: Writable; + pv2_open: Writable; + pv3_open: Writable; + pv4_open: Writable; + pv5_open: Writable; + pv6_open: Writable; + pv7_open: Writable; + pv8_open: Writable; sol5_open: Writable; sol6_open: Writable sol7_open: Writable; @@ -47,12 +49,14 @@ export const initStores = () => { return { ac2_open: writable(undefined), - pbv1_open: writable(undefined), - pbv2_open: writable(undefined), - pbv3_open: writable(undefined), - pbv4_open: writable(undefined), - pbv5_open: writable(undefined), - pbv6_open: writable(undefined), + pv1_open: writable(undefined), + pv2_open: writable(undefined), + pv3_open: writable(undefined), + pv4_open: writable(undefined), + pv5_open: writable(undefined), + pv6_open: writable(undefined), + pv7_open: writable(undefined), + pv8_open: writable(undefined), sol5_open: writable(undefined), sol6_open: writable(undefined), sol7_open: writable(undefined), diff --git a/RocketControlUnitGUI/src/routes/+page.svelte b/RocketControlUnitGUI/src/routes/+page.svelte index 594cf0e..01b5c59 100644 --- a/RocketControlUnitGUI/src/routes/+page.svelte +++ b/RocketControlUnitGUI/src/routes/+page.svelte @@ -32,12 +32,14 @@ const { ac2_open, - pbv1_open, - pbv2_open, - pbv3_open, - pbv4_open, - pbv5_open, - pbv6_open, + pv1_open, + pv2_open, + pv3_open, + pv4_open, + pv5_open, + pv6_open, + pv7_open, + pv8_open, sol5_open, sol6_open, @@ -150,12 +152,12 @@ $: ac2_display = $ac2_open === undefined ? 'AC2 N/A' : $ac2_open ? 'ON' : 'OFF'; - $: pbv1_display = $pbv1_open === undefined ? 'pbv1 N/A' : $pbv1_open ? 'OPEN' : 'CLOSED'; - $: pbv2_display = $pbv2_open === undefined ? 'pbv2 N/A' : $pbv2_open ? 'OPEN' : 'CLOSED'; - $: pbv3_display = $pbv3_open === undefined ? 'pbv3 N/A' : $pbv3_open ? 'OPEN' : 'CLOSED'; - $: pbv4_display = $pbv4_open === undefined ? 'pbv4 N/A' : $pbv4_open ? 'CLOSED' : 'OPEN'; - $: pbv5_display = $pbv5_open === undefined ? 'pbv5 N/A' : $pbv5_open ? 'CLOSED' : 'OPEN'; - $: pbv6_display = $pbv6_open === undefined ? 'pbv6 N/A' : $pbv6_open ? 'CLOSED' : 'OPEN'; + $: pv1_display = $pv1_open === undefined ? 'pv1 N/A' : $pv1_open ? 'OPEN' : 'CLOSED'; + $: pv2_display = $pv2_open === undefined ? 'pv2 N/A' : $pv2_open ? 'OPEN' : 'CLOSED'; + $: pv3_display = $pv3_open === undefined ? 'pv3 N/A' : $pv3_open ? 'OPEN' : 'CLOSED'; + $: pv4_display = $pv4_open === undefined ? 'pv4 N/A' : $pv4_open ? 'CLOSED' : 'OPEN'; + $: pv5_display = $pv5_open === undefined ? 'pv5 N/A' : $pv5_open ? 'CLOSED' : 'OPEN'; + $: pv6_display = $pv6_open === undefined ? 'pv6 N/A' : $pv6_open ? 'CLOSED' : 'OPEN'; $: sol5_display = $sol5_open === undefined ? 'sol5 N/A' : $sol5_open ? 'OPEN' : 'CLOSE'; $: sol6_display = $sol6_open === undefined ? 'sol6 N/A' : $sol6_open ? 'OPEN' : 'CLOSE'; @@ -194,7 +196,10 @@ $: mev_display = $mev_open === undefined ? 'N/A' : $mev_open ? 'OPEN' : 'CLOSED'; $: battery_display = $battery_voltage === undefined ? 'N/A' : $battery_voltage; $: power_display = $power_source === undefined ? 'N/A' : $power_source ? 'ROCKET' : 'GROUND'; - + + $: pv7_display = $pv7_open === undefined ? 'N/A' : $pv7_open ? 'OPEN' : 'CLOSE'; + $: pv8_display = $pv8_open === undefined ? 'N/A' : $pv8_open ? 'OPEN' : 'CLOSE'; + $: relayStatusOutdated = Date.now() - timestamps.relay_status > 5000; $: combustionControlStatusOutdated = Date.now() - timestamps.combustion_control_status > 5000; $: rcuTempOutdated = Date.now() - timestamps.rcu_temp > 5000; @@ -272,75 +277,75 @@ -
+
handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PBV1', 'RCU_CLOSE_PBV1')} + bind:checked={$pv1_open} + on:click={(e) => handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PV1', 'RCU_CLOSE_PV1')} > - {pbv1_display} + {pv1_display}
-
+
handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PBV2', 'RCU_CLOSE_PBV2')} + bind:checked={$pv2_open} + on:click={(e) => handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PV2', 'RCU_CLOSE_PV2')} > - {pbv2_display} + {pv2_display}
-
+
handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PBV3', 'RCU_CLOSE_PBV3')} + bind:checked={$pv3_open} + on:click={(e) => handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PV3', 'RCU_CLOSE_PV3')} > - {pbv3_display} + {pv3_display}
-
+
handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PBV4', 'RCU_CLOSE_PBV4')} + bind:checked={$pv4_open} + on:click={(e) => handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PV4', 'RCU_CLOSE_PV4')} > - {pbv4_display} + {pv4_display}
-
+
handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PBV5', 'RCU_CLOSE_PBV5')} + bind:checked={$pv5_open} + on:click={(e) => handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PV5', 'RCU_CLOSE_PV5')} > - {pbv5_display} + {pv5_display}
-
+
handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PBV6', 'RCU_CLOSE_PBV6')} + bind:checked={$pv6_open} + on:click={(e) => handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PV6', 'RCU_CLOSE_PV6')} > - {pbv6_display} + {pv6_display}
@@ -484,6 +489,30 @@

{timer_remaining_display}

+
+ handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PV7', 'RCU_CLOSE_PV7')} + > + {pv7_display} + +
+ +
+ handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PV8', 'RCU_CLOSE_PV8')} + > + {pv8_display} + +
+ {#if $currentState === "RS_IGNITION" || $currentState === "RS_TEST" || $currentState === "RS_ABORT" || $currentState === "RS_LAUNCH" || $currentState === "RS_BURN" || $currentState === "RS_COAST" || $currentState === "RS_RECOVERY"}