diff --git a/A320-main.xml b/A320-main.xml index 463b6b07..1a06086f 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -1171,6 +1171,8 @@ <bleed-2 type="bool">1</bleed-2> <blower type="bool">0</blower> <cabin-fans type="bool">1</cabin-fans> + <eng1-manstart type="int">0</eng1-manstart> + <eng2-manstart type="int">0</eng2-manstart> <extract type="bool">0</extract> <ground-air type="bool">0</ground-air> <hot-air type="bool">1</hot-air> diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index 1dc8a2c5..5e6e865f 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -445,8 +445,8 @@ <object-name>ExtPwrBtn2O</object-name> <object-name>FuelModeBtn1F</object-name> <object-name>FuelModeBtn2O</object-name> - <object-name>FwdCargoSmkBtn1S</object-name> - <object-name>FwdCargoSmkBtn2D</object-name> + <object-name>FwdCargoSmokeBtn1S</object-name> + <object-name>FwdCargoSmokeBtn2D</object-name> <object-name>GPWSBtn1F</object-name> <object-name>GPWSBtn2O</object-name> <object-name>GPWSFlpBtn1O</object-name> @@ -18686,7 +18686,7 @@ <binding> <command>set-tooltip</command> <tooltip-id>fwddisch-lbl</tooltip-id> - <label>Hold for cargo fire test</label> + <label>Hold 2 sec for cargo fire test</label> </binding> </hovered> </animation> @@ -18794,7 +18794,7 @@ <animation> <type>select</type> - <object-name>FwdCargoSmkBtn1S</object-name> + <object-name>FwdCargoSmokeBtn1S</object-name> <condition> <or> <property>systems/fire/cargo/fwd/warning-active</property> @@ -18816,7 +18816,7 @@ <animation> <type>select</type> - <object-name>FwdCargoSmkBtn2D</object-name> + <object-name>FwdCargoSmokeBtn2D</object-name> <condition> <or> <property>systems/fire/cargo/disch</property> @@ -18839,6 +18839,56 @@ </animation> <!-- Ventilation --> + <animation> + <type>pick</type> + <object-name>VentBlowBtn</object-name> + <object-name>VentBlowBtn1F</object-name> + <object-name>VentBlowBtn2O</object-name> + <action> + <button>0</button> + <repeatable>false</repeatable> + <binding> + <command>property-assign</command> + <property>/controls/cockpit/ventblow-translate</property> + <value>0.00075</value> + </binding> + <mod-up> + <binding> + <command>property-assign</command> + <property>/controls/cockpit/ventblow-translate</property> + <value>0.0</value> + </binding> + </mod-up> + <binding> + <command>nasal</command> + <script>libraries.pushbutton();</script> + </binding> + </action> + <hovered> + <binding> + <command>set-tooltip</command> + <tooltip-id>ventblow-lbl</tooltip-id> + <label>Turn off avionics cooling blower fan (INOP)</label> + </binding> + </hovered> + </animation> + + <animation> + <type>translate</type> + <object-name>VentBlowBtn</object-name> + <object-name>VentBlowBtn1F</object-name> + <object-name>VentBlowBtn2O</object-name> + <property>/controls/cockpit/ventblow-translate</property> + <axis> + <x1-m>-0.013161</x1-m> + <y1-m>0.187244</y1-m> + <z1-m>0.947975</z1-m> + <x2-m>-0.013724</x2-m> + <y2-m>0.187437</y2-m> + <z2-m>0.949416</z2-m> + </axis> + </animation> + <animation> <type>select</type> <object-name>VentBlowBtn1F</object-name> @@ -18849,7 +18899,473 @@ </or> </condition> </animation> + <animation> + <type>pick</type> + <object-name>VentExtractBtn</object-name> + <object-name>VentExtractBtn1F</object-name> + <object-name>VentExtractBtn2O</object-name> + <action> + <button>0</button> + <repeatable>false</repeatable> + <binding> + <command>property-assign</command> + <property>/controls/cockpit/ventextract-translate</property> + <value>0.00075</value> + </binding> + <mod-up> + <binding> + <command>property-assign</command> + <property>/controls/cockpit/ventextract-translate</property> + <value>0.0</value> + </binding> + </mod-up> + <binding> + <command>nasal</command> + <script>libraries.pushbutton();</script> + </binding> + </action> + <hovered> + <binding> + <command>set-tooltip</command> + <tooltip-id>ventblow-lbl</tooltip-id> + <label>Turn off avionics cooling extract fan (INOP)</label> + </binding> + </hovered> + </animation> + <animation> + <type>translate</type> + <object-name>VentExtractBtn</object-name> + <object-name>VentExtractBtn1F</object-name> + <object-name>VentExtractBtn2O</object-name> + <property>/controls/cockpit/ventextract-translate</property> + <axis> + <x1-m>-0.013161</x1-m> + <y1-m>0.187244</y1-m> + <z1-m>0.947975</z1-m> + <x2-m>-0.013724</x2-m> + <y2-m>0.187437</y2-m> + <z2-m>0.949416</z2-m> + </axis> + </animation> + + <animation> + <type>pick</type> + <object-name>CabinFansBtn</object-name> + <object-name>CabinFansBtn2O</object-name> + <action> + <button>0</button> + <repeatable>false</repeatable> + <binding> + <condition> + <greater-than-equals> + <property>systems/electrical/bus/dc-ess</property> + <value>25</value> + </greater-than-equals> + </condition> + <command>property-toggle</command> + <property>controls/pneumatics/switches/cabin-fans</property> + </binding> + <binding> + <command>property-assign</command> + <property>/controls/cockpit/cabinfans-translate</property> + <value>0.00075</value> + </binding> + <mod-up> + <binding> + <command>property-assign</command> + <property>/controls/cockpit/cabinfans-translate</property> + <value>0.0</value> + </binding> + </mod-up> + <binding> + <command>nasal</command> + <script>libraries.pushbutton();</script> + </binding> + </action> + <hovered> + <binding> + <command>set-tooltip</command> + <tooltip-id>cabinfans-lbl</tooltip-id> + <label>Toggle cabin fans</label> + </binding> + </hovered> + </animation> + + <animation> + <type>translate</type> + <object-name>CabinFansBtn</object-name> + <object-name>CabinFansBtn2O</object-name> + <property>/controls/cockpit/cabinfans-translate</property> + <axis> + <x1-m>-0.013161</x1-m> + <y1-m>0.187244</y1-m> + <z1-m>0.947975</z1-m> + <x2-m>-0.013724</x2-m> + <y2-m>0.187437</y2-m> + <z2-m>0.949416</z2-m> + </axis> + </animation> + + <animation> + <type>select</type> + <object-name>CabinFansBtn2O</object-name> + <condition> + <or> + <not><property>controls/pneumatics/switches/cabin-fans</property></not> + <property>controls/switches/annun-test</property> + </or> + </condition> + </animation> + + <!-- Cargo Heat --> + <animation> + <type>pick</type> + <object-name>CargoHotAirBtn</object-name> + <object-name>CargoHotAirBtn1F</object-name> + <object-name>CargoHotAirBtn2O</object-name> + <action> + <button>0</button> + <repeatable>false</repeatable> + <binding> + <command>property-assign</command> + <property>/controls/cockpit/cargo-hotair-translate</property> + <value>0.00075</value> + </binding> + <mod-up> + <binding> + <command>property-assign</command> + <property>/controls/cockpit/cargo-hotair-translate</property> + <value>0.0</value> + </binding> + </mod-up> + <binding> + <command>nasal</command> + <script>libraries.pushbutton();</script> + </binding> + </action> + <hovered> + <binding> + <command>set-tooltip</command> + <tooltip-id>cabinfans-lbl</tooltip-id> + <label>Toggle cargo heat (INOP)</label> + </binding> + </hovered> + </animation> + + <animation> + <type>translate</type> + <object-name>CargoHotAirBtn</object-name> + <object-name>CargoHotAirBtn1F</object-name> + <object-name>CargoHotAirBtn2O</object-name> + <property>/controls/cockpit/cargo-hotair-translate</property> + <axis> + <x1-m>-0.013161</x1-m> + <y1-m>0.187244</y1-m> + <z1-m>0.947975</z1-m> + <x2-m>-0.013724</x2-m> + <y2-m>0.187437</y2-m> + <z2-m>0.949416</z2-m> + </axis> + </animation> + + <animation> + <type>pick</type> + <object-name>AftCargoIsoBtn</object-name> + <object-name>AftCargoIsoBtn1F</object-name> + <object-name>AftCargoIsoBtn2O</object-name> + <action> + <button>0</button> + <repeatable>false</repeatable> + <binding> + <command>property-assign</command> + <property>/controls/cockpit/aft-isol-translate</property> + <value>0.00075</value> + </binding> + <mod-up> + <binding> + <command>property-assign</command> + <property>/controls/cockpit/aft-isol-translate</property> + <value>0.0</value> + </binding> + </mod-up> + <binding> + <command>nasal</command> + <script>libraries.pushbutton();</script> + </binding> + </action> + <hovered> + <binding> + <command>set-tooltip</command> + <tooltip-id>cabinfans-lbl</tooltip-id> + <label>Isolate aft cargo hold (INOP)</label> + </binding> + </hovered> + </animation> + + <animation> + <type>translate</type> + <object-name>AftCargoIsoBtn</object-name> + <object-name>AftCargoIsoBtn1F</object-name> + <object-name>AftCargoIsoBtn2O</object-name> + <property>/controls/cockpit/aft-isol-translate</property> + <axis> + <x1-m>-0.013161</x1-m> + <y1-m>0.187244</y1-m> + <z1-m>0.947975</z1-m> + <x2-m>-0.013724</x2-m> + <y2-m>0.187437</y2-m> + <z2-m>0.949416</z2-m> + </axis> + </animation> + + <!-- Manual Start --> + <animation> + <type>knob</type> + <object-name>Eng1ManStartProt</object-name> + <property>controls/OH/protectors/eng1-manstart-pos</property> + <factor>145</factor> + <axis> + <object-name>Eng1ManStartProt.axis</object-name> + </axis> + <action> + <binding> + <command>property-cycle</command> + <property>controls/OH/protectors/eng1-manstart</property> + <value>0</value> + <value>1</value> + <wrap>false</wrap> + </binding> + <binding> + <command>nasal</command> + <script>setprop("sim/sounde/btn1", 1);</script> + </binding> + </action> + <hovered> + <binding> + <command>set-tooltip</command> + <tooltip-id>eng1guard-lbl</tooltip-id> + <label>Engine 1 man start guard</label> + </binding> + </hovered> + </animation> + + <animation> + <type>knob</type> + <object-name>Eng2ManStartProt</object-name> + <property>controls/OH/protectors/eng2-manstart-pos</property> + <factor>145</factor> + <axis> + <object-name>Eng2ManStartProt.axis</object-name> + </axis> + <action> + <binding> + <command>property-cycle</command> + <property>controls/OH/protectors/eng2-manstart</property> + <value>0</value> + <value>1</value> + <wrap>false</wrap> + </binding> + <binding> + <command>nasal</command> + <script>setprop("sim/sounde/btn1", 1);</script> + </binding> + </action> + <hovered> + <binding> + <command>set-tooltip</command> + <tooltip-id>eng2guard-lbl</tooltip-id> + <label>Engine 2 man start guard</label> + </binding> + </hovered> + </animation> + + <animation> + <type>pick</type> + <object-name>Eng1ManStartBtn</object-name> + <object-name>Eng1ManStartBtn2O</object-name> + <action> + <button>0</button> + <repeatable>false</repeatable> + <binding> + <condition> + <and> + <equals> + <property>controls/OH/protectors/eng1-manstart</property> + <value>1</value> + </equals> + <greater-than-equals> + <property>systems/electrical/bus/dc-ess</property> + <value>25</value> + </greater-than-equals> + </and> + </condition> + <command>property-toggle</command> + <property>controls/engines/engine[0]/man-start</property> + </binding> + <binding> + <condition> + <equals> + <property>controls/OH/protectors/eng1-manstart</property> + <value>1</value> + </equals> + </condition> + <command>nasal</command> + <script>libraries.pushbutton();</script> + </binding> + <binding> + <condition> + <equals> + <property>controls/OH/protectors/eng1-manstart</property> + <value>1</value> + </equals> + </condition> + <command>property-assign</command> + <property>/controls/cockpit/eng1man-translate</property> + <value>0.00075</value> + </binding> + <mod-up> + <binding> + <condition> + <equals> + <property>controls/OH/protectors/eng1-manstart</property> + <value>1</value> + </equals> + </condition> + <command>property-assign</command> + <property>/controls/cockpit/eng1man-translate</property> + <value>0.0</value> + </binding> + </mod-up> + </action> + <hovered> + <binding> + <command>set-tooltip</command> + <tooltip-id>eng1start-lbl</tooltip-id> + <label>Engine 1 manual engine start pushbutton</label> + </binding> + </hovered> + </animation> + + <animation> + <type>pick</type> + <object-name>Eng2ManStartBtn</object-name> + <object-name>Eng2ManStartBtn2O</object-name> + <action> + <button>0</button> + <repeatable>false</repeatable> + <binding> + <condition> + <and> + <equals> + <property>controls/OH/protectors/eng2-manstart</property> + <value>1</value> + </equals> + <greater-than-equals> + <property>systems/electrical/bus/dc-ess</property> + <value>25</value> + </greater-than-equals> + </and> + </condition> + <command>property-toggle</command> + <property>controls/engines/engine[1]/man-start</property> + </binding> + <binding> + <condition> + <equals> + <property>controls/OH/protectors/eng2-manstart</property> + <value>1</value> + </equals> + </condition> + <command>nasal</command> + <script>libraries.pushbutton();</script> + </binding> + <binding> + <condition> + <equals> + <property>controls/OH/protectors/eng2-manstart</property> + <value>1</value> + </equals> + </condition> + <command>property-assign</command> + <property>/controls/cockpit/eng2man-translate</property> + <value>0.00075</value> + </binding> + <mod-up> + <binding> + <condition> + <equals> + <property>controls/OH/protectors/eng2-manstart</property> + <value>1</value> + </equals> + </condition> + <command>property-assign</command> + <property>/controls/cockpit/eng2man-translate</property> + <value>0.0</value> + </binding> + </mod-up> + </action> + <hovered> + <binding> + <command>set-tooltip</command> + <tooltip-id>eng1start-lbl</tooltip-id> + <label>Engine 1 manual engine start pushbutton</label> + </binding> + </hovered> + </animation> + + <animation> + <type>translate</type> + <object-name>Eng1ManStartBtn</object-name> + <object-name>Eng1ManStartBtn2O</object-name> + <property>/controls/cockpit/eng1man-translate</property> + <axis> + <x1-m>-0.013161</x1-m> + <y1-m>0.187244</y1-m> + <z1-m>0.947975</z1-m> + <x2-m>-0.013724</x2-m> + <y2-m>0.187437</y2-m> + <z2-m>0.949416</z2-m> + </axis> + </animation> + + <animation> + <type>translate</type> + <object-name>Eng2ManStartBtn</object-name> + <object-name>Eng2ManStartBtn2O</object-name> + <property>/controls/cockpit/eng2man-translate</property> + <axis> + <x1-m>-0.013161</x1-m> + <y1-m>0.187244</y1-m> + <z1-m>0.947975</z1-m> + <x2-m>-0.013724</x2-m> + <y2-m>0.187437</y2-m> + <z2-m>0.949416</z2-m> + </axis> + </animation> + + <animation> + <type>select</type> + <object-name>Eng1ManStartBtn2O</object-name> + <condition> + <or> + <property>controls/engines/engine[0]/man-start</property> + <property>controls/switches/annun-test</property> + </or> + </condition> + </animation> + + <animation> + <type>select</type> + <object-name>Eng2ManStartBtn2O</object-name> + <condition> + <or> + <property>controls/engines/engine[1]/man-start</property> + <property>controls/switches/annun-test</property> + </or> + </condition> + </animation> + diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml index 18c8afc1..c0e3bfe0 100644 --- a/Models/Instruments/OHpanel/OHpanel.xml +++ b/Models/Instruments/OHpanel/OHpanel.xml @@ -1954,254 +1954,8 @@ - <!-- Cabin Fans --> - <animation> - <name>Cabin Fans Toggle</name> - <type>pick</type> - <object-name>CabinFansBtn</object-name> - <object-name>CabinFansBtn2O</object-name> - <action> - <button>0</button> - <repeatable>false</repeatable> - <binding> - <condition> - <greater-than-equals> - <property>systems/electrical/bus/dc-ess</property> - <value>25</value> - </greater-than-equals> - </condition> - <command>property-toggle</command> - <property>controls/pneumatics/switches/cabin-fans</property> - </binding> - <binding> - <command>nasal</command> - <script>libraries.pushbutton();</script> - </binding> - </action> - </animation> - - <animation> - <type>select</type> - <object-name>CabinFansBtn2O</object-name> - <condition> - <or> - <equals> - <property>controls/pneumatics/switches/cabin-fans</property> - <value>0</value> - </equals> - <property>controls/switches/annun-test</property> - </or> - </condition> - </animation> - - <!-- APU --> - <!-- Manual Start --> - <animation> - <type>pick</type> - <object-name>Eng1ManStartBtn1</object-name> - <object-name>Eng1ManStartBtn2</object-name> - <object-name>Eng1ManStartBtn2O</object-name> - <action> - <button>0</button> - <repeatable>false</repeatable> - <binding> - <condition> - <and> - <equals> - <property>controls/OH/protectors/eng1-manstart</property> - <value>1</value> - </equals> - <greater-than-equals> - <property>systems/electrical/bus/dc-ess</property> - <value>25</value> - </greater-than-equals> - </and> - </condition> - <command>property-toggle</command> - <property>controls/engines/engine[0]/man-start</property> - </binding> - <binding> - <condition> - <equals> - <property>controls/OH/protectors/eng1-manstart</property> - <value>1</value> - </equals> - </condition> - <command>nasal</command> - <script>libraries.pushbutton();</script> - </binding> - <binding> - <condition> - <equals> - <property>controls/OH/protectors/eng1-manstart</property> - <value>1</value> - </equals> - </condition> - <command>property-assign</command> - <property>controls/OH/protectors/eng1-manstart</property> - <value>0</value> - </binding> - </action> - </animation> - - <animation> - <type>pick</type> - <object-name>Eng1ManStartBtn1</object-name> - <object-name>Eng1ManStartBtn2</object-name> - <object-name>Eng1ManStartBtn2O</object-name> - <object-name>Eng1ManStartProt</object-name> - <action> - <button>0</button> - <repeatable>false</repeatable> - <binding> - <command>property-toggle</command> - <property>controls/OH/protectors/eng1-manstart</property> - </binding> - <binding> - <condition> - <not> - <property>controls/OH/protectors/eng1-manstart</property> - </not> - </condition> - <command>nasal</command> - <script>setprop("sim/sounde/oh-cover", 1);</script> - </binding> - </action> - </animation> - - <animation> - <type>rotate</type> - <object-name>Eng1ManStartProt</object-name> - <property>controls/OH/protectors/eng1-manstart</property> - <factor>-145</factor> - <axis> - <x1-m>-0.00641</x1-m> - <y1-m>0.18647</y1-m> - <z1-m>-0.20418</z1-m> - <x2-m>-0.00353</x2-m> - <y2-m>0.20925</y2-m> - <z2-m>-0.20418</z2-m> - </axis> - </animation> - - <animation> - <type>select</type> - <object-name>Eng1ManStartBtn2O</object-name> - <condition> - <or> - <equals> - <property>controls/engines/engine[0]/man-start</property> - <value>1</value> - </equals> - <property>controls/switches/annun-test</property> - </or> - </condition> - </animation> - - <animation> - <type>pick</type> - <object-name>Eng2ManStartBtn1</object-name> - <object-name>Eng2ManStartBtn2</object-name> - <object-name>Eng2ManStartBtn2O</object-name> - <action> - <button>0</button> - <repeatable>false</repeatable> - <binding> - <condition> - <and> - <equals> - <property>controls/OH/protectors/eng2-manstart</property> - <value>1</value> - </equals> - <greater-than-equals> - <property>systems/electrical/bus/dc-ess</property> - <value>25</value> - </greater-than-equals> - </and> - </condition> - <command>property-toggle</command> - <property>controls/engines/engine[1]/man-start</property> - </binding> - <binding> - <condition> - <equals> - <property>controls/OH/protectors/eng2-manstart</property> - <value>1</value> - </equals> - </condition> - <command>nasal</command> - <script>libraries.pushbutton();</script> - </binding> - <binding> - <condition> - <equals> - <property>controls/OH/protectors/eng2-manstart</property> - <value>1</value> - </equals> - </condition> - <command>property-assign</command> - <property>controls/OH/protectors/eng2-manstart</property> - <value>0</value> - </binding> - </action> - </animation> - - <animation> - <type>pick</type> - <object-name>Eng2ManStartBtn1</object-name> - <object-name>Eng2ManStartBtn2</object-name> - <object-name>Eng2ManStartBtn2O</object-name> - <object-name>Eng2ManStartProt</object-name> - <action> - <button>0</button> - <repeatable>false</repeatable> - <binding> - <command>property-toggle</command> - <property>controls/OH/protectors/eng2-manstart</property> - </binding> - <binding> - <condition> - <not> - <property>controls/OH/protectors/eng2-manstart</property> - </not> - </condition> - <command>nasal</command> - <script>setprop("sim/sounde/oh-cover", 1);</script> - </binding> - </action> - </animation> - - <animation> - <type>rotate</type> - <object-name>Eng2ManStartProt</object-name> - <property>controls/OH/protectors/eng2-manstart</property> - <factor>-145</factor> - <axis> - <x1-m>-0.00226</x1-m> - <y1-m>0.21793</y1-m> - <z1-m>-0.20418</z1-m> - <x2-m>0.00062</x2-m> - <y2-m>0.24071</y2-m> - <z2-m>-0.20418</z2-m> - </axis> - </animation> - - <animation> - <type>select</type> - <object-name>Eng2ManStartBtn2O</object-name> - <condition> - <or> - <equals> - <property>controls/engines/engine[1]/man-start</property> - <value>1</value> - </equals> - <property>controls/switches/annun-test</property> - </or> - </condition> - </animation> - diff --git a/Systems/a320-cockpit.xml b/Systems/a320-cockpit.xml index 5a36a0a8..aa330349 100644 --- a/Systems/a320-cockpit.xml +++ b/Systems/a320-cockpit.xml @@ -444,6 +444,16 @@ <input>/controls/OH/protectors/elecratman</input> <c1>20</c1> </lag_filter> + + <lag_filter name="/controls/OH/protectors/eng1-manstart-pos"> + <input>/controls/OH/protectors/eng1-manstart</input> + <c1>20</c1> + </lag_filter> + + <lag_filter name="/controls/OH/protectors/eng2-manstart-pos"> + <input>/controls/OH/protectors/eng2-manstart</input> + <c1>20</c1> + </lag_filter> </channel>