Merge pull request #48 from Marsdolphin/master

Bring CDU back to life, and make CDU and Switches onto MP
This commit is contained in:
Sidi Liang 2020-02-21 20:40:47 +08:00 committed by GitHub
commit 7c1004905b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 14 deletions

View File

@ -914,7 +914,7 @@
<model>
<condition>
<equals>
<property>systems/instruments/enable_switches</property>
<property>sim/multiplay/generic/int[15]</property>
<value>1</value>
</equals>
</condition>
@ -930,7 +930,7 @@
<model>
<condition>
<equals>
<property>systems/instruments/enable_switches</property>
<property>sim/multiplay/generic/int[15]</property>
<value>1</value>
</equals>
</condition>
@ -946,7 +946,7 @@
<model>
<condition>
<equals>
<property>systems/instruments/enable_switches</property>
<property>sim/multiplay/generic/int[15]</property>
<value>1</value>
</equals>
</condition>
@ -962,7 +962,7 @@
<model>
<condition>
<equals>
<property>systems/instruments/enable_switches</property>
<property>sim/multiplay/generic/int[15]</property>
<value>1</value>
</equals>
</condition>
@ -979,16 +979,16 @@
<model>
<condition>
<equals>
<property>systems/instruments/enable_cdu</property>
<property>sim/multiplay/generic/int[14]</property>
<value>1</value>
</equals>
</condition>
<path>Aircraft/followme_e-tron/Models/Instruments/CDU/boeing.xml</path>
<offsets>
<x-m>1.65</x-m>
<y-m>-0.00</y-m>
<z-m>0.70</z-m>
<pitch-deg>-87</pitch-deg>
<x-m>1.35</x-m>
<y-m>0.25</y-m>
<z-m>0.9</z-m>
<pitch-deg>-4</pitch-deg>
</offsets>
</model>
<!-- Accelerator -->

View File

@ -500,6 +500,8 @@
<int n="11" alias="/controls/direction"/>
<int n="12" alias="/systems/codriver-enable"/>
<int n="13" alias="/interior/enable_mug"/>
<int n="14" alias="systems/instruments/enable_cdu"/>
<int n="15" alias="systems/instruments/enable_switches"/>
<float n="0" alias="/controls/doors/rearright/position-norm"/>
<float n="1" alias="/controls/doors/rearleft/position-norm"/>

View File

@ -420,24 +420,23 @@
<checkbox>
<halign>left</halign>
<label> Enable Switches</label>
<property>systems/instruments/enable_switches</property>
<property>sim/multiplay/generic/int[15]</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<!-- Disable CDU for now, need reposition -->
<!--
<checkbox>
<halign>left</halign>
<label> Enable CDU</label>
<property>systems/instruments/enable_cdu</property>
<property>sim/multiplay/generic/int[14]</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
-->
<checkbox>
<halign>left</halign>
<label> Enable Mug</label>