Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
147 commits
Select commit Hold shift + click to select a range
b9a9a33
WIP version 1
jmaralo Jun 24, 2024
13fc583
First version!
jmaralo Jun 25, 2024
f30db12
Fix workflow file
jmaralo Jun 25, 2024
963d4c4
Make first version buildable
jmaralo Jun 25, 2024
fffab01
Improve sidebar HTML and CSS
jmaralo Jun 26, 2024
97ea1d9
Improve PageWrapper CSS
jmaralo Jun 26, 2024
10b7f87
useLoadBackend in ControlStation
jmaralo Jun 26, 2024
0fdf56e
Add splash screen component to common front
jmaralo Jun 26, 2024
6037c7d
Remove unwanted svgs
jmaralo Jun 26, 2024
85a4802
Styling and TODO comment for Ethernet View Splash Screen
jmaralo Jun 26, 2024
8f9c6eb
Change pagination position and remove unnecessary pages
jmaralo Jun 26, 2024
3c19abd
Update Data1Page css
jmaralo Jun 26, 2024
cbf4095
update Data2Page CSS
jmaralo Jun 26, 2024
7222b14
Improved BatteryPack CSS and HTML
jmaralo Jun 26, 2024
afc3681
Add hook to update pod data
jmaralo Jun 27, 2024
21eb048
Remove old assets and update new ones to reflect color
jmaralo Jun 27, 2024
c47a1f8
Use official typografy in vesper icon
jmaralo Jun 27, 2024
198eefd
Remove unused components
jmaralo Jun 27, 2024
ab0ab97
Fix Gauge arc id collision
jmaralo Jun 27, 2024
8ff51d0
Fix backend not sending all Unit information
jmaralo Jun 27, 2024
5bd5900
Small improvements to BarIndicator CSS & HTML
jmaralo Jun 27, 2024
5ff375f
Make StateIndicator reflect enum state
jmaralo Jun 27, 2024
c75eb36
Fix brake visualizer doing small changes in width when changing image
jmaralo Jun 27, 2024
ed55e46
Fix frontend not fetching orders
jmaralo Jun 28, 2024
0d7f8a6
Add TODO to orders form
jmaralo Jun 28, 2024
0647e71
Move controls tab information to data 2 page
jmaralo Jun 28, 2024
ecd1bb6
Remove default emergency orders
jmaralo Jun 28, 2024
f8aa379
Fix control station not building
jmaralo Jun 28, 2024
8c280a6
BCU and BMSL windows
jmaralo Jun 29, 2024
3e2c4f4
Add general state info
jmaralo Jun 29, 2024
12199ad
Sync form components with ethernet view
jmaralo Jun 30, 2024
336c709
Merge Orders component from ethernet view
jmaralo Jun 30, 2024
6fe5a95
Update orders component style
jmaralo Jun 30, 2024
126dd98
Update logger styles
jmaralo Jun 30, 2024
6ce266d
Set messages column max width
jmaralo Jun 30, 2024
d542709
Update icons
jmaralo Jun 30, 2024
4e00e0a
Merge pull request #152 from HyperloopUPV-H8/control-station/first-ve…
jmaralo Jul 7, 2024
4cc643c
update BMSL selectors
jmaralo Jul 7, 2024
9805f61
remove hardcoded orders
jmaralo Jul 7, 2024
533f47e
proper useEffect on barIndicator
jmaralo Jul 7, 2024
0677c0f
Remove refs from bar indicator
jmaralo Jul 7, 2024
d7ffa25
Revert "Remove refs from bar indicator"
jmaralo Jul 8, 2024
85bb1bd
Reapply "Remove refs from bar indicator"
jmaralo Jul 8, 2024
60fd01b
Script to test weird state change not updating
jmaralo Jul 8, 2024
8e966d8
Update measurements and prevent crashes
jmaralo Jul 9, 2024
bcead56
Add buttons to send emergency orders
jmaralo Jul 9, 2024
d540724
Fix useEmergencyOrders hook
jmaralo Jul 9, 2024
289d1cd
un-hardcode orders
jmaralo Jul 9, 2024
caa23f2
Update measurements
jmaralo Jul 10, 2024
8d12e85
change some measurements
jmaralo Jul 11, 2024
4e0a8d2
show board state in one place
jmaralo Jul 11, 2024
b13715e
Update bar indicator styles
jmaralo Jul 12, 2024
9e0d976
add className prop to BarIndicator
jmaralo Jul 12, 2024
8560dea
Simplify indicator stack css
jmaralo Jul 12, 2024
4b7680b
minor name changes
jmaralo Jul 12, 2024
00dbb4e
Disconnection is reflected on values
jmaralo Jul 13, 2024
fc20773
Show min and max values on bar indicator
jmaralo Jul 13, 2024
14d6cd5
major fixes
jmaralo Jul 15, 2024
8617ed0
add TCP sniffing back
jmaralo Jul 17, 2024
d36ce28
Fix TCP bug
jmaralo Jul 18, 2024
07f4007
move payload condition
jmaralo Jul 18, 2024
d5bd91c
Sizing and show LCU state
jmaralo Jul 18, 2024
053edad
scrutineering changes
jmaralo Jul 19, 2024
4c81a2a
Remove BCU data
jmaralo Jul 19, 2024
ca8daaa
Remove brake order
jmaralo Jul 19, 2024
7e851ab
Add propulsion orders
jmaralo Jul 19, 2024
6497542
remove random comments
jmaralo Jul 19, 2024
7220bfb
This should be the last fixed orders change
jmaralo Jul 19, 2024
fb55579
thread safe implementation of ring buffer
jmaralo Jul 19, 2024
65a6d05
Revert "thread safe implementation of ring buffer"
jmaralo Jul 19, 2024
8c9d597
add orders and specific state
jmaralo Jul 20, 2024
27ed4f6
Merge pull request #153 from HyperloopUPV-H8/control-station/second-v…
msanlli Sep 26, 2024
0a8a568
fix load secret
msanlli Oct 24, 2024
2d3fc5b
Merge pull request #161 from HyperloopUPV-H8/backend/load-secret-fix
msanlli Oct 24, 2024
76a270f
Merge pull request #162 from HyperloopUPV-H8/main
msanlli Oct 24, 2024
415e175
json repo download
msanlli Nov 25, 2024
8a8cbc4
func and type name changes
msanlli Nov 26, 2024
068f8ec
func fetchDocument modification
JESUSJH18 Nov 27, 2024
3d4d66e
Merge branch 'backend/adj' of https://github.com/HyperloopUPV-H8/soft…
JESUSJH18 Nov 27, 2024
d7bd8d9
ADJ
JESUSJH18 Nov 27, 2024
a898a75
remove unnecesary files
msanlli Nov 27, 2024
7dd7c8d
Remove unnecesary func in excel_reader.go
JESUSJH18 Nov 27, 2024
38d3bcc
Merge branch 'backend/adj' of https://github.com/HyperloopUPV-H8/soft…
JESUSJH18 Nov 27, 2024
2a9e6cd
Remove unnecesary func in excel_retriever.go
JESUSJH18 Nov 27, 2024
edd5b0d
Remove unused parameters in excel_adapter.go
JESUSJH18 Nov 27, 2024
0bf69b6
oblivion
msanlli Nov 27, 2024
9d921ec
Merge remote-tracking branch 'origin/backend/adj' into backend/adj
msanlli Nov 27, 2024
a3e98fe
adj download logic
msanlli Nov 27, 2024
40a2479
adj models
msanlli Nov 27, 2024
a15ebe5
adj struct unmarshal
msanlli Nov 28, 2024
eaa7ee8
adj struct json tags
msanlli Nov 28, 2024
91c90bd
adj start up on main
msanlli Nov 28, 2024
5f07cb5
Merge pull request #166 from HyperloopUPV-H8/backend/adj
msanlli Nov 28, 2024
6c7cf94
boards abstract logic
msanlli Nov 28, 2024
f312077
Merge branch 'develop' into backend/adj
msanlli Nov 28, 2024
601772f
boards logic
msanlli Nov 28, 2024
60f283f
Merge remote-tracking branch 'origin/backend/adj' into backend/adj
msanlli Nov 28, 2024
d0e3fee
boardsId logic
msanlli Nov 28, 2024
2550865
config remodeling
msanlli Nov 28, 2024
e91ab49
fix boardId type in models.go
msanlli Nov 28, 2024
85c3277
fix boardId type in adj.go
msanlli Nov 28, 2024
b1888c4
fix ports type in models.go
msanlli Nov 28, 2024
76b39ae
fix types
msanlli Nov 29, 2024
7b094e4
main.go minor changes
msanlli Nov 29, 2024
7bff5a0
Merge pull request #167 from HyperloopUPV-H8/backend/adj
msanlli Nov 29, 2024
42aff88
remove secret.json logic
msanlli Nov 30, 2024
d435fbf
fix config.go
msanlli Nov 30, 2024
3ddc5c1
remove info module
msanlli Nov 30, 2024
b5e94bd
Merge pull request #172 from HyperloopUPV-H8/develop
msanlli Dec 2, 2024
c2c3dc7
add utils
msanlli Dec 2, 2024
a1dd2ac
adapt pod_data.go
msanlli Dec 2, 2024
a01a25b
adapt main.go
msanlli Dec 2, 2024
c82ca19
fix YAMLs
msanlli Dec 2, 2024
cd8a82e
delete pkg excel logic
msanlli Dec 2, 2024
f47c01e
Merge pull request #173 from HyperloopUPV-H8/backend/adj
msanlli Dec 2, 2024
9086566
check if repo already exists
msanlli Dec 3, 2024
f72c8ca
change models fields into array
msanlli Dec 3, 2024
2aafdd3
Merge pull request #174 from HyperloopUPV-H8/backend/adj-download-fix
msanlli Dec 3, 2024
c7a08db
Merge pull request #176 from HyperloopUPV-H8/backend/unmarshal-bug
msanlli Dec 3, 2024
58879ac
add array-to-map logic
msanlli Dec 3, 2024
5a03b3f
Merge branch 'develop' into backend/array-to-map
msanlli Dec 3, 2024
64755f7
Merge pull request #177 from HyperloopUPV-H8/backend/array-to-map
msanlli Dec 3, 2024
9cae9d6
fix git clone
msanlli Dec 5, 2024
8f61fef
change struct name
msanlli Dec 5, 2024
e60bf26
restore map-only logic
msanlli Dec 5, 2024
ba8f0cd
delete unused utils
msanlli Dec 5, 2024
016afe0
use units util to get operations
msanlli Dec 6, 2024
60a68ab
disuse structures
msanlli Dec 6, 2024
5a9449e
adapt gitignore to ADJ
msanlli Dec 6, 2024
c3a0838
getBoardStructures function
msanlli Dec 6, 2024
dd94d06
adapt pod_data to ADJ
msanlli Dec 6, 2024
eef9713
minor changes
msanlli Dec 6, 2024
2aafcc6
Minor fixes :P
jmaralo Dec 6, 2024
7c486bc
schizophrenia mk2
msanlli Dec 7, 2024
cf6fd83
schizophrenia mk3
msanlli Dec 7, 2024
157a05f
schizophrenia mk4
msanlli Dec 7, 2024
a975543
remove print statements in main
g0nz4I0 Dec 7, 2024
8892bc0
removed working print statements
g0nz4I0 Dec 7, 2024
cd19bd7
added variables model
g0nz4I0 Dec 7, 2024
ece01db
removed print statements and try to make logic work
g0nz4I0 Dec 7, 2024
0f77b7f
fix enums and remove print statements
g0nz4I0 Dec 7, 2024
fdcdc16
working
g0nz4I0 Dec 7, 2024
26fe499
fixed using name for measurement lookup instead of Id
g0nz4I0 Dec 7, 2024
3f3d58a
remove print statement
g0nz4I0 Dec 7, 2024
494a9cd
remove prints
g0nz4I0 Dec 7, 2024
144c3a6
use hashmap for O1 in packet creation instead of quadratic
g0nz4I0 Dec 7, 2024
af3fe89
Merge pull request #178 from HyperloopUPV-H8/backend/v2-beta
msanlli Dec 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
27 changes: 1 addition & 26 deletions .github/workflows/build-backend.yaml
Original file line number Diff line number Diff line change
@@ -1,24 +1,17 @@
name: Build backend

on:
workflow_call:
secrets:
SECRET:
required: true
workflow_dispatch:
pull_request:
paths:
- backend/**

env:
SECRET: ${{ secrets.SECRET }}

jobs:
build-backend-linux:
name: "Build backend for linux"
runs-on: ubuntu-latest

# Runs on alpine because it is easier to staticly link the library
# Runs on alpine because it is easier to statically link the library
container:
image: golang:alpine

Expand All @@ -37,11 +30,6 @@ jobs:
working-directory: "${{env.BACKEND_DIR}}"
run: mkdir ./output

- name: "Load secret"
working-directory: "${{env.BACKEND_DIR}}"
run: |
./load-secret.sh "$SECRET"

- name: "Build (64 bit)"
working-directory: "${{env.BACKEND_DIR}}/cmd"
env:
Expand Down Expand Up @@ -75,14 +63,6 @@ jobs:
go-version: "1.21.3"
cache-dependency-path: "${{env.BACKEND_DIR}}\\go.sum"

- name: "Load secret"
working-directory: "${{env.BACKEND_DIR}}"
run: |
echo "$env:SECRET" > ".\internal\excel\secret.json"
echo "$env:SECRET" > ".\internal\excel_adapter\internals\secret.json"
echo "$env:SECRET" > ".\pkg\excel\secret.json"
echo "$env:SECRET" > ".\pkg\excel_adapter\internals\secret.json"

- name: "Create output path"
working-directory: "${{env.BACKEND_DIR}}"
run: mkdir .\output
Expand Down Expand Up @@ -127,11 +107,6 @@ jobs:
working-directory: "${{env.BACKEND_DIR}}"
run: mkdir ./output

- name: "Load secret"
working-directory: "${{env.BACKEND_DIR}}"
run: |
./load-secret.sh "$SECRET"

- name: "Build (64 bit)"
working-directory: "${{env.BACKEND_DIR}}/cmd"
env:
Expand Down
48 changes: 48 additions & 0 deletions .github/workflows/build-control-station.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Build control station

on:
workflow_dispatch:
pull_request:
paths:
- control-station/**
- common-front/**

jobs:
build-control-station:
name: 'Build control station'
runs-on: ubuntu-latest

env:
FRONTEND_DIR: ./control-station
COMMON_DIR: ./common-front

steps:
- uses: actions/checkout@v4
with:
sparse-checkout: |
control-station
common-front

- name: 'Install common front dependencies'
working-directory: '${{env.COMMON_DIR}}'
run: npm install

- name: 'Build common front'
working-directory: '${{env.COMMON_DIR}}'
run: npm run build

- name: 'Install control station dependencies'
working-directory: '${{env.FRONTEND_DIR}}'
run: npm install

- name: 'Build control station'
working-directory: '${{env.FRONTEND_DIR}}'
run: npm run build

- name: 'Upload build'
uses: actions/upload-artifact@v4
with:
name: control-station
path: '${{env.FRONTEND_DIR}}/static/*'
retention-days: 3
compression-level: 9
1 change: 0 additions & 1 deletion .github/workflows/build-ethernet-view.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: Build ethernet view

on:
workflow_call:
workflow_dispatch:
pull_request:
paths:
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/test-backend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ on:
- backend/**
workflow_dispatch:

env:
SECRET: ${{ secrets.SECRET }}

jobs:
test-backend:
name: "Test backend"
Expand All @@ -35,11 +32,6 @@ jobs:
run: |
sudo apt-get update && sudo apt-get install -y libpcap-dev

- name: "Load secret"
working-directory: "${{env.BACKEND_DIR}}"
run: |
./load-secret.sh "$SECRET"

- name: Test with Go
working-directory: "${{env.BACKEND_DIR}}"
run: go test -v -timeout 30s ./...
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
build
profiles

# GOOGLE API KEY
secret.json
# ADJ
JSON_ADE

# MacOS Files
.DS_Store
Expand Down
2 changes: 0 additions & 2 deletions backend/cmd/config.go
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package main

import (
"github.com/HyperloopUPV-H8/h9-backend/internal/excel_adapter"
"github.com/HyperloopUPV-H8/h9-backend/internal/server"
"github.com/HyperloopUPV-H8/h9-backend/internal/vehicle"
)

type Config struct {
Excel excel_adapter.ExcelAdapterConfig
Vehicle vehicle.Config
Server server.Config
}
20 changes: 1 addition & 19 deletions backend/cmd/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,4 @@ connections = "/backend"
files = "/"

[vehicle]
boards = ["VCU"]

[excel.download]
id="1NyNaAOw_6iWtnCpEg73AtSSFx1fMdhPRmmdOhjgjCZI"
name = "ade.xlsx"
path = "."

[excel.parse]
global_sheet_prefix = "GLOBAL "
board_sheet_prefix = "BOARD "
table_prefix = "[TABLE] "
[excel.parse.global]
address_table = "addresses"
backend_key = "Backend"
blcu_address_key = "BLCU"
units_table = "units"
ports_table = "ports"
board_ids_table = "board_ids"
message_ids_table = "message_ids"
boardsList = ["VCU"]
Loading