Skip to content
Merged
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
5 changes: 5 additions & 0 deletions daq-server/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

# Build artifacts
build/
build-ns/
*.o
*.a
*.so
Expand Down Expand Up @@ -230,6 +231,10 @@ scripts/calibration/calibrations/adjustments.json
# Clear. cubic_calibration.default.json (NOT ignored) is the tracked seed the service copies here
# on first run when this file is missing; promote a good cal into it via promote_default.sh.
scripts/calibration/calibrations/cubic_calibration.json
# Live load-cell tare state, written by calibration_service and cleared by the backend at session
# start. Operator display state for one session on one stand — never a thing to commit, and there
# is no tracked seed for it (absent == every load cell reads absolute, which is the right default).
scripts/calibration/calibrations/lc_tare.json

# Raw-ADC abort thresholds the calibration service regenerates from the live cal on every
# capture/clear/reload (uid target_psi raw_adc), read by config_broadcast. Runtime-derived, per-rig.
Expand Down
28 changes: 24 additions & 4 deletions daq-server/config/profiles/digital-twin/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,12 @@ role = "Low Press"
limits = ""
color = "#ff0088"

[[gui.pressure_bars]]
label = "LOX Upstream"
role = "LOX Upstream"
limits = ""
color = "#888888"

[gui.groups]
LOX = [ "LOX Upper", "LOX Mid", "LOX Lower", "COPV RTD" ]
Fuel = [ "Fuel Upstream" ]
Expand Down Expand Up @@ -297,12 +303,14 @@ active_connectors = [ 1, 2 ]
"Fuel Upstream" = 2
"Dome CTRL" = 3
"Low Press" = 4
"LOX Upstream" = 5

[calibration_model_pt_board]
"Fuel Fill Vent" = "physics"
"Fuel Upstream" = "cubic"
"Dome CTRL" = "cubic"
"Low Press" = "physics"
"LOX Upstream" = "cubic"

[calibration_full_scale_pt_board]
"Fuel Fill Vent" = 1000
Expand Down Expand Up @@ -673,11 +681,11 @@ is_flow = true
[actuator_roles]
"Fuel Upstream" = [ "NC", 1, 12 ]
"High Press CTRL" = [ "NC", 2, 12 ]
"Dome CTRL" = [ "NO", 3, 12 ]
"Dome CTRL" = [ "NC", 3, 12 ]
"Fuel Main" = [ "NC", 6, 12 ]
"fuel vent" = [ "NC", 7, 12 ]
"lox vent" = [ "NC", 9, 12 ]
"Ox Upstream" = [ "NO", 10, 12 ]
"fuel vent" = [ "NO", 7, 12 ]
"lox vent" = [ "NO", 9, 12 ]
"Ox Upstream" = [ "NC", 10, 12 ]
"Fuel Fill Press" = [ "NC", 2, 14 ]
"High Press Vent" = [ "NC", 3, 14 ]
"Fuel Fill Vent" = [ "NC", 5, 14 ]
Expand All @@ -690,3 +698,15 @@ is_flow = true
"Excitation V" = "physics"
"Dome Mid" = "cubic"
"High Press" = "cubic"

[sensor_roles_lc_board]
"Fuel Scale" = 1

[sensor_roles_lc_board_2]
"LOX Scale" = 1

[calibration_model_lc_board]
"Fuel Scale" = "cubic"

[calibration_model_lc_board_2]
"LOX Scale" = "cubic"
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
,Idle,Armed,Press Standby,Dome Press,COPV Fill,Fuel Press,LOX Press,Vent,Dome Vent,High Press Vent,Fuel Tank Vent,Ready,Fire,Flow Test
Fuel Upstream,0,0,0,0,0,0,0,0,0,0,0,0,0,0
High Press CTRL,0,0,0,0,0,0,0,0,0,0,0,0,0,0
Dome CTRL Vent,0,0,0,0,0,0,0,0,0,0,0,0,0,0
Fuel Main,0,0,0,0,0,0,0,0,0,0,0,0,1,1
Dome CTRL,0,0,0,0,0,0,0,0,0,0,0,0,0,0
Fuel Main,0,0,0,0,0,0,0,0,0,0,0,0,1,1
fuel vent,0,0,0,0,0,0,0,0,0,0,0,0,0,0
lox vent,0,0,0,0,0,0,0,0,0,0,0,0,0,0
Ox Upstream,0,0,0,0,0,0,0,0,0,0,0,0,0,0
Fuel Fill Press,0,0,0,0,0,0,0,0,0,0,0,0,0,0
High Press Vent,0,0,0,0,0,0,0,0,0,0,0,0,0,0
Fuel Fill Vent,0,0,0,0,0,0,0,0,0,0,0,0,0,0
Low Press Vent,0,0,0,0,0,0,0,0,0,0,0,0,0,0
Ox Main,0,0,0,0,0,0,0,0,0,0,0,0,0,1
Dome CTRL Vent,0,0,0,0,0,0,0,0,0,0,0,0,0,0
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
,Idle,Armed,Press Standby,Dome Press,COPV Fill,Fuel Press,LOX Press,Vent,Dome Vent,High Press Vent,Fuel Tank Vent,Ready,Fire,Flow Test
Fuel Upstream,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,OPEN,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,OPEN,OPEN
High Press CTRL,CLOSE,CLOSE,CLOSE,CLOSE,OPEN,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE
Dome CTRL Vent,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,OPEN,OPEN,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE
Fuel Main,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,OPEN,OPEN
Dome CTRL,CLOSE,CLOSE,CLOSE,OPEN,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE
Ox Upstream,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,OPEN,OPEN
Fuel Main,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,OPEN,OPEN
fuel vent,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,OPEN,CLOSE,CLOSE,OPEN,CLOSE,CLOSE,CLOSE
lox vent,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,OPEN,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE
Ox Upstream,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,OPEN,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,OPEN,OPEN
Fuel Fill Press,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE
High Press Vent,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,OPEN,CLOSE,OPEN,CLOSE,CLOSE,CLOSE,CLOSE
Fuel Fill Vent,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,OPEN,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE
Low Press Vent,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,OPEN,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE
Ox Main,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,OPEN,OPEN
Dome CTRL Vent,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE,OPEN,OPEN,CLOSE,CLOSE,CLOSE,CLOSE,CLOSE
8 changes: 4 additions & 4 deletions daq-server/config/profiles/digital-twin/state_transitions.csv
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ COPV Fill,0,0,1,0,1,0,0,0,0,0,0,0,0,0
Fuel Press,0,0,1,0,0,1,0,0,0,0,0,0,0,0
LOX Press,0,0,1,0,0,0,1,0,0,0,0,0,0,0
Vent,0,0,1,0,0,0,0,1,1,1,1,1,0,0
Dome Vent,0,0,0,0,0,0,0,1,1,0,0,0,0,0
High Press Vent,0,0,0,0,0,0,0,1,0,1,0,0,0,0
Fuel Tank Vent,0,0,0,0,0,0,0,1,0,0,1,0,0,0
Ready,0,0,0,0,0,0,0,0,0,0,0,1,1,1
Dome Vent,0,0,1,0,0,0,0,1,1,0,0,0,0,0
High Press Vent,0,0,1,0,0,0,0,1,0,1,0,0,0,0
Fuel Tank Vent,0,0,1,0,0,0,0,1,0,0,1,0,0,0
Ready,0,0,1,0,0,0,0,0,0,0,0,1,1,1
Fire,0,1,0,0,0,0,0,0,0,0,0,0,1,0
Flow Test,0,0,1,0,0,0,0,0,0,0,0,1,0,1
Loading
Loading