Merge branch 'master' of github.com:it0uchpods/A320Family

This commit is contained in:
Joshua Davidson 2017-08-01 10:44:08 -04:00
commit 9c6bc761fe
9 changed files with 241 additions and 3 deletions

View file

@ -804,6 +804,30 @@
<draw-text type="bool">true</draw-text> <draw-text type="bool">true</draw-text>
<draw-alignment type="bool">false</draw-alignment> <draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox type="bool">false</draw-boundingbox> <draw-boundingbox type="bool">false</draw-boundingbox>
<character-size>0.0040</character-size>
<font-resolution>
<width type="int">64</width>
<height type="int">64</height>
</font-resolution>
</text>
<text>
<name>tropovalue2</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>
<property type="string">FMGC/internal/tropo</property>
<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> <character-size>0.0050</character-size>
<font-resolution> <font-resolution>
<width type="int">64</width> <width type="int">64</width>
@ -811,6 +835,28 @@
</font-resolution> </font-resolution>
</text> </text>
<animation>
<type>select</type>
<object-name>tropovalue</object-name>
<condition>
<equals>
<property>FMGC/internal/tropo-set</property>
<value>0</value>
</equals>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>tropovalue2</object-name>
<condition>
<equals>
<property>FMGC/internal/tropo-set</property>
<value>1</value>
</equals>
</condition>
</animation>
<!-- Colors --> <!-- Colors -->
<!-- White --> <!-- White -->
<animation> <animation>
@ -920,6 +966,7 @@
<animation> <animation>
<type>material</type> <type>material</type>
<object-name>tropovalue</object-name> <object-name>tropovalue</object-name>
<object-name>tropovalue2</object-name>
<object-name>LONG-val</object-name> <object-name>LONG-val</object-name>
<object-name>LAT-val</object-name> <object-name>LAT-val</object-name>
<object-name>fromto2</object-name> <object-name>fromto2</object-name>

View file

@ -48,7 +48,31 @@
</text> </text>
<text> <text>
<name>page</name> <name>page-blockset</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">INIT FUEL PREDICTION</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>pagearrows</name>
<offsets> <offsets>
<x-m>-0.001</x-m> <x-m>-0.001</x-m>
<y-m>0.04</y-m> <y-m>0.04</y-m>
@ -552,11 +576,35 @@
<height type="int">64</height> <height type="int">64</height>
</font-resolution> </font-resolution>
</text> </text>
<animation>
<type>select</type>
<object-name>page</object-name>
<condition>
<equals>
<property>/FMGC/internal/block-set</property>
<value>0</value>
</equals>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>page-blockset</object-name>
<condition>
<equals>
<property>/FMGC/internal/block-set</property>
<value>1</value>
</equals>
</condition>
</animation>
<!-- Colors --> <!-- Colors -->
<!-- White --> <!-- White -->
<animation> <animation>
<type>material</type> <type>material</type>
<object-name>page</object-name> <object-name>page</object-name>
<object-name>pagearrows</object-name>
<object-name>page-blockset</object-name>
<object-name>taxi</object-name> <object-name>taxi</object-name>
<object-name>triptime</object-name> <object-name>triptime</object-name>
<object-name>triptime2</object-name> <object-name>triptime2</object-name>

View file

@ -804,6 +804,30 @@
<draw-text type="bool">true</draw-text> <draw-text type="bool">true</draw-text>
<draw-alignment type="bool">false</draw-alignment> <draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox type="bool">false</draw-boundingbox> <draw-boundingbox type="bool">false</draw-boundingbox>
<character-size>0.0040</character-size>
<font-resolution>
<width type="int">64</width>
<height type="int">64</height>
</font-resolution>
</text>
<text>
<name>tropovalue2</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>
<property type="string">FMGC/internal/tropo</property>
<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> <character-size>0.0050</character-size>
<font-resolution> <font-resolution>
<width type="int">64</width> <width type="int">64</width>
@ -811,6 +835,28 @@
</font-resolution> </font-resolution>
</text> </text>
<animation>
<type>select</type>
<object-name>tropovalue</object-name>
<condition>
<equals>
<property>FMGC/internal/tropo-set</property>
<value>0</value>
</equals>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>tropovalue2</object-name>
<condition>
<equals>
<property>FMGC/internal/tropo-set</property>
<value>1</value>
</equals>
</condition>
</animation>
<!-- Colors --> <!-- Colors -->
<!-- White --> <!-- White -->
<animation> <animation>
@ -920,6 +966,7 @@
<animation> <animation>
<type>material</type> <type>material</type>
<object-name>tropovalue</object-name> <object-name>tropovalue</object-name>
<object-name>tropovalue2</object-name>
<object-name>LONG-val</object-name> <object-name>LONG-val</object-name>
<object-name>LAT-val</object-name> <object-name>LAT-val</object-name>
<object-name>fromto2</object-name> <object-name>fromto2</object-name>

View file

@ -48,7 +48,31 @@
</text> </text>
<text> <text>
<name>page</name> <name>page-blockset</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">INIT FUEL PREDICTION</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>pagearrows</name>
<offsets> <offsets>
<x-m>-0.001</x-m> <x-m>-0.001</x-m>
<y-m>0.04</y-m> <y-m>0.04</y-m>
@ -552,11 +576,35 @@
<height type="int">64</height> <height type="int">64</height>
</font-resolution> </font-resolution>
</text> </text>
<animation>
<type>select</type>
<object-name>page</object-name>
<condition>
<equals>
<property>/FMGC/internal/block-set</property>
<value>0</value>
</equals>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>page-blockset</object-name>
<condition>
<equals>
<property>/FMGC/internal/block-set</property>
<value>1</value>
</equals>
</condition>
</animation>
<!-- Colors --> <!-- Colors -->
<!-- White --> <!-- White -->
<animation> <animation>
<type>material</type> <type>material</type>
<object-name>page</object-name> <object-name>page</object-name>
<object-name>pagearrows</object-name>
<object-name>page-blockset</object-name>
<object-name>taxi</object-name> <object-name>taxi</object-name>
<object-name>triptime</object-name> <object-name>triptime</object-name>
<object-name>triptime2</object-name> <object-name>triptime2</object-name>

View file

@ -111,7 +111,6 @@ setlistener("/sim/signals/fdm-initialized", func {
var FMGCinit = func { var FMGCinit = func {
setprop("/FMGC/status/to-state", 0); setprop("/FMGC/status/to-state", 0);
setprop("/FMGC/status/phase", "0"); # 0 is Preflight 1 is Takeoff 2 is Climb 3 is Cruise 4 is Descent 5 is Decel/Approach 6 is Go Around 7 is Done setprop("/FMGC/status/phase", "0"); # 0 is Preflight 1 is Takeoff 2 is Climb 3 is Cruise 4 is Descent 5 is Decel/Approach 6 is Go Around 7 is Done
setprop("/FMGC/internal/tropo", 36090);
setprop("/FMGC/internal/overspeed", 338); setprop("/FMGC/internal/overspeed", 338);
setprop("/FMGC/internal/mng-spd", 157); setprop("/FMGC/internal/mng-spd", 157);
setprop("/FMGC/internal/mng-spd-cmd", 157); setprop("/FMGC/internal/mng-spd-cmd", 157);

View file

@ -137,5 +137,25 @@ var initInputA = func(key) {
if (getprop("/controls/adirs/mcducbtn") == 0) { if (getprop("/controls/adirs/mcducbtn") == 0) {
setprop("/controls/adirs/mcducbtn", 1); setprop("/controls/adirs/mcducbtn", 1);
} }
} else if (key == "R6") {
if (scratchpad == "CLR") {
setprop("/FMGC/internal/tropo", 36090);
setprop("/FMGC/internal/tropo-set", 0);
setprop("/MCDU[0]/scratchpad-msg", "0");
setprop("/MCDU[0]/scratchpad", "");
} else {
var tropo = size(scratchpad);
if (tropo == 5) {
setprop("/FMGC/internal/tropo-set", 1);
setprop("/FMGC/internal/tropo", scratchpad);
setprop("/MCDU[0]/scratchpad", "");
} else {
if (getprop("/MCDU[0]/scratchpad") != "NOT ALLOWED") {
setprop("/MCDU[0]/last-scratchpad", getprop("/MCDU[0]/scratchpad"));
}
setprop("/MCDU[0]/scratchpad-msg", "1");
setprop("/MCDU[0]/scratchpad", "NOT ALLOWED");
}
}
} }
} }

View file

@ -71,6 +71,8 @@ var MCDU_reset = func {
setprop("/FMGC/print/mcdu/page2/R2req", 0); setprop("/FMGC/print/mcdu/page2/R2req", 0);
setprop("/FMGC/print/mcdu/page2/R3req", 0); setprop("/FMGC/print/mcdu/page2/R3req", 0);
setprop("/FMGC/print/mcdu/page2/R4req", 0); setprop("/FMGC/print/mcdu/page2/R4req", 0);
setprop("/FMGC/internal/tropo", 36090);
setprop("/FMGC/internal/tropo-set", 0);
} }
var lskbutton = func(btn) { var lskbutton = func(btn) {
@ -303,6 +305,8 @@ var rskbutton = func(btn) {
} }
setprop("/MCDU[0]/scratchpad-msg", "1"); setprop("/MCDU[0]/scratchpad-msg", "1");
setprop("/MCDU[0]/scratchpad", "AOC DISABLED"); setprop("/MCDU[0]/scratchpad", "AOC DISABLED");
} else if (getprop("/MCDU[0]/page") == "INITA") {
initInputA("R6");
} else { } else {
if (getprop("/MCDU[0]/scratchpad") != "NOT ALLOWED") { if (getprop("/MCDU[0]/scratchpad") != "NOT ALLOWED") {
setprop("/MCDU[0]/last-scratchpad", getprop("/MCDU[0]/scratchpad")); setprop("/MCDU[0]/last-scratchpad", getprop("/MCDU[0]/scratchpad"));

View file

@ -137,5 +137,26 @@ var initInputA = func(key) {
if (getprop("/controls/adirs/mcducbtn") == 0) { if (getprop("/controls/adirs/mcducbtn") == 0) {
setprop("/controls/adirs/mcducbtn", 1); setprop("/controls/adirs/mcducbtn", 1);
} }
} else if (key == "R6") {
if (scratchpad == "CLR") {
setprop("/FMGC/internal/tropo", 36090);
setprop("/FMGC/internal/tropo-set", 0);
setprop("/MCDU[1]/scratchpad-msg", "0");
setprop("/MCDU[1]/scratchpad", "");
} else {
var tropo = size(scratchpad);
if (tropo == 5) {
setprop("/FMGC/internal/tropo-set", 1);
setprop("/FMGC/internal/tropo", scratchpad);
setprop("/MCDU[1]/scratchpad", "");
} else {
if (getprop("/MCDU[1]/scratchpad") != "NOT ALLOWED") {
setprop("/MCDU[1]/last-scratchpad", getprop("/MCDU[1]/scratchpad"));
}
setprop("/MCDU[1]/scratchpad-msg", "1");
setprop("/MCDU[1]/scratchpad", "NOT ALLOWED");
}
}
} }
} }

View file

@ -71,6 +71,8 @@ var MCDU_reset = func {
setprop("/FMGC/print/mcdu/page2/R2req", 0); setprop("/FMGC/print/mcdu/page2/R2req", 0);
setprop("/FMGC/print/mcdu/page2/R3req", 0); setprop("/FMGC/print/mcdu/page2/R3req", 0);
setprop("/FMGC/print/mcdu/page2/R4req", 0); setprop("/FMGC/print/mcdu/page2/R4req", 0);
setprop("/FMGC/internal/tropo", 36090);
setprop("/FMGC/internal/tropo-set", 0);
} }
var lskbutton = func(btn) { var lskbutton = func(btn) {
@ -301,6 +303,8 @@ var rskbutton = func(btn) {
perfCLBInput("R6"); perfCLBInput("R6");
} else if (getprop("/MCDU[1]/page") == "CRZ") { } else if (getprop("/MCDU[1]/page") == "CRZ") {
perfCRZInput("R6"); perfCRZInput("R6");
} else if (getprop("/MCDU[1]/page") == "INITA") {
initInputA("R6");
} else { } else {
if (getprop("/MCDU[1]/scratchpad") != "NOT ALLOWED") { if (getprop("/MCDU[1]/scratchpad") != "NOT ALLOWED") {
setprop("/MCDU[1]/last-scratchpad", getprop("/MCDU[1]/scratchpad")); setprop("/MCDU[1]/last-scratchpad", getprop("/MCDU[1]/scratchpad"));