Merge pull request #40 from legoboyvdlp/master

quality mcdu
This commit is contained in:
Joshua Davidson 2017-05-26 13:51:50 -04:00 committed by GitHub
commit f42ced8031
12 changed files with 494 additions and 8 deletions

View file

@ -837,6 +837,10 @@
<object-name>initreq</object-name>
<object-name>requeststar</object-name>
<object-name>request</object-name>
<object-name>fltnumbox</object-name>
<object-name>coroutebox</object-name>
<object-name>cruisetempbox</object-name>
<object-name>costindexbox</object-name>
<object-name>fromtobox</object-name>
<diffuse>
<red>1</red>

View file

@ -0,0 +1,3 @@
AC3Db
OBJECT world
kids 0

View file

@ -0,0 +1,189 @@
<?xml version="1.0"?>
<!--
##################################################################
# A3XX mCDU by Joshua Davidson (it0uchpods) and Jonathan Redpath #
##################################################################
-->
<PropertyList>
<path>EMPTY.ac</path>
<text>
<name>page</name>
<offsets>
<x-m>-0.001</x-m>
<y-m>0.0</y-m>
<z-m>0.083</z-m>
</offsets>
<alignment>center-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
<type type="string">text-value</type>
<format type="string">MCDU MENU</format>
<truncate type="bool">false</truncate>
<font type="string">BoeingCDU-Large.ttf</font>
<property>autopilot/serviceable</property>
<draw-text type="bool">true</draw-text>
<draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox type="bool">false</draw-boundingbox>
<character-size>0.0050</character-size>
<font-resolution>
<width type="int">64</width>
<height type="int">64</height>
</font-resolution>
</text>
<text>
<name>fmgctext</name>
<offsets>
<x-m>-0.001</x-m>
<y-m>-0.045</y-m>
<z-m>0.0725</z-m>
</offsets>
<alignment>left-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
<type type="string">text-value</type>
<format type="string">&lt;FMGC</format>
<truncate type="bool">false</truncate>
<font type="string">BoeingCDU-Large.ttf</font>
<property>autopilot/serviceable</property>
<draw-text type="bool">true</draw-text>
<draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox type="bool">false</draw-boundingbox>
<character-size>0.0050</character-size>
<font-resolution>
<width type="int">64</width>
<height type="int">64</height>
</font-resolution>
</text>
<text>
<name>acarstext</name>
<offsets>
<x-m>-0.001</x-m>
<y-m>-0.045</y-m>
<z-m>0.0605</z-m>
</offsets>
<alignment>left-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
<type type="string">text-value</type>
<format type="string">&lt;ACARS</format>
<truncate type="bool">false</truncate>
<font type="string">BoeingCDU-Large.ttf</font>
<property>autopilot/serviceable</property>
<draw-text type="bool">true</draw-text>
<draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox type="bool">false</draw-boundingbox>
<character-size>0.0050</character-size>
<font-resolution>
<width type="int">64</width>
<height type="int">64</height>
</font-resolution>
</text>
<text>
<name>aidstext</name>
<offsets>
<x-m>-0.001</x-m>
<y-m>-0.045</y-m>
<z-m>0.0505</z-m>
</offsets>
<alignment>left-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
<type type="string">text-value</type>
<format type="string">&lt;AIDS</format>
<truncate type="bool">false</truncate>
<font type="string">BoeingCDU-Large.ttf</font>
<property>autopilot/serviceable</property>
<draw-text type="bool">true</draw-text>
<draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox type="bool">false</draw-boundingbox>
<character-size>0.0050</character-size>
<font-resolution>
<width type="int">64</width>
<height type="int">64</height>
</font-resolution>
</text>
<text>
<name>cfdstext</name>
<offsets>
<x-m>-0.001</x-m>
<y-m>-0.045</y-m>
<z-m>0.029</z-m>
</offsets>
<alignment>left-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
<type type="string">text-value</type>
<format type="string">&lt;CFDS</format>
<truncate type="bool">false</truncate>
<font type="string">BoeingCDU-Large.ttf</font>
<property>autopilot/serviceable</property>
<draw-text type="bool">true</draw-text>
<draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox type="bool">false</draw-boundingbox>
<character-size>0.0050</character-size>
<font-resolution>
<width type="int">64</width>
<height type="int">64</height>
</font-resolution>
</text>
<text>
<name>return</name>
<offsets>
<x-m>-0.001</x-m>
<y-m>0.043</y-m>
<z-m>0.0190</z-m>
</offsets>
<alignment>right-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
<type type="string">text-value</type>
<format type="string">RETURN&gt;</format>
<truncate type="bool">false</truncate>
<font type="string">BoeingCDU-Large.ttf</font>
<property>autopilot/serviceable</property>
<draw-text type="bool">true</draw-text>
<draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox type="bool">false</draw-boundingbox>
<character-size>0.0050</character-size>
<font-resolution>
<width type="int">64</width>
<height type="int">64</height>
</font-resolution>
</text>
<!-- Colors -->
<!-- White -->
<animation>
<type>material</type>
<object-name>page</object-name>
<object-name>aidstext</object-name>
<object-name>fmgctext</object-name>
<object-name>acarstext</object-name>
<object-name>cfdstext</object-name>
<object-name>return</object-name>
<diffuse>
<red>1</red>
<green>1</green>
<blue>1</blue>
</diffuse>
<ambient>
<red>0</red>
<green>0</green>
<blue>0</blue>
</ambient>
<specular>
<red>0</red>
<green>0</green>
<blue>0</blue>
</specular>
<emission>
<red>1</red>
<green>1</green>
<blue>1</blue>
</emission>
</animation>
</PropertyList>

View file

@ -202,6 +202,28 @@
</condition>
</model>
<model>
<name>MCDU</name>
<path>MCDU/MCDU.xml</path>
<offsets>
<heading-deg>180</heading-deg>
<roll-deg>180</roll-deg>
<pitch-deg>90</pitch-deg>
</offsets>
<condition>
<and>
<greater-than-equals>
<property>/systems/electrical/bus/ac1</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>/MCDU[0]/page</property>
<value>MCDU</value>
</equals>
</and>
</condition>
</model>
<animation>
<type>pick</type>
<object-name>init</object-name>
@ -240,6 +262,25 @@
</action>
</animation>
<animation>
<type>pick</type>
<object-name>mcdu</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<binding>
<command>nasal</command>
<script>mcdu1.pagebutton("mcdu");</script>
<condition>
<greater-than-equals>
<property>/systems/electrical/bus/ac1</property>
<value>25</value>
</greater-than-equals>
</condition>
</binding>
</action>
</animation>
<animation>
<type>pick</type>
<object-name>perf</object-name>

View file

@ -62,7 +62,7 @@
<offsets>
<x-m>-0.001</x-m>
<y-m>-0.043</y-m>
<z-m>0.0715</z-m>
<z-m>0.0705</z-m>
</offsets>
<alignment>left-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
@ -144,7 +144,7 @@
<draw-text type="bool">true</draw-text>
<draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox type="bool">false</draw-boundingbox>
<character-size>0.0055</character-size>
<character-size>0.0045</character-size>
<font-resolution>
<width type="int">64</width>
<height type="int">64</height>
@ -178,13 +178,13 @@
<name>seconddata2</name>
<offsets>
<x-m>-0.001</x-m>
<y-m>-0.040</y-m>
<y-m>-0.0455</y-m>
<z-m>0.0505</z-m>
</offsets>
<alignment>left-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
<type type="string">text-value</type>
<format type="string">29JAN-26FEB</format>
<format type="string">&lt;-29JAN-26FEB</format>
<truncate type="bool">false</truncate>
<font type="string">BoeingCDU-Large.ttf</font>
<property>autopilot/serviceable</property>

View file

@ -837,6 +837,10 @@
<object-name>initreq</object-name>
<object-name>requeststar</object-name>
<object-name>request</object-name>
<object-name>fltnumbox</object-name>
<object-name>coroutebox</object-name>
<object-name>cruisetempbox</object-name>
<object-name>costindexbox</object-name>
<object-name>fromtobox</object-name>
<diffuse>
<red>1</red>

View file

@ -0,0 +1,3 @@
AC3Db
OBJECT world
kids 0

View file

@ -0,0 +1,189 @@
<?xml version="1.0"?>
<!--
##################################################################
# A3XX mCDU by Joshua Davidson (it0uchpods) and Jonathan Redpath #
##################################################################
-->
<PropertyList>
<path>EMPTY.ac</path>
<text>
<name>page</name>
<offsets>
<x-m>-0.001</x-m>
<y-m>0.0</y-m>
<z-m>0.083</z-m>
</offsets>
<alignment>center-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
<type type="string">text-value</type>
<format type="string">MCDU MENU</format>
<truncate type="bool">false</truncate>
<font type="string">BoeingCDU-Large.ttf</font>
<property>autopilot/serviceable</property>
<draw-text type="bool">true</draw-text>
<draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox type="bool">false</draw-boundingbox>
<character-size>0.0050</character-size>
<font-resolution>
<width type="int">64</width>
<height type="int">64</height>
</font-resolution>
</text>
<text>
<name>fmgctext</name>
<offsets>
<x-m>-0.001</x-m>
<y-m>-0.045</y-m>
<z-m>0.0725</z-m>
</offsets>
<alignment>left-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
<type type="string">text-value</type>
<format type="string">&lt;FMGC</format>
<truncate type="bool">false</truncate>
<font type="string">BoeingCDU-Large.ttf</font>
<property>autopilot/serviceable</property>
<draw-text type="bool">true</draw-text>
<draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox type="bool">false</draw-boundingbox>
<character-size>0.0050</character-size>
<font-resolution>
<width type="int">64</width>
<height type="int">64</height>
</font-resolution>
</text>
<text>
<name>acarstext</name>
<offsets>
<x-m>-0.001</x-m>
<y-m>-0.045</y-m>
<z-m>0.0605</z-m>
</offsets>
<alignment>left-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
<type type="string">text-value</type>
<format type="string">&lt;ACARS</format>
<truncate type="bool">false</truncate>
<font type="string">BoeingCDU-Large.ttf</font>
<property>autopilot/serviceable</property>
<draw-text type="bool">true</draw-text>
<draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox type="bool">false</draw-boundingbox>
<character-size>0.0050</character-size>
<font-resolution>
<width type="int">64</width>
<height type="int">64</height>
</font-resolution>
</text>
<text>
<name>aidstext</name>
<offsets>
<x-m>-0.001</x-m>
<y-m>-0.045</y-m>
<z-m>0.0505</z-m>
</offsets>
<alignment>left-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
<type type="string">text-value</type>
<format type="string">&lt;AIDS</format>
<truncate type="bool">false</truncate>
<font type="string">BoeingCDU-Large.ttf</font>
<property>autopilot/serviceable</property>
<draw-text type="bool">true</draw-text>
<draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox type="bool">false</draw-boundingbox>
<character-size>0.0050</character-size>
<font-resolution>
<width type="int">64</width>
<height type="int">64</height>
</font-resolution>
</text>
<text>
<name>cfdstext</name>
<offsets>
<x-m>-0.001</x-m>
<y-m>-0.045</y-m>
<z-m>0.029</z-m>
</offsets>
<alignment>left-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
<type type="string">text-value</type>
<format type="string">&lt;CFDS</format>
<truncate type="bool">false</truncate>
<font type="string">BoeingCDU-Large.ttf</font>
<property>autopilot/serviceable</property>
<draw-text type="bool">true</draw-text>
<draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox type="bool">false</draw-boundingbox>
<character-size>0.0050</character-size>
<font-resolution>
<width type="int">64</width>
<height type="int">64</height>
</font-resolution>
</text>
<text>
<name>return</name>
<offsets>
<x-m>-0.001</x-m>
<y-m>0.043</y-m>
<z-m>0.0190</z-m>
</offsets>
<alignment>right-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
<type type="string">text-value</type>
<format type="string">RETURN&gt;</format>
<truncate type="bool">false</truncate>
<font type="string">BoeingCDU-Large.ttf</font>
<property>autopilot/serviceable</property>
<draw-text type="bool">true</draw-text>
<draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox type="bool">false</draw-boundingbox>
<character-size>0.0050</character-size>
<font-resolution>
<width type="int">64</width>
<height type="int">64</height>
</font-resolution>
</text>
<!-- Colors -->
<!-- White -->
<animation>
<type>material</type>
<object-name>page</object-name>
<object-name>aidstext</object-name>
<object-name>fmgctext</object-name>
<object-name>acarstext</object-name>
<object-name>cfdstext</object-name>
<object-name>return</object-name>
<diffuse>
<red>1</red>
<green>1</green>
<blue>1</blue>
</diffuse>
<ambient>
<red>0</red>
<green>0</green>
<blue>0</blue>
</ambient>
<specular>
<red>0</red>
<green>0</green>
<blue>0</blue>
</specular>
<emission>
<red>1</red>
<green>1</green>
<blue>1</blue>
</emission>
</animation>
</PropertyList>

View file

@ -202,6 +202,28 @@
</condition>
</model>
<model>
<name>MCDU</name>
<path>MCDU/MCDU.xml</path>
<offsets>
<heading-deg>180</heading-deg>
<roll-deg>180</roll-deg>
<pitch-deg>90</pitch-deg>
</offsets>
<condition>
<and>
<greater-than-equals>
<property>/systems/electrical/bus/ac2</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>/MCDU[1]/page</property>
<value>MCDU</value>
</equals>
</and>
</condition>
</model>
<animation>
<type>pick</type>
<object-name>init</object-name>
@ -240,6 +262,25 @@
</action>
</animation>
<animation>
<type>pick</type>
<object-name>mcdu</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<binding>
<command>nasal</command>
<script>mcdu2.pagebutton("mcdu");</script>
<condition>
<greater-than-equals>
<property>/systems/electrical/bus/ac2</property>
<value>25</value>
</greater-than-equals>
</condition>
</binding>
</action>
</animation>
<animation>
<type>pick</type>
<object-name>perf</object-name>

View file

@ -62,7 +62,7 @@
<offsets>
<x-m>-0.001</x-m>
<y-m>-0.043</y-m>
<z-m>0.0715</z-m>
<z-m>0.0705</z-m>
</offsets>
<alignment>left-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
@ -144,7 +144,7 @@
<draw-text type="bool">true</draw-text>
<draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox type="bool">false</draw-boundingbox>
<character-size>0.0055</character-size>
<character-size>0.0045</character-size>
<font-resolution>
<width type="int">64</width>
<height type="int">64</height>
@ -178,13 +178,13 @@
<name>seconddata2</name>
<offsets>
<x-m>-0.001</x-m>
<y-m>-0.040</y-m>
<y-m>-0.0455</y-m>
<z-m>0.0505</z-m>
</offsets>
<alignment>left-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
<type type="string">text-value</type>
<format type="string">29JAN-26FEB</format>
<format type="string">&lt;-29JAN-26FEB</format>
<truncate type="bool">false</truncate>
<font type="string">BoeingCDU-Large.ttf</font>
<property>autopilot/serviceable</property>

View file

@ -446,11 +446,17 @@ var pagebutton = func(btn) {
if (btn == "perf") {
if (getprop("/FMGC/status/phase") == 0 or getprop("/FMGC/status/phase") == 1) {
setprop("/MCDU[0]/page", "TO");
} else if (getprop("/FMGC/status/phase") == 2) {
setprop("/MCDU[0]/page", "CLB");
} else if (getprop("/FMGC/status/phase") == 3) {
setprop("/MCDU[0]/page", "CRZ");
}
} else if (btn == "init") {
setprop("/MCDU[0]/page", "INITA");
} else if (btn == "data") {
setprop("/MCDU[0]/page", "DATA");
} else if (btn == "mcdu") {
setprop("/MCDU[0]/page", "MCDU");
}
}

View file

@ -446,11 +446,17 @@ var pagebutton = func(btn) {
if (btn == "perf") {
if (getprop("/FMGC/status/phase") == 0 or getprop("/FMGC/status/phase") == 1) {
setprop("/MCDU[1]/page", "TO");
} else if (getprop("/FMGC/status/phase") == 2) {
setprop("/MCDU[1]/page", "CLB");
} else if (getprop("/FMGC/status/phase") == 3) {
setprop("/MCDU[1]/page", "CRZ");
}
} else if (btn == "init") {
setprop("/MCDU[1]/page", "INITA");
} else if (btn == "data") {
setprop("/MCDU[1]/page", "DATA");
} else if (btn == "mcdu") {
setprop("/MCDU[1]/page", "MCDU");
}
}