Skip to content

MANY GUI UPDATES #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ChristyGuirguis wants to merge 7 commits into
base: master
Choose a base branch
from
Open

MANY GUI UPDATES #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a45f930
swapped rocket mass and nos2
May 23, 2026
6d674f0
updated light/dark backgrounds
May 23, 2026
9eb3458
fixed missing vent
May 23, 2026
543b285
Updated positioning of gui elements
SpiroDouvis May 23, 2026
97ca15c
moved over svgs
May 23, 2026
05b48db
Merge branch 'Christy/GUIcomponents' of https://github.com/UCSOAR/Lau…
May 23, 2026
6d318e9
Updated GUI
SpiroDouvis May 23, 2026
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,224 changes: 1,224 additions & 0 deletions RocketControlUnitGUI/src/lib/MainBackground.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,191 changes: 1,191 additions & 0 deletions RocketControlUnitGUI/src/lib/MainBackgroundDark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3,253 changes: 26 additions & 3,227 deletions RocketControlUnitGUI/src/lib/components/Diagram.svelte
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions RocketControlUnitGUI/src/routes/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,10 @@
$: dip_tube_tc_display =
$dip_tube_tc_temperature === undefined ? 'N/A' : $dip_tube_tc_temperature;

$: rocket_mass_display = $rocket_mass === undefined ? 'N/A' : Number($rocket_mass).toFixed(2);
$: rocket_mass_display = $rocket_mass === undefined ? 'N/A' : Number($nos2_mass).toFixed(2);

$: 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);
$: nos2_mass_display = $nos2_mass === undefined ? 'N/A' : Number($rocket_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;
Expand Down Expand Up @@ -542,7 +542,7 @@
<button
type="button"
class="btn btn-sm variant-filled-secondary"
on:click={() => performTare('NOS2')}
on:click={() => performTare('LAUNCHRAIL')}
>
TARE
</button>
Expand All @@ -553,8 +553,8 @@
type="button"
class="btn btn-sm variant-filled-error"
on:click={() => {
writeLoadCellCommand('NOS2', 'CANCEL', 0);
resumeConfirmRemoveWeight('NOS2');
writeLoadCellCommand('LAUNCHRAIL', 'CANCEL', 0);
resumeConfirmRemoveWeight('LAUNCHRAIL');
}}
>
CAL
Expand All @@ -565,7 +565,7 @@
<button
type="button"
class="btn btn-sm variant-filled-secondary"
on:click={() => performTare('LAUNCHRAIL')}
on:click={() => performTare('NOS2')}
>
TARE
</button>
Expand All @@ -576,8 +576,8 @@
type="button"
class="btn btn-sm variant-filled-error"
on:click={() => {
writeLoadCellCommand('LAUNCHRAIL', 'CANCEL', 0);
resumeConfirmRemoveWeight('LAUNCHRAIL');
writeLoadCellCommand('NOS2', 'CANCEL', 0);
resumeConfirmRemoveWeight('NOS2');
}}
>
CAL
Expand Down
60 changes: 30 additions & 30 deletions RocketControlUnitGUI/src/styles/display.postcss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,16 @@

.vent_slider {
position: absolute;
top: calc(var(--container-width) * 0.222);
left: 85.3%;
top: calc(var(--container-width) * 0.205);
left: 96.3%;
transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900));
font-size: 16px;
}

.drain_slider {
position: absolute;
top: calc(var(--container-width) * 0.265);
left: 85.3%;
top: calc(var(--container-width) * 0.375);
left: 96.3%;
transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1900));
font-size: 16px;
}
Expand All @@ -117,16 +117,16 @@

.upper_pv_heater_slider {
position: absolute;
top: calc(var(--container-width) * 0.144);
left: 90.2%;
top: calc(var(--container-width) * 0.265);
left: 93.2%;
transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 2300));
font-size: 12px;
}

.lower_pv_heater_slider {
position: absolute;
top: calc(var(--container-width) * 0.318);
left: 98.15%;
top: calc(var(--container-width) * 0.430);
left: 91.7%;
transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 2300));
font-size: 12px;
}
Expand Down Expand Up @@ -297,32 +297,32 @@

.upper_pv_pressure {
position: absolute;
top: calc(var(--container-width) * 0.104);
left: 92.9%;
top: calc(var(--container-width) * 0.154);
left: 87.0%;
transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500));
font-size: 14px;
font-size: 13px;
}

.upper_pv_tc {
position: absolute;
top: calc(var(--container-width) * 0.114);
left: 86.7%;
top: calc(var(--container-width) * 0.116);
left: 89.8%;
transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500));
font-size: 12px;
}

.vent_solenoid_tc {
position: absolute;
top: calc(var(--container-width) * 0.108);
left: 89.6%;
top: calc(var(--container-width) * 0.142);
left: 94.5%;
transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500));
font-size: 12px;
}

.dip_tube_tc {
position: absolute;
top: calc(var(--container-width) * 0.114);
left: 97.4%;
top: calc(var(--container-width) * 0.155);
left: 83.4%;
transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500));
font-size: 12px;
}
Expand All @@ -337,40 +337,40 @@

.ib_pressure {
position: absolute;
top: calc(var(--container-width) * 0.391);
left: 93.1%;
top: calc(var(--container-width) * 0.350);
left: 88.7%;
transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500));
font-size: 14px;
font-size: 12px;
}

.lower_pv_pressure {
position: absolute;
top: calc(var(--container-width) * 0.345);
left: 90.9%;
top: calc(var(--container-width) * 0.311);
left: 84.5%;
transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500));
font-size: 14px;
font-size: 12px;
}

.ib_temperature {
position: absolute;
top: calc(var(--container-width) * 0.391);
left: 89.8%;
top: calc(var(--container-width) * 0.351);
left: 84.0%;
transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500));
font-size: 12px;
}

.lower_pv_tc1 {
position: absolute;
top: calc(var(--container-width) * 0.345);
left: 94.2%;
top: calc(var(--container-width) * 0.311);
left: 89.6%;
transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500));
font-size: 14px;
font-size: 12px;
}

.low_solenoid_heater_tc {
position: absolute;
top: calc(var(--container-width) * 0.356);
left: 98.35%;
top: calc(var(--container-width) * 0.312);
left: 93.6%;
transform: translate(-50%, -50%) scale(calc(var(--container-width-unitless) / 1500));
font-size: 12px;
}
Expand Down
2 changes: 1 addition & 1 deletion SoarCommunications
Open in desktop
Submodule SoarCommunications updated 19 files
+1 −1 SoarProto/ProtocolTask.cpp
+0 −1,711 SoarProto/_C++/CommandMessage.hpp
+0 −663 SoarProto/_C++/CommandMessages.hpp
+0 −2,862 SoarProto/_C++/ControlMessage.hpp
+0 −54 SoarProto/_C++/CoreProto.h
+0 −2,519 SoarProto/_C++/SensorData.hpp
+0 −6,914 SoarProto/_C++/TelemetryMessage.hpp
+0 −43 SoarProto/_Python/CommandMessage_pb2.py
+0 −292 SoarProto/_Python/CommandMessage_pb2.pyi
+0 −30 SoarProto/_Python/CommandMessages_pb2.py
+0 −28 SoarProto/_Python/CommandMessages_pb2.pyi
+0 −49 SoarProto/_Python/ControlMessage_pb2.py
+0 −147 SoarProto/_Python/ControlMessage_pb2.pyi
+0 −30 SoarProto/_Python/CoreProto_pb2.py
+0 −66 SoarProto/_Python/CoreProto_pb2.pyi
+0 −38 SoarProto/_Python/SensorData_pb2.py
+0 −93 SoarProto/_Python/SensorData_pb2.pyi
+0 −67 SoarProto/_Python/TelemetryMessage_pb2.py
+0 −257 SoarProto/_Python/TelemetryMessage_pb2.pyi