New Hybrid Page

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",

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<any>;
-	pbv1_open: Writable<any>;
-	pbv2_open: Writable<any>;
-	pbv3_open: Writable<any>;
-	pbv4_open: Writable<any>;
+	ac2_open: Writable<any>;
+	pv1_open: Writable<any>;
+    pv2_open: Writable<any>;
+    pv3_open: Writable<any>;
+    pv4_open: Writable<any>;
+    pv5_open: Writable<any>;
+    pv6_open: Writable<any>;
+	pv7_open: Writable<any>;
+	pv8_open: Writable<any>;
 	sol5_open: Writable<any>;
-	sol6_open: Writable<any>;
-	sol7_open: Writable<any>;
-	sol8a_open: Writable<any>;
-	sol8b_open: Writable<any>;
-	continuity1: Writable<any>;
-	continuity2: Writable<any>;
-	box1_on: Writable<any>;
-	box2_on: Writable<any>;
-	vent_open: Writable<any>;
-	drain_open: Writable<any>;
-	mev_open: Writable<any>;
-	rcu_tc1_temperature: Writable<string | number | undefined>;
-	rcu_tc2_temperature: Writable<string | number | undefined>;
-	battery_voltage: Writable<any>;
-	power_source: Writable<any>;
-	upper_pv_pressure: Writable<string | number | undefined>;
-	rocket_mass: Writable<any>;
+    sol6_open: Writable<any>
+    sol7_open: Writable<any>;
+    sol8a_open: Writable<any>;
+    sol8b_open: Writable<any>;
+	tc1_temperature: Writable<any>;
+    tc2_temperature: Writable<any>;
+    tc3_temperature: Writable<any>;
+    tc4_temperature: Writable<any>;
+    tc5_temperature: Writable<any>;
+	tc6_temperature: Writable<any>;
 	nos1_mass: Writable<any>;
 	nos2_mass: Writable<any>;
-	ib_pressure: Writable<string | number | undefined>;
-	lower_pv_pressure: Writable<string | number | undefined>;
-	pv_temperature: Writable<string | number | undefined>;
 	pt1_pressure: Writable<string | number | undefined>;
 	pt2_pressure: Writable<string | number | undefined>;
 	pt3_pressure: Writable<string | number | undefined>;
 	pt4_pressure: Writable<string | number | undefined>;
-	sob_tc1_temperature: Writable<string | number | undefined>;
-	sob_tc2_temperature: Writable<string | number | undefined>;
+    pt5_pressure: Writable<string | number | undefined>;
+	pt6_pressure: Writable<string | number | undefined>;
+	pt7_pressure: Writable<string | number | undefined>;
+	pt8_pressure: Writable<string | number | undefined>;
 	system_state: Writable<string | undefined>;
 	timer_state: Writable<string | undefined>;
 	timer_period: Writable<number | undefined>;
 	timer_remaining: Writable<number | undefined>;
+	box1_on: Writable<any>;
+	box2_on: Writable<any>;
+	mev_open: Writable<any>;
+	battery_voltage: Writable<any>;
+	power_source: Writable<any>;
 }
 
 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<string | number | undefined>(undefined),
-		rcu_tc2_temperature: writable<string | number | undefined>(undefined),
-		battery_voltage: writable(undefined),
-		power_source: writable(undefined),
-		upper_pv_pressure: writable<string | number | undefined>(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<string | number | undefined>(undefined),
-		lower_pv_pressure: writable<string | number | undefined>(undefined),
-		pv_temperature: writable<string | number | undefined>(undefined),
 		pt1_pressure: writable<string | number | undefined>(undefined),
 		pt2_pressure: writable<string | number | undefined>(undefined),
 		pt3_pressure: writable<string | number | undefined>(undefined),
 		pt4_pressure: writable<string | number | undefined>(undefined),
-		sob_tc1_temperature: writable<string | number | undefined>(undefined),
-		sob_tc2_temperature: writable<string | number | undefined>(undefined),
+		pt5_pressure: writable<string | number | undefined>(undefined),
+		pt6_pressure: writable<string | number | undefined>(undefined),
+		pt7_pressure: writable<string | number | undefined>(undefined),
+		pt8_pressure: writable<string | number | undefined>(undefined),
 		system_state: writable<string | undefined>(undefined),
 		timer_state: writable<string | undefined>(undefined),
 		timer_period: writable<number | undefined>(undefined),
-		timer_remaining: writable<number | undefined>(undefined)
+		timer_remaining: writable<number | undefined>(undefined),
+		box1_on: writable(undefined),
+		box2_on: writable(undefined),
+		mev_open: writable(undefined),
+		battery_voltage: writable(undefined),
+		power_source: writable(undefined)
 	};
 };

RocketControlUnitGUI/src/routes/+layout.svelte

@@ -69,10 +69,6 @@
 			<AppRailAnchor href="/live-feed" selected={$page.url.pathname === "/live-feed"}>
 				<img src="/icons/camera.png" class="sideBar-center" alt="Icon" />
 			</AppRailAnchor>
-
-			<AppRailAnchor href="/about" selected={$page.url.pathname === "/about"}>
-				<img src="/icons/info.png" class="sideBar-center" alt="Icon" />
-			</AppRailAnchor>
 		</AppRail>
 	</svelte:fragment>