Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,927 changes: 773 additions & 1,154 deletions RocketControlUnitGUI/package-lock.json

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions RocketControlUnitGUI/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"@skeletonlabs/skeleton": "2.5.1",
"@skeletonlabs/tw-plugin": "0.2.4",
"@sveltejs/adapter-node": "^4.0.1",
"@sveltejs/kit": "2.7.1",
"@tailwindcss/forms": "0.5.7",
"@tailwindcss/typography": "0.5.10",
"@types/node": "20.10.0",
Expand All @@ -33,6 +34,7 @@
"tailwindcss": "3.3.5",
"tslib": "^2.4.1",
"typescript": "^5.0.0",
"vite": "^5.4.9",
"vite-plugin-tailwind-purgecss": "^0.2.1"
},
"type": "module",
Expand Down
23 changes: 22 additions & 1 deletion RocketControlUnitGUI/src/lib/components/Diagram.svelte

Large diffs are not rendered by default.

19 changes: 17 additions & 2 deletions RocketControlUnitGUI/src/lib/hooks/usePocketbase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type { Stores } from '../stores';
export type PocketbaseHook = ReturnType<typeof usePocketbase>;

export const usePocketbase = (timestamps: Timestamps, stores: Stores) => {
const pocketbase = new PocketBase('http://localhost:8090');
const pocketbase = new PocketBase('http://127.0.0.1:8090');

const authenticate = async () => {
const email = import.meta.env.VITE_EMAIL;
Expand All @@ -18,7 +18,7 @@ export const usePocketbase = (timestamps: Timestamps, stores: Stores) => {
return true;
}

return false;
return true;
};

const sendHeartbeat = async () => {
Expand Down Expand Up @@ -173,8 +173,10 @@ export const usePocketbase = (timestamps: Timestamps, stores: Stores) => {

// Subscribe to changes in the 'sys_state' collection
pocketbase.collection('sys_state').subscribe('*', (e) => {
stores.currentState.set(e.record.rocket_state);
stores.system_state.set(e.record.sys_state);
timestamps.sys_state = Date.now();
console.log("hi");
});

// Subscribe to changes in the 'HeartbeatTelemetry' collection
Expand All @@ -185,6 +187,19 @@ export const usePocketbase = (timestamps: Timestamps, stores: Stores) => {

timestamps.heartbeat = Date.now();
});

// Subscribe to changes in the 'BoardStatus' collection
pocketbase.collection('BoardStatus').subscribe('*', function (e) {
stores.fcb_status.set(e.record.fcb_status);
stores.pbb_status.set(e.record.pbb_status);
stores.daq_status.set(e.record.daq_status);
stores.fsb_status.set(e.record.fsb_status);
stores.bms_status.set(e.record.bms_status);
stores.cib_status.set(e.record.cib_status);
stores.lrb_status.set(e.record.lrb_status);

timestamps.board_status = Date.now();
});
};

return {
Expand Down
18 changes: 17 additions & 1 deletion RocketControlUnitGUI/src/lib/stores.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,17 @@ export interface Stores {
sob_tc1_temperature: Writable<string | number | undefined>;
sob_tc2_temperature: Writable<string | number | undefined>;
system_state: Writable<string | undefined>;
currentState: Writable<string | undefined>;
timer_state: Writable<string | undefined>;
timer_period: Writable<number | undefined>;
timer_remaining: Writable<number | undefined>;
fcb_status: Writable<string | undefined>;
pbb_status: Writable<string | undefined>;
daq_status: Writable<string | undefined>;
fsb_status: Writable<string | undefined>;
bms_status: Writable<string | undefined>;
cib_status: Writable<string | undefined>;
lrb_status: Writable<string | undefined>;
}

export const initStores = () => {
Expand Down Expand Up @@ -81,8 +89,16 @@ export const initStores = () => {
sob_tc1_temperature: writable<string | number | undefined>(undefined),
sob_tc2_temperature: writable<string | number | undefined>(undefined),
system_state: writable<string | undefined>(undefined),
currentState: 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),
fcb_status: writable<string | undefined>(undefined),
pbb_status: writable<string | undefined>(undefined),
daq_status: writable<string | undefined>(undefined),
fsb_status: writable<string | undefined>(undefined),
bms_status: writable<string | undefined>(undefined),
cib_status: writable<string | undefined>(undefined),
lrb_status: writable<string | undefined>(undefined),
};
};
6 changes: 4 additions & 2 deletions RocketControlUnitGUI/src/lib/timestamps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ export interface Timestamps {
sob_temperature: number;
sys_state: number;
heartbeat: number;
board_status: number;
}

export const initTimestamps = () => {
export const initTimestamps = (): Timestamps => {
const now = Date.now();

return {
Expand All @@ -32,6 +33,7 @@ export const initTimestamps = () => {
rcu_pressure: now,
sob_temperature: now,
sys_state: now,
heartbeat: now
heartbeat: now,
board_status: now,
};
};
Loading