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/lib/components/Diagram.svelte b/RocketControlUnitGUI/src/lib/components/Diagram.svelte index 2a5b7e5..c5c3c8a 100644 --- a/RocketControlUnitGUI/src/lib/components/Diagram.svelte +++ b/RocketControlUnitGUI/src/lib/components/Diagram.svelte @@ -1,2576 +1,934 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/RocketControlUnitGUI/src/lib/stores.ts b/RocketControlUnitGUI/src/lib/stores.ts index 8afde5f..56225f4 100644 --- a/RocketControlUnitGUI/src/lib/stores.ts +++ b/RocketControlUnitGUI/src/lib/stores.ts @@ -4,85 +4,88 @@ export const currentState = writable('N/A'); export const auth = writable(false); export interface Stores { - ac1_open: Writable; - pbv1_open: Writable; - pbv2_open: Writable; - pbv3_open: Writable; - pbv4_open: Writable; + ac2_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; - sol8a_open: Writable; - sol8b_open: Writable; - continuity1: Writable; - continuity2: Writable; - box1_on: Writable; - box2_on: Writable; - vent_open: Writable; - drain_open: Writable; - mev_open: Writable; - rcu_tc1_temperature: Writable; - rcu_tc2_temperature: Writable; - battery_voltage: Writable; - power_source: Writable; - upper_pv_pressure: Writable; - rocket_mass: Writable; + sol6_open: Writable + sol7_open: Writable; + sol8a_open: Writable; + sol8b_open: Writable; + tc1_temperature: Writable; + tc2_temperature: Writable; + tc3_temperature: Writable; + tc4_temperature: Writable; + tc5_temperature: Writable; + tc6_temperature: Writable; nos1_mass: Writable; nos2_mass: Writable; - ib_pressure: Writable; - lower_pv_pressure: Writable; - pv_temperature: Writable; pt1_pressure: Writable; pt2_pressure: Writable; pt3_pressure: Writable; pt4_pressure: Writable; - sob_tc1_temperature: Writable; - sob_tc2_temperature: Writable; + pt5_pressure: Writable; + pt6_pressure: Writable; + pt7_pressure: Writable; + pt8_pressure: Writable; system_state: Writable; timer_state: Writable; timer_period: Writable; timer_remaining: Writable; + box1_on: Writable; + box2_on: Writable; + mev_open: Writable; + battery_voltage: Writable; + power_source: Writable; } export const initStores = () => { return { - ac1_open: writable(undefined), - pbv1_open: writable(undefined), - pbv2_open: writable(undefined), - pbv3_open: writable(undefined), - pbv4_open: writable(undefined), + + ac2_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), sol8a_open: writable(undefined), sol8b_open: writable(undefined), - continuity1: writable(undefined), - continuity2: writable(undefined), - box1_on: writable(undefined), - box2_on: writable(undefined), - vent_open: writable(undefined), - drain_open: writable(undefined), - mev_open: writable(undefined), - rcu_tc1_temperature: writable(undefined), - rcu_tc2_temperature: writable(undefined), - battery_voltage: writable(undefined), - power_source: writable(undefined), - upper_pv_pressure: writable(undefined), - rocket_mass: writable(undefined), + tc1_temperature: writable(undefined), + tc2_temperature: writable(undefined), + tc3_temperature: writable(undefined), + tc4_temperature: writable(undefined), + tc5_temperature: writable(undefined), + tc6_temperature: writable(undefined), nos1_mass: writable(undefined), nos2_mass: writable(undefined), - ib_pressure: writable(undefined), - lower_pv_pressure: writable(undefined), - pv_temperature: writable(undefined), pt1_pressure: writable(undefined), pt2_pressure: writable(undefined), pt3_pressure: writable(undefined), pt4_pressure: writable(undefined), - sob_tc1_temperature: writable(undefined), - sob_tc2_temperature: writable(undefined), + pt5_pressure: writable(undefined), + pt6_pressure: writable(undefined), + pt7_pressure: writable(undefined), + pt8_pressure: writable(undefined), system_state: writable(undefined), timer_state: writable(undefined), timer_period: writable(undefined), - timer_remaining: writable(undefined) + timer_remaining: writable(undefined), + box1_on: writable(undefined), + box2_on: writable(undefined), + mev_open: writable(undefined), + battery_voltage: writable(undefined), + power_source: writable(undefined) }; }; 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/+page.svelte b/RocketControlUnitGUI/src/routes/+page.svelte index 31176b1..01b5c59 100644 --- a/RocketControlUnitGUI/src/routes/+page.svelte +++ b/RocketControlUnitGUI/src/routes/+page.svelte @@ -30,42 +30,53 @@ // Destructure stores for later use const { - ac1_open, - pbv1_open, - pbv2_open, - pbv3_open, - pbv4_open, + ac2_open, + + pv1_open, + pv2_open, + pv3_open, + pv4_open, + pv5_open, + pv6_open, + pv7_open, + pv8_open, + sol5_open, sol6_open, sol7_open, sol8a_open, sol8b_open, - box1_on, - box2_on, - vent_open, - drain_open, - mev_open, - rcu_tc1_temperature, - rcu_tc2_temperature, - battery_voltage, - power_source, - upper_pv_pressure, - rocket_mass, + + tc1_temperature, + tc2_temperature, + tc3_temperature, + tc4_temperature, + tc5_temperature, + tc6_temperature, + nos1_mass, nos2_mass, - ib_pressure, - lower_pv_pressure, - pv_temperature, + pt1_pressure, pt2_pressure, pt3_pressure, pt4_pressure, - sob_tc1_temperature, - sob_tc2_temperature, + pt5_pressure, + pt6_pressure, + pt7_pressure, + pt8_pressure, + + box1_on, + box2_on, + system_state, timer_state, timer_period, - timer_remaining + timer_remaining, + + mev_open, + power_source, + battery_voltage } = stores; onMount(() => { @@ -139,52 +150,39 @@ }; }); - $: ac1_display = $ac1_open === undefined ? 'N/A' : $ac1_open ? 'ON' : 'OFF'; + $: ac2_display = $ac2_open === undefined ? 'AC2 N/A' : $ac2_open ? 'ON' : 'OFF'; - $: pbv1_display = $pbv1_open === undefined ? 'N/A' : $pbv1_open ? 'OPEN' : 'CLOSE'; - $: pbv2_display = $pbv2_open === undefined ? 'N/A' : $pbv2_open ? 'OPEN' : 'CLOSE'; - $: pbv3_display = $pbv3_open === undefined ? 'N/A' : $pbv3_open ? 'OPEN' : 'CLOSE'; - $: pbv4_display = $pbv4_open === undefined ? 'N/A' : $pbv4_open ? 'CLOSE' : '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 ? 'N/A' : $sol5_open ? 'OPEN' : 'CLOSE'; - $: sol6_display = $sol6_open === undefined ? 'N/A' : $sol6_open ? 'OPEN' : 'CLOSE'; - $: sol7_display = $sol7_open === undefined ? 'N/A' : $sol7_open ? 'OPEN' : 'CLOSE'; - $: sol8a_display = $sol8a_open === undefined ? 'N/A' : $sol8a_open ? 'OPEN' : 'CLOSE'; - $: sol8b_display = $sol8b_open === undefined ? 'N/A' : $sol8b_open ? 'OPEN' : 'CLOSE'; - - $: box1_display = $box1_on === undefined ? 'N/A' : $box1_on ? 'LIVE' : 'DEAD'; - $: box2_display = $box2_on === undefined ? 'N/A' : $box2_on ? 'LIVE' : 'DEAD'; + $: sol5_display = $sol5_open === undefined ? 'sol5 N/A' : $sol5_open ? 'OPEN' : 'CLOSE'; + $: sol6_display = $sol6_open === undefined ? 'sol6 N/A' : $sol6_open ? 'OPEN' : 'CLOSE'; + $: sol7_display = $sol7_open === undefined ? 'sol7 N/A' : $sol7_open ? 'OPEN' : 'CLOSE'; + $: sol8a_display = $sol8a_open === undefined ? 'sol8a N/A' : $sol8a_open ? 'OPEN' : 'CLOSE'; + $: sol8b_display = sol8b_open === undefined ? 'sol8b N/A' : $sol8b_open ? 'OPEN' : 'CLOSE'; - $: vent_display = $vent_open === undefined ? 'N/A' : $vent_open ? 'OPEN' : 'CLOSED'; - $: drain_display = $drain_open === undefined ? 'N/A' : $drain_open ? 'OPEN' : 'CLOSED'; - - $: rcu_tc1_display = $rcu_tc1_temperature === undefined ? 'N/A' : $rcu_tc1_temperature; - $: rcu_tc2_display = $rcu_tc2_temperature === undefined ? 'N/A' : $rcu_tc2_temperature; - - $: 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'; - - $: upper_pv_display = $upper_pv_pressure === undefined ? 'DC' : $upper_pv_pressure; - - $: rocket_mass_display = $rocket_mass === undefined ? 'N/A' : Number($rocket_mass).toFixed(2); + $: tc1_display = $tc1_temperature === undefined ? 'N/A' : $tc1_temperature; + $: tc2_display = $tc2_temperature === undefined ? 'N/A' : $tc2_temperature; + $: tc3_display = $tc3_temperature === undefined ? 'N/A' : $tc3_temperature; + $: tc4_display = $tc4_temperature === undefined ? 'N/A' : $tc4_temperature; + $: tc5_display = $tc5_temperature === undefined ? 'N/A' : $tc5_temperature; + $: tc6_display = $tc6_temperature === undefined ? 'N/A' : $tc6_temperature; $: nos1_mass_display = $nos1_mass === undefined ? 'N/A' : Number($nos1_mass).toFixed(2); $: nos2_mass_display = $nos2_mass === undefined ? 'N/A' : Number($nos2_mass).toFixed(2); - $: ib_pressure_display = $ib_pressure === undefined ? 'N/A' : $ib_pressure; - $: lower_pv_display = $lower_pv_pressure === undefined ? 'N/A' : $lower_pv_pressure; - - $: pv_temperature_display = $pv_temperature === undefined ? 'N/A' : $pv_temperature; - $: pt1_pressure_display = $pt1_pressure === undefined ? 'N/A' : $pt1_pressure; $: pt2_pressure_display = $pt2_pressure === undefined ? 'N/A' : $pt2_pressure; $: pt3_pressure_display = $pt3_pressure === undefined ? 'N/A' : $pt3_pressure; $: pt4_pressure_display = $pt4_pressure === undefined ? 'N/A' : $pt4_pressure; - - $: sob_tc1_display = $sob_tc1_temperature === undefined ? 'N/A' : $sob_tc1_temperature; - $: sob_tc2_display = $sob_tc2_temperature === undefined ? 'N/A' : $sob_tc2_temperature; + $: pt5_pressure_display = $pt5_pressure === undefined ? 'N/A' : $pt5_pressure; + $: pt6_pressure_display = $pt6_pressure === undefined ? 'N/A' : $pt6_pressure; + $: pt7_pressure_display = $pt7_pressure === undefined ? 'N/A' : $pt7_pressure; + $: pt8_pressure_display = $pt8_pressure === undefined ? 'N/A' : $pt8_pressure; $: system_state_display = $system_state === undefined ? 'N/A' : $system_state.replace('SYS_', ''); @@ -192,6 +190,16 @@ $: timer_period_display = $timer_period === undefined ? 'N/A' : ($timer_period / 1000).toFixed(0); // Convert to seconds $: timer_remaining_display = $timer_remaining === undefined ? 'N/A' : ($timer_remaining / 1000).toFixed(0); // Convert to seconds + $: box1_display = $box1_on === undefined ? 'N/A' : $box1_on ? 'LIVE' : 'DEAD'; + $: box2_display = $box2_on === undefined ? 'N/A' : $box2_on ? 'LIVE' : 'DEAD'; + + $: 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; @@ -201,7 +209,6 @@ $: pbbPressureOutdated = Date.now() - timestamps.pbb_pressure > 5000; $: pbbTemperatureOutdated = Date.now() - timestamps.pbb_temperature > 5000; $: rcuPressureOutdated = Date.now() - timestamps.rcu_pressure > 5000; - $: sobTemperatureOutdated = Date.now() - timestamps.sob_temperature > 5000; $: sysStateOutdated = Date.now() - timestamps.sys_state > 5000; $: heartbeatOutdated = Date.now() - timestamps.heartbeat > 5000; @@ -252,68 +259,93 @@ await handleSliderChange(e, 'NODE_RCU', 'RCU_IGNITE_PAD_BOX1', 'RCU_KILL_BOX1'); await handleSliderChange(e, 'NODE_RCU', 'RCU_KILL_PAD_BOX2', 'RCU_IGNITE_PAD_BOX2'); } +
-
+
+ handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_AC2', 'RCU_CLOSE_AC2')} + > + {ac2_display} + +
+ +
handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_AC1', 'RCU_CLOSE_AC1')} + bind:checked={$pv1_open} + on:click={(e) => handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PV1', 'RCU_CLOSE_PV1')} > - {ac1_display} + {pv1_display}
-
+
handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PBV1', 'RCU_CLOSE_PBV1')} + bind:checked={$pv2_open} + on:click={(e) => handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PV2', 'RCU_CLOSE_PV2')} > - {pbv1_display} + {pv2_display}
-
+
handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PBV2', 'RCU_CLOSE_PBV2')} + bind:checked={$pv3_open} + on:click={(e) => handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PV3', 'RCU_CLOSE_PV3')} > - {pbv2_display} + {pv3_display}
-
+
handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PBV3', 'RCU_CLOSE_PBV3')} + bind:checked={$pv4_open} + on:click={(e) => handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PV4', 'RCU_CLOSE_PV4')} > - {pbv3_display} + {pv4_display}
-
+
handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PBV4', 'RCU_CLOSE_PBV4')} + bind:checked={$pv5_open} + on:click={(e) => handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PV5', 'RCU_CLOSE_PV5')} > - {pbv4_display} + {pv5_display} + +
+ +
+ handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PV6', 'RCU_CLOSE_PV6')} + > + {pv6_display}
@@ -377,45 +409,107 @@
-
- handleSliderChange(e, 'NODE_DMB', 'RSC_OPEN_VENT', 'RSC_CLOSE_VENT')} - > - {vent_display} - +
+

{tc1_display}

+
+ +
+

{tc2_display}

+
+ +
+

{tc3_display}

+
+ +
+

{tc4_display}

+
+ +
+

{tc5_display}

+
+ +
+

{tc6_display}

+
+ +
+

{nos1_mass_display}

+
+ +
+

{nos2_mass_display}

+
+ +
+

{pt1_pressure_display}

+
+ +
+

{pt2_pressure_display}

+
+ +
+

{pt3_pressure_display}

+
+ +
+

{pt4_pressure_display}

+
+ +
+

{pt5_pressure_display}

+
+ +
+

{pt6_pressure_display}

+
+ +
+

{pt7_pressure_display}

+
+ +
+

{pt8_pressure_display}

+
+ +
+

{system_state_display}

+
+ +
+

{timer_state_display}

+
+ +
+

{timer_period_display}

-
+
+

{timer_remaining_display}

+
+ +
handleSliderChange(e, 'NODE_DMB', 'RSC_OPEN_DRAIN', 'RSC_CLOSE_DRAIN')} + bind:checked={$pv7_open} + on:click={(e) => handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PV7', 'RCU_CLOSE_PV7')} > - {drain_display} + {pv7_display}
-
+
- handleSliderChange( - e, - 'NODE_DMB', - 'RSC_POWER_TRANSITION_ONBOARD', - 'RSC_POWER_TRANSITION_EXTERNAL' - )} + bind:checked={$pv8_open} + on:click={(e) => handleSliderChange(e, 'NODE_RCU', 'RCU_OPEN_PV8', 'RCU_CLOSE_PV8')} > - {power_display} + {pv8_display}
@@ -484,73 +578,13 @@ type="button" class="btn btn-sm variant-filled-error" on:click={() => { - writeLoadCellCommand("NOS2", "CANCEL", 0); + writeLoadCellCommand("NOS2", "CANCEL", 0); resumeConfirmRemoveWeight("NOS2");}} > CAL
-
- -
- -
- -
- -
-

{rcu_tc1_display}

-
- -
-

{rcu_tc2_display}

-
- -
-

{nos1_mass_display}

-
- -
-

{nos2_mass_display}

-
- -
-

{pt1_pressure_display}

-
- -
-

{pt2_pressure_display}

-
- -
-

{pt3_pressure_display}

-
- -
-

{pt4_pressure_display}

-
- -
-
- -
-
-

{mev_display}

@@ -559,48 +593,22 @@

{battery_display}

-
-

{upper_pv_display}

-
- -
-

{rocket_mass_display}

-
- -
-

{ib_pressure_display}

-
- -
-

{lower_pv_display}

-
- -
-

{pv_temperature_display}

-
- -
-

{sob_tc1_display}

-
- -
-

{sob_tc2_display}

-
- -
-

{system_state_display}

-
- -
-

{timer_state_display}

-
- -
-

{timer_period_display}

-
- -
-

{timer_remaining_display}

+
+ + handleSliderChange( + e, + 'NODE_DMB', + 'RSC_POWER_TRANSITION_ONBOARD', + 'RSC_POWER_TRANSITION_EXTERNAL' + )} + > + {power_display} +
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/src/styles/display.postcss b/RocketControlUnitGUI/src/styles/display.postcss index 4cb12dc..8fd6a34 100644 --- a/RocketControlUnitGUI/src/styles/display.postcss +++ b/RocketControlUnitGUI/src/styles/display.postcss @@ -12,361 +12,348 @@ transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1600)); } -.ac1_slider { +.ac2_slider { position: absolute; - top: calc(var(--container-width) * 0.025); - left: 8.6%; + top: calc(var(--container-width) * 0.473); + left: 75%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900)); font-size: 16px; } -.pbv1_slider { +.pv1_slider { position: absolute; - top: calc(var(--container-width) * 0.118); - left: 35.5%; + top: calc(var(--container-width) * 0.19); + left: 26%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900)); font-size: 16px; } -.pbv2_slider { +.pv2_slider { position: absolute; - top: calc(var(--container-width) * 0.188); - left: 35.5%; + top: calc(var(--container-width) * 0.233); + left: 26%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900)); font-size: 16px; } -.pbv3_slider { +.pv3_slider { position: absolute; top: calc(var(--container-width) * 0.275); - left: 35.5%; + left: 26%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900)); font-size: 16px; } -.pbv4_slider { +.pv4_slider { position: absolute; - top: calc(var(--container-width) * 0.144); - left: 47.5%; + top: calc(var(--container-width) * 0.319); + left: 25.7%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900)); font-size: 16px; } -.sol5_slider { - position: absolute; - top: calc(var(--container-width) * 0.269); - left: 63.3%; - transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900)); - font-size: 16px; -} - -.sol6_slider { +.pv5_slider { position: absolute; - top: calc(var(--container-width) * 0.313); - left: 63.3%; + top: calc(var(--container-width) * 0.362); + left: 25.7%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900)); font-size: 16px; } -.sol7_slider { +.pv6_slider { position: absolute; - top: calc(var(--container-width) * 0.356); - left: 63.3%; + top: calc(var(--container-width) * 0.455); + left: 42.5%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900)); font-size: 16px; } -.sol8a_slider { +.pv7_display{ position: absolute; - top: calc(var(--container-width) * 0.396); - left: 63.3%; + top: calc(var(--container-width) * 0.31); + left: 38%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900)); font-size: 16px; } -.sol8b_slider { +.pv8_display{ position: absolute; - top: calc(var(--container-width) * 0.44); - left: 63.3%; + top: calc(var(--container-width) * 0.31); + left: 45%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900)); font-size: 16px; } -.vent_slider { +.sol5_slider { position: absolute; - top: calc(var(--container-width) * 0.152); - left: 85.3%; + top: calc(var(--container-width) * 0.382); + left: 60.5%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900)); font-size: 16px; } -.drain_slider { +.sol6_slider { position: absolute; - top: calc(var(--container-width) * 0.265); - left: 85.3%; + top: calc(var(--container-width) * 0.419); + left: 60.5%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900)); font-size: 16px; } -.power_source_slider { +.sol7_slider { position: absolute; - top: calc(var(--container-width) * 0.025); - left: 95.5%; + top: calc(var(--container-width) * 0.458); + left: 60.5%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900)); font-size: 16px; } -.box1_slider { +.sol8a_slider { position: absolute; - top: calc(var(--container-width) * 0.415); - left: 12.5%; + top: calc(var(--container-width) * 0.497); + left: 60.5%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900)); font-size: 16px; } -.box2_slider { +.sol8b_slider { position: absolute; - top: calc(var(--container-width) * 0.433); - left: 12.5%; + top: calc(var(--container-width) * 0.535); + left: 60.5%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900)); font-size: 16px; } .nos1_tare_button { position: absolute; - top: calc(var(--container-width) * 0.176); - left: 11.1%; + top: calc(var(--container-width) * 0.08); + left: 9%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900)); } .nos1_cal_button { position: absolute; - top: calc(var(--container-width) * 0.195); - left: 11%; + top: calc(var(--container-width) * 0.1); + left: 9%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900)); } .nos2_tare_button { color: #04aa6d; position: absolute; - top: calc(var(--container-width) * 0.246); - left: 11.1%; + top: calc(var(--container-width) * 0.43); + left: 9%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900)); } .nos2_cal_button { color: #04aa6d; position: absolute; - top: calc(var(--container-width) * 0.265); - left: 11%; - transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900)); -} - -.rail_tare_button { - position: absolute; - top: calc(var(--container-width) * 0.078); - left: 69.1%; + top: calc(var(--container-width) * 0.45); + left: 9%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900)); } -.rail_cal_button { +.tc1 { position: absolute; - top: calc(var(--container-width) * 0.097); - left: 69.1%; - transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900)); -} - -.rcu_tc1 { - position: absolute; - top: calc(var(--container-width) * 0.065); - left: 5.6%; + top: calc(var(--container-width) * 0.221); + left: 9.2%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500)); font-size: 14px; } -.rcu_tc2 { +.tc2 { position: absolute; - top: calc(var(--container-width) * 0.065); - left: 9.2%; + top: calc(var(--container-width) * 0.393); + left: 9.26%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500)); font-size: 14px; } -.nos1 { +.tc3 { position: absolute; - top: calc(var(--container-width) * 0.187); - left: 7.6%; + top: calc(var(--container-width) * 0.12); + left: 71.5%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500)); font-size: 14px; } -.nos2 { +.tc4 { position: absolute; - top: calc(var(--container-width) * 0.255); - left: 7.6%; + top: calc(var(--container-width) * 0.323); + left: 71.5%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500)); font-size: 14px; } -.pt1_pressure { +.tc5 { position: absolute; - top: calc(var(--container-width) * 0.117); - left: 14.7%; + top: calc(var(--container-width) * 0.422); + left: 72.5%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500)); font-size: 14px; } -.pt2_pressure { +.tc6 { position: absolute; - top: calc(var(--container-width) * 0.1882); - left: 14.7%; + top: calc(var(--container-width) * 0.385); + left: 93.8%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500)); font-size: 14px; } -.pt3_pressure { +.nos1 { position: absolute; - top: calc(var(--container-width) * 0.2743); - left: 14.9%; + top: calc(var(--container-width) * 0.097); + left: 5.5%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500)); font-size: 14px; } -.pt4_pressure { +.nos2 { position: absolute; - top: calc(var(--container-width) * 0.188); - left: 42%; + top: calc(var(--container-width) * 0.446); + left: 5.2%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500)); font-size: 14px; } -.box1_continuity { +.pt1_pressure { position: absolute; - top: calc(var(--container-width) * 0.372); - left: 14.7%; + top: calc(var(--container-width) * 0.151); + left: 9.35%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500)); font-size: 14px; - width: 1em; - height: 1em; - background-color: green; - border-radius: 10%; } -.box2_continuity { +.pt2_pressure { position: absolute; - top: calc(var(--container-width) * 0.386); - left: 14.7%; + top: calc(var(--container-width) * 0.236); + left: 12.8%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500)); font-size: 14px; - width: 1em; - height: 1em; - background-color: green; - border-radius: 10%; } -.mev_status { +.pt3_pressure { position: absolute; - top: calc(var(--container-width) * 0.069); - left: 93.9%; + top: calc(var(--container-width) * 0.322); + left: 9.3%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500)); font-size: 14px; } -.battery_voltage { +.pt4_pressure { position: absolute; - top: calc(var(--container-width) * 0.049); - left: 93.9%; + top: calc(var(--container-width) * 0.393); + left: 32.8%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500)); font-size: 14px; } -.upper_pv_pressure { +.pt5_pressure { position: absolute; - top: calc(var(--container-width) * 0.104); - left: 92.9%; + top: calc(var(--container-width) * 0.322); + left: 52.3%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500)); font-size: 14px; } -.rocket_mass { +.pt6_pressure { position: absolute; - top: calc(var(--container-width) * 0.09); - left: 74.3%; + top: calc(var(--container-width) * 0.143); + left: 91.2%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500)); font-size: 14px; } -.ib_pressure { +.pt7_pressure { position: absolute; - top: calc(var(--container-width) * 0.391); - left: 93.1%; + top: calc(var(--container-width) * 0.385); + left: 88.6%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500)); font-size: 14px; } -.lower_pv_pressure { +.pt8_pressure { position: absolute; - top: calc(var(--container-width) * 0.345); - left: 90.3%; + top: calc(var(--container-width) * 0.43); + left: 91.4%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500)); font-size: 14px; } -.pv_temperature { +.system_state { position: absolute; - top: calc(var(--container-width) * 0.345); - left: 95.5%; + top: calc(var(--container-width) * 0.502); + left: 30%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500)); - font-size: 14px; + font-size: 12px; } -.sob_tc1 { +.timer_state { position: absolute; - top: calc(var(--container-width) * 0.1405); - left: 69%; + top: calc(var(--container-width) * 0.515); + left: 30%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500)); - font-size: 14px; + font-size: 12px; } -.sob_tc2 { +.timer_period { position: absolute; - top: calc(var(--container-width) * 0.179); - left: 69%; + top: calc(var(--container-width) * 0.529); + left: 30%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500)); - font-size: 14px; + font-size: 12px; } -.system_state { +.timer_remaining { position: absolute; - top: calc(var(--container-width) * 0.373); - left: 42%; + top: calc(var(--container-width) * 0.542); + left: 30%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500)); font-size: 12px; } -.timer_state { +.outdated { + color: #d4163c; +} + +.box1_slider { position: absolute; - top: calc(var(--container-width) * 0.386); - left: 42%; - transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500)); - font-size: 12px; + top: calc(var(--container-width) * 0.48); + left: 13.5%; + transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900)); + font-size: 16px; } -.timer_period { +.box2_slider { position: absolute; - top: calc(var(--container-width) * 0.399); - left: 44%; + top: calc(var(--container-width) * 0.5); + left: 13.5%; + 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: 12px; + font-size: 14px; } -.timer_remaining { +.battery_voltage { position: absolute; - top: calc(var(--container-width) * 0.413); - left: 45%; + top: calc(var(--container-width) * 0.09); + left: 91%; transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500)); - font-size: 12px; + font-size: 14px; } -.outdated { - color: #d4163c; +.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; } + diff --git a/RocketControlUnitGUI/static/icons/info.png b/RocketControlUnitGUI/static/icons/info.png deleted file mode 100644 index bbaff80..0000000 Binary files a/RocketControlUnitGUI/static/icons/info.png and /dev/null differ