Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
117 commits
Select commit Hold shift + click to select a range
1d5ba18
new version of the control-station
ariadnatp Jun 25, 2025
13df8c6
some variable changes (LCU: current and orientation)
ariadnatp Jun 25, 2025
276acd2
layout
ariadnatp Jul 2, 2025
5475bf7
changes
ariadnatp Jul 3, 2025
f344d3d
layout controlStation
ariadnatp Jul 4, 2025
27c2d31
Fix things
JFisica Jul 4, 2025
17d7cf9
Spelling
JFisica Jul 4, 2025
a2c08f6
Update .gitignore
JFisica Jul 4, 2025
73cf12a
Merge branch 'develop' into control-station/new-version
JFisica Jul 5, 2025
eb47251
Use StateIndicator for HVSCU
JFisica Jul 5, 2025
8c778b1
update imports
msanlli Jul 5, 2025
f85bd41
Added charts
JFisica Jul 5, 2025
37d5d2f
Update PcuMeasurements
JFisica Jul 5, 2025
4c4573a
Refactor current variables
JFisica Jul 5, 2025
7469f49
Implement Charts on a different module
JFisica Jul 5, 2025
5a92e9e
Connect batteries to back
JFisica Jul 5, 2025
d5d557a
Use state
JFisica Jul 5, 2025
4012d64
LCU measurements implementation
JFisica Jul 5, 2025
692b439
LevitationUnit imageSide
JFisica Jul 5, 2025
baccdb1
Batteries safe and warning ranges
JFisica Jul 5, 2025
9e3e4eb
Allow no image on H/EMS
JFisica Jul 5, 2025
bb5ff7f
Changed LCU current indicator
JFisica Jul 6, 2025
77a1482
LCU subtitle style
JFisica Jul 6, 2025
0d1773b
LCU window
JFisica Jul 6, 2025
771d553
Fic some sizes
JFisica Jul 6, 2025
a7319cd
Fix LCU orientation
JFisica Jul 6, 2025
a47b1ae
Add LEDs
JFisica Jul 6, 2025
83b6ea7
Add Brake State
JFisica Jul 6, 2025
d1674f1
Fix button routes
JFisica Jul 6, 2025
1eada4b
Pod Position on top
JFisica Jul 6, 2025
34a573b
Make Page 1 more compact
JFisica Jul 6, 2025
469ed52
HVSCU State indicators base
JFisica Jul 6, 2025
18d8beb
A little responsive
JFisica Jul 6, 2025
fd20e78
some changes
ariadnatp Jul 6, 2025
fd9863c
IMD indicator
JFisica Jul 6, 2025
ed41a6e
Compact rows
JFisica Jul 6, 2025
6006310
Add auto height for middle column
JFisica Jul 6, 2025
0f19f4e
Pod Position bar
JFisica Jul 7, 2025
fee8069
Make current units fit on the indicator
JFisica Jul 7, 2025
9b26071
Gauge
JFisica Jul 7, 2025
caf227c
Charts with proper size
JFisica Jul 7, 2025
f56a06b
Use GaugeTag
JFisica Jul 7, 2025
6e1920d
Merge branch 'control-station/new-version' into controlStation_newVer…
JFisica Jul 7, 2025
ffdcd51
Merge pull request #346 from HyperloopUPV-H8/controlStation_newVersion
JFisica Jul 7, 2025
e8ea7cf
Remove unnecessary imports and styles
JFisica Jul 7, 2025
8b8c8f0
Change state order button
JFisica Jul 7, 2025
952f783
Make orders and messages more compact
JFisica Jul 7, 2025
072dcab
Change State order on ethernet view
JFisica Jul 7, 2025
cde8d72
Pod position with levion
JFisica Jul 8, 2025
7bd08f0
Change IMD indicator text
JFisica Jul 8, 2025
3bff496
Change brake state text
JFisica Jul 8, 2025
f8833a3
Change LCU current icon
JFisica Jul 8, 2025
4ed3fb3
Fixed Batteries
JFisica Jul 8, 2025
28dacb0
Battery lost connection
JFisica Jul 8, 2025
b99ddb1
Gui Booster measurements fix
JFisica Jul 8, 2025
50e35e3
Added OrderContainer to control station
JFisica Jul 8, 2025
0bb2750
Small things
JFisica Jul 9, 2025
8603e74
HVSCU/LCU have changed name, also the position of pagination
ariadnatp Jul 9, 2025
2fd758b
alreaday added some HVSCU components
ariadnatp Jul 9, 2025
5c8a01b
Change general structure of control station pages
JFisica Jul 9, 2025
682d7c9
mmm yes
JFisica Jul 9, 2025
77e9edf
Merge branch 'control-station/new-version' into control-station/gener…
JFisica Jul 9, 2025
73102b0
a
JFisica Jul 9, 2025
9b9cab9
Merge pull request #350 from HyperloopUPV-H8/control-station/general-…
JFisica Jul 9, 2025
5abcc22
Change pages order
JFisica Jul 9, 2025
43882a9
Fix build porblems
JFisica Jul 9, 2025
b694348
Update pod model
JFisica Jul 9, 2025
f18beac
Add vehicle state
JFisica Jul 9, 2025
3f33f8d
Use team logo
JFisica Jul 9, 2025
1b90f49
Enum changes
JFisica Jul 10, 2025
19b89d3
Change enums and move vehicle status to the side
JFisica Jul 10, 2025
423c289
Add dcbus and make batteries smaller
JFisica Jul 10, 2025
4020638
Brake state colors
JFisica Jul 10, 2025
eb09b22
Add logger
JFisica Jul 10, 2025
37f24a5
Change desired orders for main page
JFisica Jul 10, 2025
4137261
Fix build issues
JFisica Jul 10, 2025
7912fc0
Compact logger
JFisica Jul 10, 2025
1ab6307
Use only VCU orders on main page
JFisica Jul 10, 2025
cd45461
Fix scroll
JFisica Jul 10, 2025
ae5aea2
Responsive scroll
JFisica Jul 10, 2025
9f0dee5
pod position fix
JFisica Jul 10, 2025
6ae700f
Merge branch 'develop' into control-station/new-version
msanlli Jul 10, 2025
62f2314
remove old packet-sender
msanlli Jul 10, 2025
6ccd2a8
Revert "remove old packet-sender"
msanlli Jul 10, 2025
6371dec
update lock
msanlli Jul 10, 2025
2b5761e
Update measurements
JFisica Jul 10, 2025
83c3caf
Add vehicle state
JFisica Jul 10, 2025
18b5094
Change HVSCU states measurements
JFisica Jul 10, 2025
982124b
Fix gauge overflow
JFisica Jul 10, 2025
346d1bd
Gauge text
JFisica Jul 10, 2025
98b73c1
Merge branch 'develop' into control-station/new-version
msanlli Jul 10, 2025
f7e6c56
Add pneumatics
JFisica Jul 11, 2025
0e63b87
Fix build issues
JFisica Jul 11, 2025
80c9bb1
Cooling icon
JFisica Jul 11, 2025
86ee997
BCU enums
JFisica Jul 11, 2025
748a3f2
Pneumatic border
JFisica Jul 11, 2025
14fa41c
Batteries page without cell measurement
JFisica Jul 11, 2025
3e345b1
HVSCU soc measurement
JFisica Jul 11, 2025
4063518
Pneumatic and Cooling
JFisica Jul 11, 2025
518fd8e
HVSCU SOC
JFisica Jul 11, 2025
f7e5500
Booster Temps
JFisica Jul 11, 2025
6283b2d
Booster global ticker and text space
JFisica Jul 11, 2025
2484318
Total voltage booster
JFisica Jul 11, 2025
cfbc585
Some colors
JFisica Jul 11, 2025
a0175db
Yes
JFisica Jul 11, 2025
3e7ad05
Sign MainPage
JFisica Jul 11, 2025
066c067
Booster and emergency orders
JFisica Jul 12, 2025
1df7cbf
Add pneumatic measurements
JFisica Jul 12, 2025
c38050b
HVSCU indicators size fix
JFisica Jul 12, 2025
388691d
Merge branch 'develop' into control-station/new-version
msanlli Jul 12, 2025
acb12ab
Change some colors
JFisica Jul 12, 2025
17941a2
Merge pull request #354 from HyperloopUPV-H8/control-station/state-co…
JFisica Jul 12, 2025
ddc8f9b
Get warning range
JFisica Jul 12, 2025
6103fe0
Cell colors and HVSCU contactors
JFisica Jul 12, 2025
e341736
Merge branch 'control-station/new-version-fix' into control-station/n…
JFisica Jul 12, 2025
9c64fca
State colors
JFisica Jul 12, 2025
68d318b
Final change: Make emergency button slightly bigger
JFisica Jul 12, 2025
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,7 @@ backend/cmd/cmd
CLAUDE*
.claude

*.exe

# Rust build artifacts
packet-sender/target/
1 change: 1 addition & 0 deletions backend/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ downloads
audience_static

cmd/adj/
cmd/config.toml
2 changes: 1 addition & 1 deletion common-front/lib/components/Connections/useConnections.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useConnectionsStore, useMeasurementsStore, usePodDataStore, useSubscribe } from "../..";
import { useConnectionsStore, useMeasurementsStore, usePodDataStore, useSubscribe } from "../../";

export function useConnections() {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
.counter {
width: fit-content;
height: fit-content;
border-radius: 4rem;
padding: 0.25rem 0.35rem;
border-radius: 3rem;
padding: 0.15rem 0.25rem;

font-family: Consolas;
font-size: small;
font-size: 0.7rem;
line-height: 90%;

color: white;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
.infoMessageView {
display: flex;
flex-direction: column;
gap: 0.5rem;
gap: 0.2rem;
min-width: 0;
}

.board {
color: var(--main-color);
font-weight: bold;
font-size: 0.8rem;
overflow: hidden;
text-overflow: ellipsis;
}

.payload {
font-size: 0.8rem;
font-size: 0.7rem;
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@
"icon content counter" auto
"icon timestamp timestamp" auto / auto 1fr auto;

gap: 0.4rem 0.8rem;
gap: 0.2rem 0.4rem;

padding: 0.6rem;
padding: 0.3rem;
background-color: var(--background-color);
border-radius: 1rem;
border-radius: 0.5rem;
filter: (--shadow);
font-size: 0.8rem;
}

.icon {
Expand All @@ -48,7 +49,7 @@
.idAndCounter {
display: flex;
align-items: center;
gap: 0.5rem;
gap: 0.3rem;
}

.timestamp {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const MessageView = React.memo(({ message }: Props) => {

return (
<article className={`${styles.message} ${appearance}`}>
<Icon className={styles.icon} />
<Icon className={styles.icon}/>
{Message}
<Counter
className={styles.counter}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@

.arrow {
color: var(--light-color);
width: 0.8em;
height: 0.8em;
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.protectionMessage {
display: grid;
grid-template-rows: auto 1fr;
gap: 0.5rem;
gap: 0.2rem;
}

.kindAndOrigin {
Expand All @@ -10,20 +10,21 @@
flex-wrap: wrap;
overflow: hidden;

column-gap: 0.8rem;
row-gap: 0.5rem;
column-gap: 0.4rem;
row-gap: 0.2rem;
}

.protectionKind {
width: fit-content;
height: fit-content;
text-overflow: ellipsis;
overflow: hidden;
padding: 0.15rem 0.4rem;
border-radius: 0.5rem;
padding: 0.1rem 0.3rem;
border-radius: 0.3rem;
background-color: var(--main-color);
color: white;
font-weight: bold;
font-size: 0.7rem;
}

.origin {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
overflow: hidden;
text-overflow: ellipsis;
color: var(--main-color);
font-size: 0.7rem;
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
display: flex;
flex-direction: column;
align-items: stretch;
gap: 1rem;
gap: 0.5rem;
}

.messages {
flex: 1 1 0;
display: flex;
flex-direction: column;
gap: 0.6rem;
gap: 0.3rem;
min-height: 0;
overflow-y: auto;
height: 100%;
Expand All @@ -21,7 +21,7 @@
display: flex;
flex-direction: row;
justify-content: center;
gap: 1rem;
gap: 0.5rem;
}

.clearBtn {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
.boardOrders {
display: flex;
flex-direction: column;
gap: 0.5rem;
gap: 0.2rem;
}

.name {
display: flex;
gap: 0.5rem;
gap: 0.3rem;
font-family: Inter;
font-weight: 500;
font-size: 0.8rem;
color: hsl(29, 88%, 70%);
cursor: pointer;
}
Expand All @@ -18,11 +19,11 @@
.stateOrders {
display: flex;
flex-direction: column;
gap: 0.5rem;
gap: 0.2rem;

.title {
color: rgb(145, 145, 145);
font-weight: 500;
font-size: 0.8rem;
font-size: 0.7rem;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,19 @@
width: 100%;
display: flex;
flex-flow: column;
gap: 0.5rem;
gap: 0.2rem;
}

.input {
display: flex;
flex-flow: row;
gap: 0.5rem;
gap: 0.2rem;
}

.name {
text-overflow: ellipsis;
overflow: hidden;
font-size: 0.8rem;
}

.disabled {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

.fieldsWrapper {
width: 100%;
padding: 1rem;
padding: 0.4rem;
border-top: 1px solid styles.$orange;

display: flex;
flex-direction: column;
gap: 0.5rem;
gap: 0.2rem;

overflow-x: auto;
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ $header-color: #ffe4cc;

.headerWrapper {
flex: 0 0 0;
padding: 0.5rem;
padding: 0.25rem 0.3rem;
display: grid;
grid-template:
'caret name target button' auto
/ auto 1fr auto 5rem;
/ auto 1fr auto 4rem;
align-items: center;
gap: 0.5rem;
gap: 0.3rem;
background-color: $header-color;
cursor: pointer;
}
Expand Down Expand Up @@ -39,15 +39,16 @@ $header-color: #ffe4cc;
grid-area: name;
color: styles.$orange;
font-weight: 500;
font-size: 0.8rem;
overflow: hidden;
text-overflow: ellipsis;
}

.target {
grid-area: target;
color: red;
font-size: 0.8rem;
margin: 0 0.5rem;
font-size: 0.7rem;
margin: 0 0.3rem;
opacity: 0;
cursor: pointer;
transition: opacity 0.07s linear;
Expand All @@ -68,5 +69,7 @@ $header-color: #ffe4cc;
height: 100%;
button {
height: 100%;
font-size: 0.7rem !important;
padding: 0.2rem !important;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@
display: flex;
flex-direction: column;
align-items: stretch;
width: 100%;
@include styles.code-text;
font-size: 0.7rem;
border: 1px solid styles.$orange;
border-radius: 0.5rem;
border-radius: 0.3rem;
overflow: hidden;
box-sizing: border-box;

@include styles.shadow;
}
18 changes: 11 additions & 7 deletions common-front/lib/components/Orders/Orders.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,37 @@
display: flex;
flex-direction: column;
overflow-y: auto;
gap: 0.5rem;
gap: 0.2rem;
box-sizing: border-box;
}

.stateOrdersToggle {
top: 0px;
position: sticky;
display: flex;
flex-direction: column;
gap: 0.5rem;
flex-direction: row;
gap: 0.2rem;
z-index: 1;
background-color: white;
font-size: 0.8rem;
font-size: 0.7rem;
align-items: center;
}

.stateOrdersToggleButton {
font-size: 0.8rem;
font-size: 0.6rem;
padding: 0.15rem 0.3rem;
height: auto;
min-height: auto;
}

.boardOrderList {
display: flex;
flex-direction: column;
gap: 0.5rem;
gap: 0.2rem;
}

.boardOrderList > :not(:last-child)::after {
content: '';
border-bottom: 1px solid rgba(165, 131, 101, 0.368);
margin-bottom: 0.5rem;
margin-bottom: 0.2rem;
}
5 changes: 3 additions & 2 deletions common-front/lib/components/Orders/Orders.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ export const Orders = ({ boards }: Props) => {
<div className={styles.ordersWrapper}>
<div className={styles.stateOrdersToggle}>
Always show state orders:{' '}
{alwaysShowStateOrders ? 'true' : 'false'}
<Button
key={alwaysShowStateOrders ? 'true' : 'false'}
className={styles.stateOrdersToggleButton}
label="Toggle"
color={alwaysShowStateOrders ? '#008000' : '#f3785c'}
label={alwaysShowStateOrders ? 'True' : 'False'}
onClick={() =>
setAlwaysShowStateOrders((prev) => !prev)
}
Expand Down
5 changes: 5 additions & 0 deletions common-front/lib/selectors/BCU.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,9 @@ export const BcuMeasurements = {
bpu2CurrentU: 'BCU/current_u_bpu_2_sector_1',
bpu2CurrentV: 'BCU/current_v_bpu_2_sector_1',
bpu2CurrentW: 'BCU/current_w_bpu_2_sector_1',
averageCurrentU: 'BCU/average_current_u',
averageCurrentV: 'BCU/average_current_v',
averageCurrentW: 'BCU/average_current_w',
generalState: 'BCU/bcu_general_state',
operationalState: 'BCU/bcu_operational_state'
};
23 changes: 13 additions & 10 deletions common-front/lib/selectors/BMSL.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
export const BmslMeasurements = {
cell1: 'BMSL/low_cell_voltage_1',
cell2: 'BMSL/low_cell_voltage_2',
cell3: 'BMSL/low_cell_voltage_3',
cell4: 'BMSL/low_cell_voltage_4',
cell5: 'BMSL/low_cell_voltage_5',
cell6: 'BMSL/low_cell_voltage_6',
temp1: 'BMSL/low_temp_1',
temp2: 'BMSL/low_temp_2',
totalVoltage: 'BMSL/low_total_voltage',
cell1: 'BMSL/cell_1',
cell2: 'BMSL/cell_2',
cell3: 'BMSL/cell_3',
cell4: 'BMSL/cell_4',
cell5: 'BMSL/cell_5',
cell6: 'BMSL/cell_6',
tempMin: 'BMSL/temp_min',
tempMax: 'BMSL/temp_max',
voltageMin: 'BMSL/voltage_min',
voltageMax: 'BMSL/voltage_max',
totalVoltage: 'BMSL/total_voltage',
dischargeCurrent: 'BMSL/avionics_current',
stateOfCharge: 'BMSL/low_soc',
current: 'BMSL/current',
stateOfCharge: 'BMSL/SOC',
generalState: 'BMSL/general_state',
};
Loading
Loading