Skip to content

Commit

Permalink
fix(a380x): Various fuel system fixes (flybywiresim#9045)
Browse files Browse the repository at this point in the history 
* Delete fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/flight_model.cfg

* Delete fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/Climb.flt

* Delete fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/approach.FLT

* Delete fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/apron.FLT

* Delete fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/cruise.FLT

* Delete fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/final.FLT

* Delete fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/runway.FLT

* Delete fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/hangar.flt

* Delete fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/systems.cfg

* Delete fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/taxi.flt

* Add files via upload

* Update Climb.flt

* Update approach.FLT

* Update apron.FLT

* Update cruise.FLT

* Update final.FLT

* Update hangar.flt

* Update runway.FLT

* Update taxi.flt

* Update flight_model.cfg

* Update apron.FLT

* Update hangar.flt

* Update runway.FLT

* Update taxi.flt

* Update systems.cfg

* Update systems.cfg

* Update systems.cfg

* Update flight_model.cfg

* Update flight_model.cfg

* Update flight_model.cfg

* Update flight_model.cfg

* Update flight_model.cfg

* Update flight_model.cfg

* Update flight_model.cfg

* Update SD page

* Delete fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/flight_model.cfg

* Add files via upload

* Delete fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/flight_model.cfg

* Add files via upload

* Update flight_model.cfg

* Update flight_model.cfg

* Turned all Triggers to manual and implemented first version of trigger logic

* Fixed cg check using wrong units and added trigger reset on refuel

* Attempted to sync empty triggers with fueltank state + added logging

* Update approach.FLT

* Update Climb.flt

* Update apron.FLT

* Update cruise.FLT

* Update final.FLT

* Update hangar.flt

* Update runway.FLT

* Update taxi.flt

* Update flight_model.cfg

* Update flight_model.cfg

* Update flight_model.cfg

* Update flight_model.cfg

* Update flight_model.cfg

* fix junction index

* Fixed typos in the Valve definitions

* Update flight_model.cfg

* Implemented the trim tank transfer fixes from @dontsim

* Fix leftover check

* fixed oversight and typo and fixed issue with the fuel page

* remove logging

* added varable cgtarget during flight

* fixed typo again

* made constants static

* added enhanced logging

* fix condition for junction 10 options

---------

Co-authored-by: BBK <[email protected]>
Co-authored-by: Maximilian Reuter <[email protected]>
  • Loading branch information
@donstim @BlueberryKing @Maximilian-Reuter
3 people authored Oct 19, 2024
1 parent 398d284 commit e6aaaf8
Show file tree
Hide file tree
Showing 15 changed files with 868 additions and 236 deletions.
6 changes: 4 additions & 2 deletions ...0x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/Climb.flt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ Valve.46=False
Valve.47=False
Valve.48=False
Valve.49=False
Valve.50=True
Valve.51=True
Valve.50=False
Valve.51=False
Valve.52=False
Valve.53=False
Valve.54=False
Expand All @@ -182,6 +182,7 @@ Valve.56=False
Valve.57=False
Valve.58=False
Valve.59=False
Valve.60=False
Pump.1=True
Pump.2=True
Pump.3=True
Expand Down Expand Up @@ -217,6 +218,7 @@ Tank.11=0.55189013481140136719
Junction.7=1
Junction.8=1
Junction.9=1
Junction.10=1

[Systems.0]
BatterySwitch=True
Expand Down
6 changes: 4 additions & 2 deletions ...src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/approach.FLT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ Valve.46=False
Valve.47=False
Valve.48=False
Valve.49=False
Valve.50=True
Valve.51=True
Valve.50=False
Valve.51=False
Valve.52=False
Valve.53=False
Valve.54=False
Expand All @@ -182,6 +182,7 @@ Valve.56=False
Valve.57=False
Valve.58=False
Valve.59=False
Valve.60=False
Pump.1=True
Pump.2=True
Pump.3=True
Expand All @@ -206,6 +207,7 @@ Pump.21=False
Junction.7=1
Junction.8=1
Junction.9=1
Junction.10=1

[Systems.0]
BatterySwitch=True
Expand Down
2 changes: 2 additions & 0 deletions ...0x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/apron.FLT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ Valve.56=False
Valve.57=False
Valve.58=False
Valve.59=False
Valve.60=False
Pump.1=True
Pump.2=True
Pump.3=True
Expand All @@ -207,6 +208,7 @@ Pump.21=False
Junction.7=1
Junction.8=1
Junction.9=1
Junction.10=1

[Systems.0]
BatterySwitch=True
Expand Down
7 changes: 5 additions & 2 deletions ...x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/cruise.FLT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ Valve.46=False
Valve.47=False
Valve.48=False
Valve.49=False
Valve.50=True
Valve.51=True
Valve.50=False
Valve.51=False
Valve.52=False
Valve.53=False
Valve.54=False
Expand All @@ -182,6 +182,8 @@ Valve.56=False
Valve.57=False
Valve.58=False
Valve.59=False
Valve.60=False

Pump.1=True
Pump.2=True
Pump.3=True
Expand Down Expand Up @@ -217,6 +219,7 @@ Tank.11=0.55189013481140136719
Junction.7=1
Junction.8=1
Junction.9=1
Junction.10=1

[Systems.0]
BatterySwitch=True
Expand Down
2 changes: 2 additions & 0 deletions ...0x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/final.FLT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ Valve.56=False
Valve.57=False
Valve.58=False
Valve.59=False
Valve.60=False
Pump.1=True
Pump.2=True
Pump.3=True
Expand Down Expand Up @@ -216,6 +217,7 @@ Tank.11=0
Junction.7=1
Junction.8=1
Junction.9=1
Junction.10=1

[Systems.0]
BatterySwitch=True
Expand Down
393 changes: 230 additions & 163 deletions ...base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/flight_model.cfg
100755 → 100644
View file

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions ...x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/hangar.flt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ Valve.56=False
Valve.57=False
Valve.58=False
Valve.59=False
Valve.60=False
Pump.1=True
Pump.2=True
Pump.3=True
Expand All @@ -201,6 +202,7 @@ Pump.21=False
Junction.7=1
Junction.8=1
Junction.9=1
Junction.10=1

[Systems.0]
BatterySwitch=False
Expand Down
28 changes: 15 additions & 13 deletions ...x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/runway.FLT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ Valve.56=False
Valve.57=False
Valve.58=False
Valve.59=False
Valve.60=False
Pump.1=True
Pump.2=True
Pump.3=True
Expand All @@ -199,19 +200,19 @@ Pump.5=True
Pump.6=True
Pump.7=True
Pump.8=True
Pump.9=True
Pump.10=True
Pump.11=True
Pump.12=True
Pump.13=True
Pump.14=True
Pump.15=True
Pump.16=True
Pump.17=True
Pump.18=True
Pump.19=True
Pump.20=True
Pump.21=True
Pump.9=False
Pump.10=False
Pump.11=False
Pump.12=False
Pump.13=False
Pump.14=False
Pump.15=False
Pump.16=False
Pump.17=False
Pump.18=False
Pump.19=False
Pump.20=False
Pump.21=False
Tank.1=0.4818560183048248291
Tank.2=0.74762970209121704102
Tank.3=0
Expand All @@ -226,6 +227,7 @@ Tank.11=0.55189013481140136719
Junction.7=1
Junction.8=1
Junction.9=1
Junction.10=1

[Systems.0]
BatterySwitch=True
Expand Down
14 changes: 8 additions & 6 deletions .../src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/systems.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -489,15 +489,15 @@ circuit.114 = Type:CIRCUIT_FUEL_VALVE:33#Connections:bus.1#Power:3, 5, 20.0#Name
circuit.115 = Type:CIRCUIT_FUEL_VALVE:34#Connections:bus.1#Power:3, 5, 20.0#Name:Right_Inner_Aft_Xfer_Valve1 ; Fuel Valves 5W
circuit.116 = Type:CIRCUIT_FUEL_VALVE:35#Connections:bus.1#Power:3, 5, 20.0#Name:Right_Mid_Aft_Xfer_Valve1 ; Fuel Valves 5W
circuit.117 = Type:CIRCUIT_FUEL_VALVE:36#Connections:bus.1#Power:3, 5, 20.0#Name:Right_Outer_Aft_Xfer_Valve1 ; Fuel Valves 5W
circuit.118 = Type:CIRCUIT_FUEL_VALVE:37#Connections:bus.1#Power:3, 5, 20.0#Name:Left_Inner_Fwd_Xfer_Valve2 ; Fuel Valves 5W
circuit.119 = Type:CIRCUIT_FUEL_VALVE:38#Connections:bus.1#Power:3, 5, 20.0#Name:Left_Mid_Fwd_Xfer_Valve2 ; Fuel Valves 5W
circuit.118 = Type:CIRCUIT_FUEL_VALVE:37#Connections:bus.1#Power:3, 5, 20.0#Name:Left_Inner_Aft_Xfer_Valve2 ; Fuel Valves 5W
circuit.119 = Type:CIRCUIT_FUEL_VALVE:38#Connections:bus.1#Power:3, 5, 20.0#Name:Left_Mid_Aft_Xfer_Valve2 ; Fuel Valves 5W
circuit.120 = Type:CIRCUIT_FUEL_VALVE:39#Connections:bus.1#Power:3, 5, 20.0#Name:Left_Outer_Aft_Xfer_Valve2 ; Fuel Valves 5W
circuit.121 = Type:CIRCUIT_FUEL_VALVE:40#Connections:bus.1#Power:3, 5, 20.0#Name:Right_Inner_Aft_Xfer_Valve2 ; Fuel Valves 5W
circuit.122 = Type:CIRCUIT_FUEL_VALVE:41#Connections:bus.1#Power:3, 5, 20.0#Name:Right_Mid_Aft_Xfer_Valve2 ; Fuel Valves 5W
circuit.123 = Type:CIRCUIT_FUEL_VALVE:42#Connections:bus.1#Power:3, 5, 20.0#Name:Right_Outer_Aft_Xfer_Valve2 ; Fuel Valves 5W
circuit.124 = Type:CIRCUIT_FUEL_VALVE:43#Connections:bus.1#Power:3, 5, 20.0#Name:Trim_Inlet_Valve ; Fuel Valves 5W
circuit.124 = Type:CIRCUIT_FUEL_VALVE:43#Connections:bus.1#Power:3, 5, 20.0#Name:Trim_Inlet_Valve 1; Fuel Valves 5W
circuit.125 = Type:CIRCUIT_FUEL_VALVE:44#Connections:bus.1#Power:3, 5, 20.0#Name:Trim_Line_Iso_Valve_Fwd ; Fuel Valves 5W
circuit.126 = Type:CIRCUIT_FUEL_VALVE:45#Connections:bus.1#Power:3, 5, 20.0#Name:Trim_Line_Iso_Valve_Aft ; Fuel Valves 5W
circuit.126 = Type:CIRCUIT_FUEL_VALVE:45#Connections:bus.1#Power:3, 5, 20.0#Name:Trim_Line_Iso_Valve_Aft_1 ; Fuel Valves 5W ; re-purposed
circuit.127 = Type:CIRCUIT_FUEL_VALVE:46#Connections:bus.1#Power:3, 5, 20.0#Name:Crossfeed_Valve_1 ; Fuel Valves 5W
circuit.128 = Type:CIRCUIT_FUEL_VALVE:47#Connections:bus.1#Power:3, 5, 20.0#Name:Crossfeed_Valve_2 ; Fuel Valves 5W
circuit.129 = Type:CIRCUIT_FUEL_VALVE:48#Connections:bus.1#Power:3, 5, 20.0#Name:Crossfeed_Valve_3 ; Fuel Valves 5W
Expand All @@ -514,8 +514,10 @@ circuit.139 = Type:CIRCUIT_FUEL_VALVE:58#Connections:bus.1#Power:3, 5, 20.0#Name
circuit.140 = Type:CIRCUIT_XML:16#Connections:bus.12#Power:3, 5, 20.0#Name:HotBatteryCircuit ; Hot Battery Circuit 5W
circuit.141 = Type:CIRCUIT_XML:17#Connections:bus.8#Power:3, 5, 20.0#Name:WipersLeft ; Wipers 5W
circuit.142 = Type:CIRCUIT_AVIONICS#Connections:bus.10#Power:0.5,1,20.0#Name:Avionics ; Avionics
circuit.143 = Type:CIRCUIT_XML:18#Connections:bus.9#Power:3, 5, 20.0#Name:WipersRight ; Wipers 5W

circuit.143 = Type:CIRCUIT_XML:18#Connections:bus.9#Power:3, 5, 20.0#Name:WipersRIght ; Wipers 5W
circuit.144 = Type:CIRCUIT_FUEL_VALVE:59#Connections:bus.1#Power:3, 5, 20.0#Name:Trim_Line_Iso_Valve_Aft_2 ; Fuel Valves 5W ; new
circuit.145 = Type:CIRCUIT_FUEL_VALVE:60#Connections:bus.1#Power:3, 5, 20.0#Name:Trim_Inlet_Valve 2; Fuel Valves 5W ; new
; Below circuits are not being used. Would need to be re-indexed
;; Standby Instrument ISIS (panel.xml)
;circuit.125 = Type:CIRCUIT_SAI:1#Connections:bus.1#Power:25, 30, 20.0#Name:SAI_1 ; Standby Indicator
;
Expand Down
2 changes: 2 additions & 0 deletions ...80x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/taxi.flt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ Valve.56=False
Valve.57=False
Valve.58=False
Valve.59=False
Valve.60=False
Pump.1=True
Pump.2=True
Pump.3=True
Expand All @@ -203,6 +204,7 @@ Pump.21=False
Junction.7=1
Junction.8=1
Junction.9=1
Junction.10=1

[Systems.0]
BatterySwitch=True
Expand Down
Loading

0 comments on commit e6aaaf8

Please sign in to comment.