A320 wipers, fix view positions more
This commit is contained in:
legoboyvdlp R
parent
1e45adf409
commit
bfa4aca7fe
5 changed files with 186 additions and 32 deletions
|
|
@ -960,6 +960,8 @@
|
|||
<landing-lights-r type="float">0.0</landing-lights-r>
|
||||
<LrainRpt type="bool">0</LrainRpt>
|
||||
<RrainRpt type="bool">0</RrainRpt>
|
||||
<wiperLspd type="int">0</wiperLspd>
|
||||
<wiperRspd type="int">0</wiperRspd>
|
||||
<emerCallLtO type="bool">0</emerCallLtO>
|
||||
<emerCallLtC type="bool">0</emerCallLtC>
|
||||
<cabinCall type="bool">0</cabinCall>
|
||||
|
|
|
|||
|
|
@ -2916,4 +2916,36 @@
|
|||
</axis>
|
||||
</animation>
|
||||
|
||||
|
||||
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>WindshildWiperL</object-name>
|
||||
<property>/fdm/jsbsim/fcs/left-wiper-pos-norm</property>
|
||||
<factor>-45</factor>
|
||||
<axis>
|
||||
<x1-m>-17.4353</x1-m>
|
||||
<y1-m>-0.119353</y1-m>
|
||||
<z1-m>0.290889</z1-m>
|
||||
<x2-m>-17.4268</x2-m>
|
||||
<y2-m>-0.115183</y2-m>
|
||||
<z2-m>0.282531</z2-m>
|
||||
</axis>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>WindshieldWiperR</object-name>
|
||||
<property>/fdm/jsbsim/fcs/right-wiper-pos-norm</property>
|
||||
<factor>45</factor>
|
||||
<axis>
|
||||
<x1-m>-17.4335</x1-m>
|
||||
<y1-m>0.119445</y1-m>
|
||||
<z1-m>0.29116</z1-m>
|
||||
<x2-m>-17.4249</x2-m>
|
||||
<y2-m>0.115275</y2-m>
|
||||
<z2-m>0.282805</z2-m>
|
||||
</axis>
|
||||
</animation>
|
||||
|
||||
</PropertyList>
|
||||
|
|
|
|||
|
|
@ -7242,23 +7242,22 @@
|
|||
</action>
|
||||
</animation>
|
||||
|
||||
<!--animation>
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>LeftWiperKnb</object-name>
|
||||
<property>controls/switches/wiperLspd</property>
|
||||
<interpolation>
|
||||
<entry><ind>-1</ind><dep>-50</dep></entry>
|
||||
<entry><ind>0</ind><dep>0</dep></entry>
|
||||
<entry><ind>1</ind><dep>50</dep></entry>
|
||||
<entry><ind>2</ind><dep>100</dep></entry>
|
||||
<entry><ind>1</ind><dep>-60</dep></entry>
|
||||
<entry><ind>2</ind><dep>-110</dep></entry>
|
||||
</interpolation>
|
||||
<axis>
|
||||
<x1-m>0.00608</x1-m>
|
||||
<y1-m>-0.21485</y1-m>
|
||||
<z1-m>-0.26721</z1-m>
|
||||
<x2-m>0.00095</x2-m>
|
||||
<y2-m>-0.21591</y2-m>
|
||||
<z2-m>-0.26721</z2-m>
|
||||
<x1-m>-0.003475</x1-m>
|
||||
<y1-m>-0.216042</y1-m>
|
||||
<z1-m>-0.267275</z1-m>
|
||||
<x2-m>-0.002396</x2-m>
|
||||
<y2-m>-0.215907</y2-m>
|
||||
<z2-m>-0.267275</z2-m>
|
||||
</axis>
|
||||
</animation>
|
||||
|
||||
|
|
@ -7267,14 +7266,26 @@
|
|||
<object-name>LeftWiperKnb</object-name>
|
||||
<action>
|
||||
<button>0</button>
|
||||
<button>3</button>
|
||||
<repeatable>false</repeatable>
|
||||
<binding>
|
||||
<command>property-cycle</command>
|
||||
<command>property-adjust</command>
|
||||
<property>controls/switches/wiperLspd</property>
|
||||
<value>-1</value>
|
||||
<value>0</value>
|
||||
<value>1</value>
|
||||
<value>2</value>
|
||||
<step>1</step>
|
||||
<min>0</min>
|
||||
<max>2</max>
|
||||
</binding>
|
||||
</action>
|
||||
<action>
|
||||
<button>1</button>
|
||||
<button>4</button>
|
||||
<repeatable>false</repeatable>
|
||||
<binding>
|
||||
<command>property-adjust</command>
|
||||
<property>controls/switches/wiperLspd</property>
|
||||
<step>-1</step>
|
||||
<min>0</min>
|
||||
<max>2</max>
|
||||
</binding>
|
||||
</action>
|
||||
</animation>
|
||||
|
|
@ -7284,18 +7295,17 @@
|
|||
<object-name>RightWiperKnb</object-name>
|
||||
<property>controls/switches/wiperRspd</property>
|
||||
<interpolation>
|
||||
<entry><ind>-1</ind><dep>-50</dep></entry>
|
||||
<entry><ind>0</ind><dep>0</dep></entry>
|
||||
<entry><ind>1</ind><dep>50</dep></entry>
|
||||
<entry><ind>2</ind><dep>100</dep></entry>
|
||||
<entry><ind>1</ind><dep>-60</dep></entry>
|
||||
<entry><ind>2</ind><dep>-110</dep></entry>
|
||||
</interpolation>
|
||||
<axis>
|
||||
<x1-m>0.00608</x1-m>
|
||||
<y1-m>-0.21485</y1-m>
|
||||
<z1-m>-0.26721</z1-m>
|
||||
<x2-m>0.00095</x2-m>
|
||||
<y2-m>-0.21591</y2-m>
|
||||
<z2-m>-0.26721</z2-m>
|
||||
<x1-m>-0.003475</x1-m>
|
||||
<y1-m>0.216042</y1-m>
|
||||
<z1-m>-0.267275</z1-m>
|
||||
<x2-m>-0.002396</x2-m>
|
||||
<y2-m>0.215907</y2-m>
|
||||
<z2-m>-0.267275</z2-m>
|
||||
</axis>
|
||||
</animation>
|
||||
|
||||
|
|
@ -7304,17 +7314,29 @@
|
|||
<object-name>RightWiperKnb</object-name>
|
||||
<action>
|
||||
<button>0</button>
|
||||
<button>3</button>
|
||||
<repeatable>false</repeatable>
|
||||
<binding>
|
||||
<command>property-cycle</command>
|
||||
<command>property-adjust</command>
|
||||
<property>controls/switches/wiperRspd</property>
|
||||
<value>-1</value>
|
||||
<value>0</value>
|
||||
<value>1</value>
|
||||
<value>2</value>
|
||||
<step>1</step>
|
||||
<min>0</min>
|
||||
<max>2</max>
|
||||
</binding>
|
||||
</action>
|
||||
</animation-->
|
||||
<action>
|
||||
<button>1</button>
|
||||
<button>4</button>
|
||||
<repeatable>false</repeatable>
|
||||
<binding>
|
||||
<command>property-adjust</command>
|
||||
<property>controls/switches/wiperRspd</property>
|
||||
<step>-1</step>
|
||||
<min>0</min>
|
||||
<max>2</max>
|
||||
</binding>
|
||||
</action>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>pick</type>
|
||||
|
|
|
|||
|
|
@ -24,8 +24,8 @@ var resetView = func() {
|
|||
interpolate("sim/current-view/pitch-offset-deg", -14.6, 0.66);
|
||||
interpolate("sim/current-view/roll-offset-deg", 0, 0.66);
|
||||
interpolate("sim/current-view/x-offset-m", -0.45, 0.66);
|
||||
interpolate("sim/current-view/y-offset-m", 2.34, 0.66);
|
||||
interpolate("sim/current-view/z-offset-m", -13.75, 0.66);
|
||||
interpolate("sim/current-view/y-offset-m", 0.545, 0.66);
|
||||
interpolate("sim/current-view/z-offset-m", -16.193, 0.66);
|
||||
|
||||
if (_shakeFlag) {
|
||||
setprop("/sim/rendering/headshake/enabled", 1);
|
||||
|
|
|
|||
|
|
@ -1174,5 +1174,103 @@
|
|||
</switch>
|
||||
|
||||
</channel>
|
||||
|
||||
<channel name="Wipers">
|
||||
|
||||
<switch name="fcs/left-wiper-cmd">
|
||||
<default value="0"/>
|
||||
<test logic="AND" value="0">
|
||||
fcs/left-wiper-pos-norm gt 0.001
|
||||
fcs/left-wiper-has-been-1 eq 1
|
||||
</test>
|
||||
<test logic="AND" value="1">
|
||||
fcs/left-wiper-has-been-1 eq 0
|
||||
/controls/switches/wiperLspd ne 0
|
||||
</test>
|
||||
</switch>
|
||||
|
||||
<switch name="fcs/left-wiper-has-been-1">
|
||||
<default value="0"/>
|
||||
<test value="0">
|
||||
fcs/left-wiper-pos-norm le 0.001
|
||||
</test>
|
||||
<test value="1">
|
||||
fcs/left-wiper-has-been-1 eq 1
|
||||
</test>
|
||||
<test value="1">
|
||||
fcs/left-wiper-pos-norm ge 0.999
|
||||
</test>
|
||||
</switch>
|
||||
|
||||
<switch name="fcs/left-wiper-speed">
|
||||
<default value="0"/>
|
||||
<test logic="AND" value="fcs/left-wiper-speed">
|
||||
/controls/switches/wiperLspd eq 0
|
||||
fcs/left-wiper-pos-norm ge 0.001
|
||||
/systems/electrical/bus/dc-1 ge 25
|
||||
</test>
|
||||
<test logic="AND" value="4">
|
||||
/controls/switches/wiperLspd eq 1
|
||||
/systems/electrical/bus/dc-1 ge 25
|
||||
</test>
|
||||
<test logic="AND" value="7">
|
||||
/controls/switches/wiperLspd eq 2
|
||||
/systems/electrical/bus/dc-1 ge 25
|
||||
</test>
|
||||
</switch>
|
||||
|
||||
<actuator name="fcs/left-wiper-pos-norm">
|
||||
<input>fcs/left-wiper-cmd</input>
|
||||
<rate_limit>fcs/left-wiper-speed</rate_limit>
|
||||
</actuator>
|
||||
|
||||
<switch name="fcs/right-wiper-cmd">
|
||||
<default value="0"/>
|
||||
<test logic="AND" value="0">
|
||||
fcs/right-wiper-pos-norm gt 0.001
|
||||
fcs/right-wiper-has-been-1 eq 1
|
||||
</test>
|
||||
<test logic="AND" value="1">
|
||||
fcs/right-wiper-has-been-1 eq 0
|
||||
/controls/switches/wiperRspd ne 0
|
||||
</test>
|
||||
</switch>
|
||||
|
||||
<switch name="fcs/right-wiper-has-been-1">
|
||||
<default value="0"/>
|
||||
<test value="0">
|
||||
fcs/right-wiper-pos-norm le 0.001
|
||||
</test>
|
||||
<test value="1">
|
||||
fcs/right-wiper-has-been-1 eq 1
|
||||
</test>
|
||||
<test value="1">
|
||||
fcs/right-wiper-pos-norm ge 0.999
|
||||
</test>
|
||||
</switch>
|
||||
|
||||
<switch name="fcs/right-wiper-speed">
|
||||
<default value="0"/>
|
||||
<test logic="AND" value="fcs/right-wiper-speed">
|
||||
/controls/switches/wiperRspd eq 0
|
||||
fcs/right-wiper-pos-norm ge 0.001
|
||||
/systems/electrical/bus/dc-2 ge 25
|
||||
</test>
|
||||
<test logic="AND" value="4">
|
||||
/controls/switches/wiperRspd eq 1
|
||||
/systems/electrical/bus/dc-2 ge 25
|
||||
</test>
|
||||
<test logic="AND" value="7">
|
||||
/controls/switches/wiperRspd eq 2
|
||||
/systems/electrical/bus/dc-2 ge 25
|
||||
</test>
|
||||
</switch>
|
||||
|
||||
<actuator name="fcs/right-wiper-pos-norm">
|
||||
<input>fcs/right-wiper-cmd</input>
|
||||
<rate_limit>fcs/right-wiper-speed</rate_limit>
|
||||
</actuator>
|
||||
|
||||
</channel>
|
||||
|
||||
</system>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue