Skip to content

Control station new version fix #342

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

Closed
ariadnatp wants to merge 2 commits into from
Closed

Control station new version fix #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5475bf7
changes
ariadnatp Jul 3, 2025
f344d3d
layout controlStation
ariadnatp Jul 4, 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
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions adj
Open in desktop
Submodule adj added at 7e5fcd
1 change: 0 additions & 1 deletion backend/cmd/adj
Open in desktop
Submodule adj deleted from d4f57b
4 changes: 2 additions & 2 deletions backend/cmd/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

# Vehicle Configuration
[vehicle]
boards = ["HVSCU", "PCU", "BLCU"]
boards = ["HVSCU-Cabinet", "BCU", "PCU", "BLCU"]

# ADJ (Architecture Description JSON) Configuration
[adj]
Expand All @@ -19,7 +19,7 @@ test = true # Enable test mode

# Network Configuration
[network]
manual = false # Manual network device selection
manual = true # Manual network device selection

# Transport Configuration
[transport]
Expand Down
2 changes: 1 addition & 1 deletion common-front/lib/components/Connections/useConnections.ts
View file
Open in desktop
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 "../../../../common-front/dist";

export function useConnections() {

Expand Down
7,717 changes: 4,977 additions & 2,740 deletions ethernet-view/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions packet-sender/adj/boards.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"BCU":"boards/BCU/BCU.json",
"LCU":"boards/LCU/LCU.json",
"OBCCU":"boards/OBCCU/OBCCU.json",
"VCU":"boards/VCU/VCU.json",
"HVSCU-Cabinet": "boards/HVSCU-Cabinet/HVSCU-Cabinet.json"
}

8 changes: 8 additions & 0 deletions packet-sender/adj/boards/BCU/BCU.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"board_id": 16,
"board_ip": "127.0.0.2",
"measurements": ["BCU_measurements.json"],
"packets": [
"control_packets.json"
]
}
68 changes: 68 additions & 0 deletions packet-sender/adj/boards/BCU/BCU_measurements.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@

[
{
"id": "duty_cycle",
"name": "Duty Cycle",
"type": "float32",
"podUnits": "",
"displayUnits": "",
"safeRange": [0, 100]

},
{
"id": "bpu_sector",
"name": "BPU Sector",
"type": "enum",
"nodUnits": "",
"displayUnits": "",
"enumValues": ["1","2","BOTH"]


},
{
"id": "motor_phase",
"name": "Motor Phase (First PWM number)",
"type": "enum",
"podUnits": "",
"displayUnits": "",
"enumValues": ["U","V","W"]


},
{
"id": "vdc",
"name": "VDC",
"type": "float32",
"podUnits": "",
"displayUnits": "",
"safeRange": [0, 432]

},
{
"id": "target_voltage",
"name": "Target Voltage",
"type": "float32",
"podUnits": "",
"displayUnits": "",
"safeRange": [0, 432]

},
{
"id": "frequency",
"name": "Frequency",
"type": "float32",
"podUnits": "",
"displayUnits": ""


},
{
"id": "current_u_bpu_1_sector_1",
"name": "current_u_bpu_1_sector_1",
"type": "float32",
"podUnits": "",
"displayUnits": "",
"safeRange": [-100, 100],
"warningRange":[-100, 100]
}
]
33 changes: 33 additions & 0 deletions packet-sender/adj/boards/BCU/control_packets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
[
{
"id":900,
"type": "order",
"name":"Open Contactors",
"variables":[

]
},
{
"id":901,
"type": "order",
"name":"Close Contactors",
"variables":[

]
},
{
"id":2,
"type": "order",
"name":"Active Discharge",
"variables":[

]
},{
"id": 24,
"type": "data",
"name": "placeholder",
"variables":[
"current_u_bpu_1_sector_1"
]
}
]
14 changes: 14 additions & 0 deletions packet-sender/adj/boards/HVSCU-Cabinet/HVSCU-Cabinet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"board_id": 216,
"board_ip": "127.0.0.2",
"packets": [
"supercaps_data.json",
"orders.json",
"packets.json"
],
"measurements": [
"supercaps_measurements.json",
"order_measurements.json",
"measurements.json"
]
}
116 changes: 116 additions & 0 deletions packet-sender/adj/boards/HVSCU-Cabinet/measurements.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
[
{
"id": "sdc_good",
"name": "SDC Good",
"type": "enum",
"podUnits": "",
"displayUnits": "",
"enumValues": [
"False",
"True"
]
},
{
"id": "bus_voltage",
"name": "Bus Voltage",
"type": "float32",
"podUnits": "V",
"displayUnits": "V",
"below": {
"safe": 400.0,
"warning": 450.0
}
},
{
"id": "contactors_state",
"name": "Contactors State",
"type": "enum",
"podUnits": "",
"displayUnits": "",
"enumValues": [
"Open",
"Charging",
"Charged",
"Precharge",
"Close"
]
},
{
"id": "output_current",
"name": "Output Current",
"type": "float32",
"podUnits": "A",
"displayUnits": "A"
},
{
"id": "BCU_control_u_duty_cycle",
"name": "U Duty Cycle",
"type": "float32",
"podUnits": "%",
"displayUnits": "%"
},
{
"id": "BCU_control_v_duty_cycle",
"name": "V Duty Cycle",
"type": "float32",
"podUnits": "%",
"displayUnits": "%"
},
{
"id": "BCU_control_w_duty_cycle",
"name": "W Duty Cycle",
"type": "float32",
"podUnits": "%",
"displayUnits": "%"
},
{
"id": "BCU_state_master_general",
"name": "Master General State",
"type": "enum",
"podUnits": "",
"displayUnits": "",
"enumValues": [
"Connecting",
"Operational",
"Fault"
]
},
{
"id": "BCU_state_master_nested",
"name": "Master Nested State",
"type": "enum",
"podUnits": "",
"displayUnits": "",
"enumValues": [
"Idle",
"Ready",
"Boosting",
"Testing"
]
},
{
"id": "BCU_state_slave_general",
"name": "Slave General State",
"type": "enum",
"podUnits": "",
"displayUnits": "",
"enumValues": [
"Connecting",
"Operational",
"Fault"
]
},
{
"id": "BCU_state_slave_nested",
"name": "Slave Nested State",
"type": "enum",
"podUnits": "",
"displayUnits": "",
"enumValues": [
"Idle",
"Ready",
"Boosting",
"Testing"
]
}
]
Loading
Loading