From 74362dbf16cd1c41d1ddb23fe3e0dd575e0d5e9d Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Thu, 27 Jul 2017 10:21:37 -0400
Subject: [PATCH] A3XX: Bugfix Overhead
---
Models/Instruments/OHpanel/OHpanel.xml | 211 ++++++++++++++++------
Models/Instruments/OHpanel/res/ohpanel.ac | 16 +-
2 files changed, 160 insertions(+), 67 deletions(-)
diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index d794ed11..1ce8080c 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -177,7 +177,6 @@
<!-- These are not simulated yet, so they only illuminate when the test is on. Remove once you simulate these buttons. -JD -->
<animation>
<type>select</type>
- <object-name>CrewOxyBtn2O</object-name>
<object-name>EmerCallBtn1C</object-name>
<object-name>EmerCallBtn2O</object-name>
<object-name>EmerElecManOnBtn2O</object-name>
@@ -187,7 +186,6 @@
<object-name>Gen1LineBtn1S</object-name>
<object-name>Gen1LineBtn2O</object-name>
<object-name>MaskManOnBtn2O</object-name>
- <object-name>PassOxyInd1S</object-name>
<object-name>RcdrGndCtlBtn2O</object-name>
<condition>
<equals>
@@ -5978,6 +5976,18 @@
<button>0</button>
<repeatable>false</repeatable>
<binding>
+ <condition>
+ <or>
+ <greater-than-equals>
+ <property>systems/electrical/bus/dc1</property>
+ <value>25</value>
+ </greater-than-equals>
+ <greater-than-equals>
+ <property>systems/electrical/bus/dc2</property>
+ <value>25</value>
+ </greater-than-equals>
+ </or>
+ </condition>
<command>nasal</command>
<script>libraries.CVR_test();</script>
</binding>
@@ -5991,6 +6001,18 @@
<button>0</button>
<repeatable>false</repeatable>
<binding>
+ <condition>
+ <or>
+ <greater-than-equals>
+ <property>systems/electrical/bus/dc1</property>
+ <value>25</value>
+ </greater-than-equals>
+ <greater-than-equals>
+ <property>systems/electrical/bus/dc2</property>
+ <value>25</value>
+ </greater-than-equals>
+ </or>
+ </condition>
<command>nasal</command>
<script>libraries.MechCall();</script>
</binding>
@@ -6004,6 +6026,18 @@
<button>0</button>
<repeatable>false</repeatable>
<binding>
+ <condition>
+ <or>
+ <greater-than-equals>
+ <property>systems/electrical/bus/dc1</property>
+ <value>25</value>
+ </greater-than-equals>
+ <greater-than-equals>
+ <property>systems/electrical/bus/dc2</property>
+ <value>25</value>
+ </greater-than-equals>
+ </or>
+ </condition>
<command>nasal</command>
<script>libraries.CabinCall();</script>
</binding>
@@ -6017,8 +6051,20 @@
<button>0</button>
<repeatable>false</repeatable>
<binding>
+ <condition>
+ <or>
+ <greater-than-equals>
+ <property>systems/electrical/bus/dc1</property>
+ <value>25</value>
+ </greater-than-equals>
+ <greater-than-equals>
+ <property>systems/electrical/bus/dc2</property>
+ <value>25</value>
+ </greater-than-equals>
+ </or>
+ </condition>
<command>property-toggle</command>
- <property>/controls/switches/LrainRpt</property>
+ <property>controls/switches/LrainRpt</property>
</binding>
<binding>
<command>nasal</command>
@@ -6034,8 +6080,20 @@
<button>0</button>
<repeatable>false</repeatable>
<binding>
+ <condition>
+ <or>
+ <greater-than-equals>
+ <property>systems/electrical/bus/dc1</property>
+ <value>25</value>
+ </greater-than-equals>
+ <greater-than-equals>
+ <property>systems/electrical/bus/dc2</property>
+ <value>25</value>
+ </greater-than-equals>
+ </or>
+ </condition>
<command>property-toggle</command>
- <property>/controls/switches/RrainRpt</property>
+ <property>controls/switches/RrainRpt</property>
</binding>
<binding>
<command>nasal</command>
@@ -6047,7 +6105,7 @@
<animation>
<type>rotate</type>
<object-name>LeftWiperKnb</object-name>
- <property>/controls/switches/wiperLspd</property>
+ <property>controls/switches/wiperLspd</property>
<interpolation>
<entry><ind>-1</ind><dep>-50</dep></entry>
<entry><ind>0</ind><dep>0</dep></entry>
@@ -6072,7 +6130,7 @@
<repeatable>false</repeatable>
<binding>
<command>property-cycle</command>
- <property>/controls/switches/wiperLspd</property>
+ <property>controls/switches/wiperLspd</property>
<value>-1</value>
<value>0</value>
<value>1</value>
@@ -6084,7 +6142,7 @@
<animation>
<type>rotate</type>
<object-name>RightWiperKnb</object-name>
- <property>/controls/switches/wiperLspd</property>
+ <property>controls/switches/wiperLspd</property>
<interpolation>
<entry><ind>-1</ind><dep>-50</dep></entry>
<entry><ind>0</ind><dep>0</dep></entry>
@@ -6109,7 +6167,7 @@
<repeatable>false</repeatable>
<binding>
<command>property-cycle</command>
- <property>/controls/switches/wiperRspd</property>
+ <property>controls/switches/wiperRspd</property>
<value>-1</value>
<value>0</value>
<value>1</value>
@@ -6118,26 +6176,75 @@
</action>
</animation>
- <animation>
- <type>select</type>
- <object-name>PassOxyInd1S</object-name>
- <condition>
- <equals>
- <property>/controls/oxygen/masksSys</property>
- <value>1</value>
- </equals>
- </condition>
- </animation>
-
<animation>
<type>pick</type>
+ <object-name>PassOxyInd</object-name>
<object-name>PassOxyInd1S</object-name>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
+ <condition>
+ <or>
+ <greater-than-equals>
+ <property>systems/electrical/bus/dc1</property>
+ <value>25</value>
+ </greater-than-equals>
+ <greater-than-equals>
+ <property>systems/electrical/bus/dc2</property>
+ <value>25</value>
+ </greater-than-equals>
+ </or>
+ </condition>
<command>property-toggle</command>
- <property>/controls/oxygen/masksSys</property>
+ <property>controls/oxygen/masksSys</property>
+ </binding>
+ <binding>
+ <command>nasal</command>
+ <script>setprop("/sim/sounde/oh-btn", 1);</script>
+ </binding>
+ </action>
+ </animation>
+
+ <animation>
+ <type>select</type>
+ <object-name>PassOxyInd1S</object-name>
+ <condition>
+ <or>
+ <equals>
+ <property>controls/oxygen/masksSys</property>
+ <value>1</value>
+ </equals>
+ <equals>
+ <property>controls/switches/annun-test</property>
+ <value>1</value>
+ </equals>
+ </or>
+ </condition>
+ </animation>
+
+ <animation>
+ <type>pick</type>
+ <object-name>CrewOxyBtn</object-name>
+ <object-name>CrewOxyBtn2O</object-name>
+ <action>
+ <button>0</button>
+ <repeatable>false</repeatable>
+ <binding>
+ <condition>
+ <or>
+ <greater-than-equals>
+ <property>systems/electrical/bus/dc1</property>
+ <value>25</value>
+ </greater-than-equals>
+ <greater-than-equals>
+ <property>systems/electrical/bus/dc2</property>
+ <value>25</value>
+ </greater-than-equals>
+ </or>
+ </condition>
+ <command>property-toggle</command>
+ <property>controls/oxygen/crewOxyPB</property>
</binding>
<binding>
<command>nasal</command>
@@ -6150,48 +6257,19 @@
<type>select</type>
<object-name>CrewOxyBtn2O</object-name>
<condition>
- <equals>
- <property>/controls/oxygen/crewOxyPB</property>
- <value>1</value>
- </equals>
+ <or>
+ <equals>
+ <property>controls/oxygen/crewOxyPB</property>
+ <value>0</value>
+ </equals>
+ <equals>
+ <property>controls/switches/annun-test</property>
+ <value>1</value>
+ </equals>
+ </or>
</condition>
</animation>
- <animation>
- <type>pick</type>
- <object-name>CrewOxyBtn2O</object-name>
- <action>
- <button>0</button>
- <repeatable>false</repeatable>
- <binding>
- <command>property-toggle</command>
- <property>/controls/oxygen/crewOxyPB</property>
- </binding>
- <binding>
- <command>nasal</command>
- <script>setprop("/sim/sounde/oh-btn", 1);</script>
- </binding>
- </action>
- </animation>
-
- <animation>
- <type>rotate</type>
- <object-name>MaskManOnGaurd</object-name>
- <property>/controls/OH/protectors/maskman</property>
- <interpolation>
- <entry><ind>0</ind><dep>0</dep></entry>
- <entry><ind>1</ind><dep>90</dep></entry>
- </interpolation>
- <axis>
- <x1-m>0.00375</x1-m>
- <y1-m>-0.27338</y1-m>
- <z1-m>-0.15783</z1-m>
- <x2-m>0.00228</x2-m>
- <y2-m>-0.26147</y2-m>
- <z2-m>-0.15783</z2-m>
- </axis>
- </animation>
-
<animation>
<type>pick</type>
<object-name>MaskManOnGaurd</object-name>
@@ -6216,4 +6294,19 @@
</action>
</animation>
+ <animation>
+ <type>rotate</type>
+ <object-name>MaskManOnGaurd</object-name>
+ <property>controls/OH/protectors/maskman</property>
+ <factor>-145</factor>
+ <axis>
+ <x1-m>0.00513</x1-m>
+ <y1-m>-0.27292</y1-m>
+ <z1-m>-0.15783</z1-m>
+ <x2-m>0.00374</x2-m>
+ <y2-m>-0.26161</y2-m>
+ <z2-m>-0.15783</z2-m>
+ </axis>
+ </animation>
+
</PropertyList>
\ No newline at end of file
diff --git a/Models/Instruments/OHpanel/res/ohpanel.ac b/Models/Instruments/OHpanel/res/ohpanel.ac
index c2e4641f..0469d088 100644
--- a/Models/Instruments/OHpanel/res/ohpanel.ac
+++ b/Models/Instruments/OHpanel/res/ohpanel.ac
@@ -8,7 +8,7 @@ MATERIAL "OHPanelOnBat" rgb 0.8 0.8 0.8 amb 1 1 1 emis 1 1 1 spec 0.5 0.5 0.5
MATERIAL "Switch" rgb 0.678431 0.678431 0.678431 amb 0.678431 0.678431 0.678431 emis 0 0 0 spec 0 0 0 shi 32 trans 0.004
MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 128 trans 0
MATERIAL "DefaultWhite.002" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.0015 0.0015 0.0015 shi 50 trans 0
-MATERIAL "RedGuard" rgb 0.8 0 0 amb 1 1 1 emis 1 1 1 spec 0.5 0.5 0.5 shi 12 trans 0
+MATERIAL "ac3dmat1" rgb 0.501961 0.501961 0.501961 amb 0.501961 0.501961 0.501961 emis 0 0 0 spec 0 0 0 shi 0 trans 0
OBJECT world
kids 321
OBJECT group
@@ -17133,8 +17133,8 @@ refs 4
7 0.5 1
kids 0
OBJECT poly
-name "MaskManOnGaurd"
-loc -0.00236803 -0.0441595 0.202375
+name "EmerManOnGaurd"
+loc -0.00221982 -0.0441595 0.202375
texture "redguard.png"
crease 35.000000
numvert 92
@@ -17956,7 +17956,7 @@ refs 4
kids 0
OBJECT poly
name "EmerElecManOnBtn2O"
-loc 7.98515e-005 -0.112692 -0.000865825
+loc 0.000228064 -0.112692 -0.000865825
data 8
Cube.135
texture "buttons4.png"
@@ -18002,7 +18002,7 @@ refs 4
kids 0
OBJECT poly
name "EmerGenTestGaurd"
-loc 0.00863326 -0.0442504 0.292258
+loc 0.00869153 -0.0442504 0.292258
texture "redguard.png"
crease 35.000000
numvert 92
@@ -19018,7 +19018,7 @@ refs 3
kids 0
OBJECT poly
name "MaskManOnGaurd"
-loc 0.00553581 -0.174035 0.267115
+loc 0.00568402 -0.174035 0.267115
texture "redguard.png"
crease 35.000000
numvert 92
@@ -19840,7 +19840,7 @@ refs 4
kids 0
OBJECT poly
name "MaskManOnBtn2O"
-loc 0.00798369 -0.242567 0.063875
+loc 0.0081319 -0.242567 0.063875
data 8
Cube.135
texture "buttons4.png"
@@ -58643,7 +58643,7 @@ refs 4
kids 0
OBJECT poly
name "GPWSFlp3Btn2O"
-loc -0.00150635 -0.15875 -0.0139293
+loc -0.00151277 -0.15875 -0.0139293
data 8
Cube.135
texture "buttons4.png"