[fbw] feat(bleed): Ground air start (#8240)

Horizon-Simulations · Dec 28, 2023 · c2bf8b7 · c2bf8b7
1 parent 61d5d3d
commit c2bf8b7
Show file tree

Hide file tree

Showing 99 changed files with 1,761 additions and 773 deletions.
diff --git a/...src/base/lvfr-horizonsim-airbus-a318-ceo/SimObjects/Airplanes/A318ceoCFM/flight_model.cfg b/...src/base/lvfr-horizonsim-airbus-a318-ceo/SimObjects/Airplanes/A318ceoCFM/flight_model.cfg
@@ -143,8 +143,8 @@ Junction.2 = Name:APUJunction#OutputOnlyLines:JuncAPUToAPUPump
 Junction.3 = Name:RightJunction#InputOnlyLines:PumpRight1ToJuncRight,PumpRight2ToJuncRight#OutputOnlyLines:JuncRightToEngValveRight
 Junction.4 = Name:CenterTransferJunctionL#InputOnlyLines:CenterXferDisableValveLToCenterXferJunctionL#OutputOnlyLines:CenterXferJunctionLToAutoCenterXferValveL,CenterXferJunctionLToLeftInner#Option:CenterXferJunctionLToAutoCenterXferValveL#Option:CenterXferJunctionLToLeftInner
 Junction.5 = Name:CenterTransferJunctionR#InputOnlyLines:CenterXferDisableValveRToCenterXferJunctionR#OutputOnlyLines:CenterXferJunctionRToAutoCenterXferValveR,CenterXferJunctionRToRightInner#Option:CenterXferJunctionRToAutoCenterXferValveR#Option:CenterXferJunctionRToRightInner
-Valve.1 = Name:LeftEngineValve#OpeningTime:3#Circuit:1
-Valve.2 = Name:RightEngineValve#OpeningTime:3#Circuit:2
+Valve.1 = Name:LeftEngineValve#OpeningTime:1.7#Circuit:1
+Valve.2 = Name:RightEngineValve#OpeningTime:1.7#Circuit:2
 Valve.3 = Name:CrossFeedValve#OpeningTime:3#Circuit:3
 Valve.4 = Name:LeftTransferValve2#Circuit:4
 Valve.5 = Name:RightTransferValve2#Circuit:5

diff --git a/.../src/base/lvfr-horizonsim-airbus-a318-ceo/SimObjects/Airplanes/A318cjCFM/flight_model.cfg b/.../src/base/lvfr-horizonsim-airbus-a318-ceo/SimObjects/Airplanes/A318cjCFM/flight_model.cfg
@@ -144,8 +144,8 @@ Junction.2 = Name:APUJunction#OutputOnlyLines:JuncAPUToAPUPump
 Junction.3 = Name:RightJunction#InputOnlyLines:PumpRight1ToJuncRight,PumpRight2ToJuncRight#OutputOnlyLines:JuncRightToEngValveRight
 Junction.4 = Name:CenterTransferJunctionL#InputOnlyLines:CenterXferDisableValveLToCenterXferJunctionL#OutputOnlyLines:CenterXferJunctionLToAutoCenterXferValveL,CenterXferJunctionLToLeftInner#Option:CenterXferJunctionLToAutoCenterXferValveL#Option:CenterXferJunctionLToLeftInner
 Junction.5 = Name:CenterTransferJunctionR#InputOnlyLines:CenterXferDisableValveRToCenterXferJunctionR#OutputOnlyLines:CenterXferJunctionRToAutoCenterXferValveR,CenterXferJunctionRToRightInner#Option:CenterXferJunctionRToAutoCenterXferValveR#Option:CenterXferJunctionRToRightInner
-Valve.1 = Name:LeftEngineValve#OpeningTime:3#Circuit:1
-Valve.2 = Name:RightEngineValve#OpeningTime:3#Circuit:2
+Valve.1 = Name:LeftEngineValve#OpeningTime:1.7#Circuit:1
+Valve.2 = Name:RightEngineValve#OpeningTime:1.7#Circuit:2
 Valve.3 = Name:CrossFeedValve#OpeningTime:3#Circuit:3
 Valve.4 = Name:LeftTransferValve2#Circuit:4
 Valve.5 = Name:RightTransferValve2#Circuit:5

diff --git a/...ages/VCockpit/Instruments/Airliners/lvfr-horizonsim-airbus-a318-ceo/CDU/A320_Neo_CDU.html b/...ages/VCockpit/Instruments/Airliners/lvfr-horizonsim-airbus-a318-ceo/CDU/A320_Neo_CDU.html
@@ -170,7 +170,6 @@
 <script type="text/html" import-script="/Pages/A318HS_Core/A32NX_SoundManager.js"></script>
 <script type="text/html" import-script="/Pages/A318HS_Core/A32NX_BaroSelector.js"></script>
 <script type="text/html" import-script="/Pages/A318HS_Core/A32NX_ADIRS.js"></script>
-<script type="text/html" import-script="/Pages/A318HS_Core/A32NX_APU.js"></script>
 <script type="text/html" import-script="/Pages/A318HS_Core/A32NX_BrakeTemp.js"></script>
 <script type="text/html" import-script="/Pages/A318HS_Core/A32NX_Refuel.js"></script>
 <script type="text/html" import-script="/Pages/A318HS_Core/A32NX_DMC.js"></script>

diff --git a/hsim-a318ceo/src/behavior/src/A32NX_Interior_Misc.xml b/hsim-a318ceo/src/behavior/src/A32NX_Interior_Misc.xml
@@ -319,28 +319,15 @@
             <ANIMTIP_1>TT:COCKPIT.TOOLTIPS.ENGINE#ID#_MASTER_TURN_OFF</ANIMTIP_1>
         </DefaultTemplateParameters>
         <Component ID="#NODE_ID#" Node="#NODE_ID#">
-            <Update Frequency="5">
-                (* This Update Ensures that the state of some simvars that are linked to the same button is consistent. *)
-                (A:FUELSYSTEM VALVE SWITCH:#VALVE_ID#, Bool) sp1
-                (A:GENERAL ENG STARTER:#ID#, Bool) l1 != if{
-                    (&gt;K:TOGGLE_STARTER#ID#)
-                }
-            </Update>
             <UseTemplate Name="ASOBO_GT_Switch_Code">
                 <ANIM_CODE>
                     (A:FUELSYSTEM VALVE SWITCH:#VALVE_ID#, Bool) 100 *
                 </ANIM_CODE>
                 <LEFT_SINGLE_CODE>
                     (A:FUELSYSTEM VALVE SWITCH:#VALVE_ID#, Bool) if{
                         #VALVE_ID# (&gt;K:FUELSYSTEM_VALVE_CLOSE)
-                        (A:GENERAL ENG STARTER:#ID#, Bool) if{
-                            (&gt;K:TOGGLE_STARTER#ID#)
-                        }
                     } els{
                         #VALVE_ID# (&gt;K:FUELSYSTEM_VALVE_OPEN)
-                        (A:GENERAL ENG STARTER:#ID#, Bool) ! if{
-                            (&gt;K:TOGGLE_STARTER#ID#)
-                        }
                     }
                 </LEFT_SINGLE_CODE>
             </UseTemplate>
@@ -736,4 +723,42 @@ if groundCtl and !groundControlPermissives {
             </UseTemplate>
         </Component>
     </Template>
+
+    <Template Name="FBW_REAR_SEAT">
+        <DefaultTemplateParameters>
+            <NODE_ID>#NODE_ID#</NODE_ID>
+            <ANIM_NAME>#NODE_ID#</ANIM_NAME>
+            <CURSOR>Grab</CURSOR>
+
+            <ANIM_LENGTH>100</ANIM_LENGTH>
+            <ANIM_DURATION>100</ANIM_DURATION>
+            <LEFT_SINGLE_CODE/>
+            <LEFT_LEAVE_CODE/>
+            <ANIM_LAG>50</ANIM_LAG>
+
+            <TOGGLE_VAR>L:A32NX_#NODE_ID#</TOGGLE_VAR>
+        </DefaultTemplateParameters>
+        <Component ID="#NODE_ID#_MOUSE" Node="#NODE_ID#_MOUSE">
+            <UseTemplate Name = "ASOBO_GT_Anim">
+                <NODE_ID>#NODE_ID#</NODE_ID>
+                <ANIM_NAME>#NODE_ID#</ANIM_NAME>
+                <ANIM_CODE>(#TOGGLE_VAR#) 100 *</ANIM_CODE>
+            </UseTemplate>
+
+            <UseTemplate Name = "ASOBO_GT_Interaction_LeftSingle_Leave_Code">
+                <NODE_ID>#NODE_ID#_MOUSE</NODE_ID>
+                <ANIM_NAME>#NODE_ID#_MOUSE</ANIM_NAME>
+                <LEFT_SINGLE_CODE>
+                    (#TOGGLE_VAR#) ! (&gt;#TOGGLE_VAR#) #LEFT_SINGLE_CODE#
+                </LEFT_SINGLE_CODE>
+                <LEFT_LEAVE_CODE />
+                <HIGHLIGHT_NODE_ID>#NODE_ID#</HIGHLIGHT_NODE_ID>
+            </UseTemplate>
+
+            <UseTemplate Name="ASOBO_GT_AnimTriggers_SoundEvent">
+                <ANIM_NAME>#NODE_ID#</ANIM_NAME>
+                <WWISE_EVENT>rear_seat_slide</WWISE_EVENT>
+            </UseTemplate>
+        </Component>
+    </Template>
 </ModelBehaviors>
diff --git a/hsim-a318ceo/src/wasm/fadec_a318cfm/CMakeLists.txt b/hsim-a318ceo/src/wasm/fadec_a318cfm/CMakeLists.txt
@@ -17,6 +17,7 @@ include_directories(
         ./src
         ${FBW_ROOT}/fbw-common/src/wasm/fadec_common/src
         ${FBW_ROOT}/fbw-common/src/wasm/fbw_common/src
+        ${FBW_ROOT}/fbw-common/src/wasm/fbw_common/src/inih
 )
 
 add_executable(flybywire-a32nx-fadec

diff --git a/hsim-a318ceo/src/wasm/fadec_a318cfm/build.sh b/hsim-a318ceo/src/wasm/fadec_a318cfm/build.sh
@@ -43,7 +43,9 @@ clang++ \
   -I "${COMMON_DIR}/fadec_common/src" \
   -I "${COMMON_DIR}/fbw_common/src/inih" \
   -I "${DIR}/common" \
-  "${DIR}/src/FadecGauge.cpp"
+  "${DIR}/src/FadecGauge.cpp" \
+  "${DIR}/src/Arinc429.cpp" \
+  "${DIR}/src/Arinc429Utils.cpp"
 
 # restore directory
 popd

diff --git a/hsim-a318ceo/src/wasm/fadec_a318cfm/src/Arinc429.cpp b/hsim-a318ceo/src/wasm/fadec_a318cfm/src/Arinc429.cpp
@@ -0,0 +1 @@
+#include "../../fbw_a320/src/Arinc429.cpp"
diff --git a/hsim-a318ceo/src/wasm/fadec_a318cfm/src/Arinc429.h b/hsim-a318ceo/src/wasm/fadec_a318cfm/src/Arinc429.h
@@ -0,0 +1 @@
+#include "../../fbw_a320/src/Arinc429.h"
diff --git a/hsim-a318ceo/src/wasm/fadec_a318cfm/src/Arinc429Utils.cpp b/hsim-a318ceo/src/wasm/fadec_a318cfm/src/Arinc429Utils.cpp
@@ -0,0 +1 @@
+#include "../../fbw_a320/src/Arinc429Utils.cpp"
diff --git a/hsim-a318ceo/src/wasm/fadec_a318cfm/src/Arinc429Utils.h b/hsim-a318ceo/src/wasm/fadec_a318cfm/src/Arinc429Utils.h
@@ -0,0 +1 @@
+#include "../../fbw_a320/src/Arinc429Utils.h"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		#include "../../fbw_a320/src/Arinc429Utils.cpp"