A32X: Update PFD FMA, make WIP Canvas PFD FMA, altitude work
This commit is contained in:
Joshua Davidson
parent
58928b9b0c
commit
2d6ff557a0
11 changed files with 867 additions and 509 deletions
|
|
@ -294,6 +294,16 @@
|
|||
</script>
|
||||
</binding>
|
||||
</item>
|
||||
<item>
|
||||
<label>Test Canvas</label>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
setprop("/options/test-canvas", 1);
|
||||
canvas_pfd.showPFD1();
|
||||
</script>
|
||||
</binding>
|
||||
</item>
|
||||
</menu>
|
||||
</default>
|
||||
</menubar>
|
||||
|
|
@ -679,6 +689,7 @@
|
|||
<steep-ils type="bool">0</steep-ils>
|
||||
<steep-ils-avail type="bool">0</steep-ils-avail>
|
||||
<enable-ecam-actions>0</enable-ecam-actions>
|
||||
<test-canvas type="bool">0</test-canvas>
|
||||
</options>
|
||||
|
||||
<instrumentation n="0">
|
||||
|
|
@ -1239,6 +1250,9 @@
|
|||
<file>Aircraft/IDG-A32X/Nasal/MCDU2/DATA.nas</file>
|
||||
<file>Aircraft/IDG-A32X/Nasal/MCDU2/STATUS.nas</file>
|
||||
</mcdu2>
|
||||
<canvas_pfd>
|
||||
<file>Aircraft/IDG-A32X/Models/Instruments/PFD-WIP/PFD.nas</file>
|
||||
</canvas_pfd>
|
||||
<canvas_nd>
|
||||
<file>Aircraft/IDG-A32X/Models/Instruments/ND/canvas/ND.nas</file>
|
||||
</canvas_nd>
|
||||
|
|
|
|||
|
|
@ -121,6 +121,43 @@
|
|||
|
||||
<!-- Primary Flight Displays -->
|
||||
|
||||
<model>
|
||||
<name>PFD1 TEST CANVAS</name>
|
||||
<path>Aircraft/IDG-A32X/Models/Instruments/PFD-WIP/PFD1.xml</path>
|
||||
<offsets>
|
||||
<x-m>-0.5807</x-m>
|
||||
<y-m>-0.51115</y-m>
|
||||
<z-m>-0.0442</z-m>
|
||||
<pitch-deg>-15</pitch-deg>
|
||||
</offsets>
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/ac1</property>
|
||||
<value>110</value>
|
||||
</greater-than-equals>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/ac2</property>
|
||||
<value>110</value>
|
||||
</greater-than-equals>
|
||||
</or>
|
||||
<not-equals>
|
||||
<property>modes/cpt-du-xfr</property>
|
||||
<value>2</value>
|
||||
</not-equals>
|
||||
<equals>
|
||||
<property>systems/acconfig/mismatch-code</property>
|
||||
<value>0x000</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>options/test-canvas</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
</and>
|
||||
</condition>
|
||||
</model>
|
||||
|
||||
<model>
|
||||
<name>PFD1</name>
|
||||
<path>Aircraft/IDG-A32X/Models/Instruments/PFD/PFD1.xml</path>
|
||||
|
|
|
|||
|
|
@ -133,7 +133,7 @@ var canvas_lowerECAM_base = {
|
|||
|
||||
var canvas_lowerECAM_apu = {
|
||||
new: func(canvas_group, file) {
|
||||
var m = { parents: [canvas_lowerECAM_apu , canvas_lowerECAM_base] };
|
||||
var m = {parents: [canvas_lowerECAM_apu, canvas_lowerECAM_base]};
|
||||
m.init(canvas_group, file);
|
||||
|
||||
return m;
|
||||
|
|
@ -254,7 +254,7 @@ var canvas_lowerECAM_apu = {
|
|||
|
||||
var canvas_lowerECAM_eng1 = {
|
||||
new: func(canvas_group, file) {
|
||||
var m = { parents: [canvas_lowerECAM_eng1 , canvas_lowerECAM_base] };
|
||||
var m = {parents: [canvas_lowerECAM_eng1, canvas_lowerECAM_base]};
|
||||
m.init(canvas_group, file);
|
||||
|
||||
return m;
|
||||
|
|
@ -301,7 +301,7 @@ var canvas_lowerECAM_eng1 = {
|
|||
|
||||
var canvas_lowerECAM_eng = {
|
||||
new: func(canvas_group, file) {
|
||||
var m = { parents: [canvas_lowerECAM_eng , canvas_lowerECAM_base] };
|
||||
var m = {parents: [canvas_lowerECAM_eng, canvas_lowerECAM_base]};
|
||||
m.init(canvas_group, file);
|
||||
|
||||
return m;
|
||||
|
|
@ -349,7 +349,7 @@ var canvas_lowerECAM_eng = {
|
|||
|
||||
var canvas_lowerECAM_fctl = {
|
||||
new: func(canvas_group, file) {
|
||||
var m = { parents: [canvas_lowerECAM_fctl , canvas_lowerECAM_base] };
|
||||
var m = {parents: [canvas_lowerECAM_fctl, canvas_lowerECAM_base]};
|
||||
m.init(canvas_group, file);
|
||||
|
||||
return m;
|
||||
|
|
@ -735,7 +735,7 @@ var canvas_lowerECAM_fctl = {
|
|||
|
||||
var canvas_lowerECAM_wheel = {
|
||||
new: func(canvas_group, file) {
|
||||
var m = { parents: [canvas_lowerECAM_wheel , canvas_lowerECAM_base] };
|
||||
var m = {parents: [canvas_lowerECAM_wheel, canvas_lowerECAM_base]};
|
||||
m.init(canvas_group, file);
|
||||
|
||||
return m;
|
||||
|
|
|
|||
250
Models/Instruments/PFD-WIP/PFD.nas
Normal file
250
Models/Instruments/PFD-WIP/PFD.nas
Normal file
|
|
@ -0,0 +1,250 @@
|
|||
# A3XX PFD
|
||||
# Joshua Davidson (it0uchpods)
|
||||
|
||||
#########################################
|
||||
# Copyright (c) it0uchpods Design Group #
|
||||
#########################################
|
||||
|
||||
var PFD_1 = nil;
|
||||
var PFD_display = nil;
|
||||
setprop("/it-autoflight/output/ap1", 0);
|
||||
setprop("/it-autoflight/output/ap2", 0);
|
||||
setprop("/it-autoflight/output/fd1", 0);
|
||||
setprop("/it-autoflight/output/fd2", 0);
|
||||
setprop("/it-autoflight/output/athr", 0);
|
||||
var state1 = getprop("/systems/thrust/state1");
|
||||
var state2 = getprop("/systems/thrust/state2");
|
||||
var ap1 = getprop("/it-autoflight/output/ap1");
|
||||
var ap2 = getprop("/it-autoflight/output/ap2");
|
||||
var fd1 = getprop("/it-autoflight/output/fd1");
|
||||
var fd2 = getprop("/it-autoflight/output/fd2");
|
||||
var athr = getprop("/it-autoflight/output/athr");
|
||||
var throttle_mode = getprop("/modes/pfd/fma/throttle-mode");
|
||||
var pitch_mode = getprop("/modes/pfd/fma/pitch-mode");
|
||||
var pitch_mode_armed = getprop("/modes/pfd/fma/pitch-mode-armed");
|
||||
var pitch_mode2_armed = getprop("/modes/pfd/fma/pitch-mode2-armed");
|
||||
var roll_mode = getprop("/modes/pfd/fma/roll-mode");
|
||||
var roll_mode_armed = getprop("/modes/pfd/fma/roll-mode-armed");
|
||||
|
||||
var canvas_PFD_base = {
|
||||
init: func(canvas_group, file) {
|
||||
var font_mapper = func(family, weight) {
|
||||
return "LiberationFonts/LiberationSans-Regular.ttf";
|
||||
};
|
||||
|
||||
canvas.parsesvg(canvas_group, file, {'font-mapper': font_mapper});
|
||||
|
||||
var svg_keys = me.getKeys();
|
||||
foreach(var key; svg_keys) {
|
||||
me[key] = canvas_group.getElementById(key);
|
||||
var svg_keys = me.getKeys();
|
||||
|
||||
foreach (var key; svg_keys) {
|
||||
me[key] = canvas_group.getElementById(key);
|
||||
|
||||
var clip_el = canvas_group.getElementById(key ~ "_clip");
|
||||
if (clip_el != nil) {
|
||||
clip_el.setVisible(0);
|
||||
var tran_rect = clip_el.getTransformedBounds();
|
||||
|
||||
var clip_rect = sprintf("rect(%d,%d, %d,%d)",
|
||||
tran_rect[1], # 0 ys
|
||||
tran_rect[2], # 1 xe
|
||||
tran_rect[3], # 2 ye
|
||||
tran_rect[0]); #3 xs
|
||||
# coordinates are top,right,bottom,left (ys, xe, ye, xs) ref: l621 of simgear/canvas/CanvasElement.cxx
|
||||
me[key].set("clip", clip_rect);
|
||||
me[key].set("clip-frame", canvas.Element.PARENT);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
me.page = canvas_group;
|
||||
|
||||
return me;
|
||||
},
|
||||
getKeys: func() {
|
||||
return [];
|
||||
},
|
||||
update: func() {
|
||||
if ((getprop("/systems/electrical/bus/ac1") >= 110 or getprop("/systems/electrical/bus/ac2") >= 110) and getprop("/controls/electrical/switches/emer-gen") != 1 and getprop("/options/test-canvas") == 1) {
|
||||
PFD_1.page.show();
|
||||
PFD_1.update();
|
||||
} else {
|
||||
PFD_1.page.hide();
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
var canvas_PFD_1 = {
|
||||
new: func(canvas_group, file) {
|
||||
var m = {parents: [canvas_PFD_1, canvas_PFD_base]};
|
||||
m.init(canvas_group, file);
|
||||
|
||||
return m;
|
||||
},
|
||||
getKeys: func() {
|
||||
return ["FMA_thrust","FMA_pitch","FMA_pitcharm","FMA_pitcharm2","FMA_roll","FMA_rollarm","FMA_combined","FMA_catmode","FMA_cattype","FMA_nodh","FMA_dh","FMA_dhn","FMA_ap","FMA_fd","FMA_athr","FMA_thrust_box","FMA_pitch_box","FMA_pitcharm_box",
|
||||
"FMA_roll_box","FMA_rollarm_box","FMA_combined_box","FMA_catmode_box","FMA_cattype_box","FMA_cat_box","FMA_dh_box","FMA_ap_box","FMA_fd_box","FMA_athr_box","ALT_digits","ALT_tens"];
|
||||
},
|
||||
update: func() {
|
||||
state1 = getprop("/systems/thrust/state1");
|
||||
state2 = getprop("/systems/thrust/state2");
|
||||
ap1 = getprop("/it-autoflight/output/ap1");
|
||||
ap2 = getprop("/it-autoflight/output/ap2");
|
||||
fd1 = getprop("/it-autoflight/output/fd1");
|
||||
fd2 = getprop("/it-autoflight/output/fd2");
|
||||
athr = getprop("/it-autoflight/output/athr");
|
||||
throttle_mode = getprop("/modes/pfd/fma/throttle-mode");
|
||||
pitch_mode = getprop("/modes/pfd/fma/pitch-mode");
|
||||
pitch_mode_armed = getprop("/modes/pfd/fma/pitch-mode-armed");
|
||||
pitch_mode2_armed = getprop("/modes/pfd/fma/pitch-mode2-armed");
|
||||
roll_mode = getprop("/modes/pfd/fma/roll-mode");
|
||||
roll_mode_armed = getprop("/modes/pfd/fma/roll-mode-armed");
|
||||
|
||||
# FMA Thrust
|
||||
if (athr == 1 and ((state1 == "MAN" or state1 == "CL") and (state2 == "MAN" or state2 == "CL"))) {
|
||||
me["FMA_thrust"].show();
|
||||
if (getprop("/modes/pfd/fma/throttle-mode-box") == 1) {
|
||||
me["FMA_thrust_box"].show();
|
||||
} else {
|
||||
me["FMA_thrust_box"].hide();
|
||||
}
|
||||
} else {
|
||||
me["FMA_thrust"].hide();
|
||||
me["FMA_thrust_box"].hide();
|
||||
}
|
||||
|
||||
me["FMA_thrust"].setText(sprintf("%s", throttle_mode));
|
||||
|
||||
# FMA Pitch Roll Common
|
||||
me["FMA_combined"].setText(sprintf("%s", pitch_mode));
|
||||
|
||||
if (pitch_mode == "LAND" or pitch_mode == "FLARE" or pitch_mode == "ROLL OUT") {
|
||||
me["FMA_pitch"].hide();
|
||||
me["FMA_roll"].hide();
|
||||
me["FMA_pitch_box"].hide();
|
||||
me["FMA_roll_box"].hide();
|
||||
me["FMA_pitcharm_box"].hide();
|
||||
me["FMA_rollarm_box"].hide();
|
||||
me["FMA_combined"].show();
|
||||
if (getprop("/modes/pfd/fma/pitch-mode-box") == 1) {
|
||||
me["FMA_combined_box"].show();
|
||||
} else {
|
||||
me["FMA_combined_box"].hide();
|
||||
}
|
||||
} else {
|
||||
me["FMA_combined"].hide();
|
||||
me["FMA_combined_box"].hide();
|
||||
if (ap1 or ap2 or fd1 or fd2) {
|
||||
me["FMA_pitch"].show();
|
||||
me["FMA_roll"].show();
|
||||
} else {
|
||||
me["FMA_pitch"].hide();
|
||||
me["FMA_roll"].hide();
|
||||
}
|
||||
if (getprop("/modes/pfd/fma/pitch-mode-box") == 1 and pitch_mode != " " and (ap1 or ap2 or fd1 or fd2)) {
|
||||
me["FMA_pitch_box"].show();
|
||||
} else {
|
||||
me["FMA_pitch_box"].hide();
|
||||
}
|
||||
if (pitch_mode_armed == " " and pitch_mode2_armed == " ") {
|
||||
me["FMA_pitcharm_box"].hide();
|
||||
} else {
|
||||
if ((getprop("/modes/pfd/fma/pitch-mode-armed-box") == 1 or getprop("/modes/pfd/fma/pitch-mode2-armed-box") == 1) and (ap1 or ap2 or fd1 or fd2)) {
|
||||
me["FMA_pitcharm_box"].show();
|
||||
} else {
|
||||
me["FMA_pitcharm_box"].hide();
|
||||
}
|
||||
}
|
||||
if (getprop("/modes/pfd/fma/roll-mode-box") == 1 and roll_mode != " " and (ap1 or ap2 or fd1 or fd2)) {
|
||||
me["FMA_roll_box"].show();
|
||||
} else {
|
||||
me["FMA_roll_box"].hide();
|
||||
}
|
||||
if (getprop("/modes/pfd/fma/roll-mode-armed-box") == 1 and roll_mode_armed != " " and (ap1 or ap2 or fd1 or fd2)) {
|
||||
me["FMA_rollarm_box"].show();
|
||||
} else {
|
||||
me["FMA_rollarm_box"].hide();
|
||||
}
|
||||
}
|
||||
|
||||
if (ap1 or ap2 or fd1 or fd2) {
|
||||
me["FMA_pitcharm"].show();
|
||||
me["FMA_pitcharm2"].show();
|
||||
me["FMA_rollarm"].show();
|
||||
} else {
|
||||
me["FMA_pitcharm"].hide();
|
||||
me["FMA_pitcharm2"].hide();
|
||||
me["FMA_rollarm"].hide();
|
||||
}
|
||||
|
||||
# FMA Pitch
|
||||
me["FMA_pitch"].setText(sprintf("%s", pitch_mode));
|
||||
me["FMA_pitcharm"].setText(sprintf("%s", pitch_mode_armed));
|
||||
me["FMA_pitcharm2"].setText(sprintf("%s", pitch_mode2_armed));
|
||||
|
||||
# FMA Roll
|
||||
me["FMA_roll"].setText(sprintf("%s", roll_mode));
|
||||
me["FMA_rollarm"].setText(sprintf("%s", roll_mode_armed));
|
||||
|
||||
# FMA CAT DH
|
||||
me["FMA_catmode"].hide();
|
||||
me["FMA_cattype"].hide();
|
||||
me["FMA_catmode_box"].hide();
|
||||
me["FMA_cattype_box"].hide();
|
||||
me["FMA_cat_box"].hide();
|
||||
me["FMA_nodh"].hide();
|
||||
me["FMA_dh_box"].hide();
|
||||
|
||||
# FMA AP FD ATHR
|
||||
me["FMA_ap"].setText(sprintf("%s", getprop("/modes/pfd/fma/ap-mode")));
|
||||
me["FMA_fd"].setText(sprintf("%s", getprop("/modes/pfd/fma/fd-mode")));
|
||||
me["FMA_athr"].setText(sprintf("%s", getprop("/modes/pfd/fma/at-mode")));
|
||||
|
||||
if (getprop("/modes/pfd/fma/ap-mode-box") == 1) {
|
||||
me["FMA_ap_box"].show();
|
||||
} else {
|
||||
me["FMA_ap_box"].hide();
|
||||
}
|
||||
|
||||
if (getprop("/modes/pfd/fma/fd-mode-box") == 1) {
|
||||
me["FMA_fd_box"].show();
|
||||
} else {
|
||||
me["FMA_fd_box"].hide();
|
||||
}
|
||||
|
||||
if (getprop("/modes/pfd/fma/athr-mode-box") == 1) {
|
||||
me["FMA_athr_box"].show();
|
||||
} else {
|
||||
me["FMA_athr_box"].hide();
|
||||
}
|
||||
|
||||
# Altitude
|
||||
me["ALT_digits"].setText(sprintf("%s", getprop("/instrumentation/altimeter/indicated-altitude-ft-pfd")));
|
||||
},
|
||||
};
|
||||
|
||||
setlistener("sim/signals/fdm-initialized", func {
|
||||
PFD_display = canvas.new({
|
||||
"name": "PFD",
|
||||
"size": [1024, 1024],
|
||||
"view": [1024, 1024],
|
||||
"mipmapping": 1
|
||||
});
|
||||
PFD_display.addPlacement({"node": "pfd1.screen"});
|
||||
var group_pfd1 = PFD_display.createGroup();
|
||||
|
||||
PFD_1 = canvas_PFD_1.new(group_pfd1, "Aircraft/IDG-A32X/Models/Instruments/PFD-WIP/res/pfd.svg");
|
||||
|
||||
PFD_update.start();
|
||||
});
|
||||
|
||||
var PFD_update = maketimer(0.05, func {
|
||||
canvas_PFD_base.update();
|
||||
});
|
||||
|
||||
var showPFD1 = func {
|
||||
var dlg = canvas.Window.new([512, 512], "dialog").set("resize", 1);
|
||||
dlg.setCanvas(PFD_display);
|
||||
}
|
||||
26
Models/Instruments/PFD-WIP/PFD1.xml
Normal file
26
Models/Instruments/PFD-WIP/PFD1.xml
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
<?xml version="1.0"?>
|
||||
|
||||
<!--
|
||||
#########################################
|
||||
# Copyright (c) it0uchpods Design Group #
|
||||
#########################################
|
||||
-->
|
||||
|
||||
<PropertyList>
|
||||
|
||||
<path>res/PFD.ac</path>
|
||||
|
||||
<animation>
|
||||
<type>pick</type>
|
||||
<object-name>pfd1.screen</object-name>
|
||||
<action>
|
||||
<button>0</button>
|
||||
<repeatable>false</repeatable>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>canvas_pfd.showPFD1();</script>
|
||||
</binding>
|
||||
</action>
|
||||
</animation>
|
||||
|
||||
</PropertyList>
|
||||
23
Models/Instruments/PFD-WIP/res/PFD.ac
Normal file
23
Models/Instruments/PFD-WIP/res/PFD.ac
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
AC3Db
|
||||
MATERIAL "buttonlights" rgb 1 1 1 amb 1 1 1 emis 1 1 1 spec 0.33 0.33 0.33 shi 32 trans 0
|
||||
OBJECT world
|
||||
kids 1
|
||||
OBJECT poly
|
||||
name "pfd1.screen"
|
||||
loc 0.00180348 -0.00140045 0.000124912
|
||||
texture "screen.png"
|
||||
crease 30.000000
|
||||
numvert 4
|
||||
0 0.0804743 -0.0774588
|
||||
0 -0.0742105 -0.0774588
|
||||
0 -0.0742105 0.077209
|
||||
0 0.0804743 0.077209
|
||||
numsurf 1
|
||||
SURF 0x0
|
||||
mat 0
|
||||
refs 4
|
||||
0 1.00067 0.999407
|
||||
3 4.45843e-005 0.999407
|
||||
2 4.45843e-005 0.000756443
|
||||
1 1.00067 0.000756443
|
||||
kids 0
|
||||
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 248 KiB After Width: | Height: | Size: 250 KiB |
BIN
Models/Instruments/PFD-WIP/res/screen.png
Normal file
BIN
Models/Instruments/PFD-WIP/res/screen.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 629 B |
|
|
@ -257,7 +257,7 @@ var canvas_upperECAM_base = {
|
|||
|
||||
var canvas_upperECAM_cfm_eis1 = {
|
||||
new: func(canvas_group, file) {
|
||||
var m = { parents: [canvas_upperECAM_cfm_eis1 , canvas_upperECAM_base] };
|
||||
var m = {parents: [canvas_upperECAM_cfm_eis1, canvas_upperECAM_base]};
|
||||
m.init(canvas_group, file);
|
||||
|
||||
return m;
|
||||
|
|
@ -458,7 +458,7 @@ var canvas_upperECAM_cfm_eis1 = {
|
|||
|
||||
var canvas_upperECAM_cfm_eis2 = {
|
||||
new: func(canvas_group, file) {
|
||||
var m = { parents: [canvas_upperECAM_cfm_eis2 , canvas_upperECAM_base] };
|
||||
var m = {parents: [canvas_upperECAM_cfm_eis2, canvas_upperECAM_base]};
|
||||
m.init(canvas_group, file);
|
||||
|
||||
return m;
|
||||
|
|
@ -675,7 +675,7 @@ var canvas_upperECAM_cfm_eis2 = {
|
|||
|
||||
var canvas_upperECAM_iae_eis1 = {
|
||||
new: func(canvas_group, file) {
|
||||
var m = { parents: [canvas_upperECAM_iae_eis1 , canvas_upperECAM_base] };
|
||||
var m = {parents: [canvas_upperECAM_iae_eis1, canvas_upperECAM_base]};
|
||||
m.init(canvas_group, file);
|
||||
|
||||
return m;
|
||||
|
|
@ -932,7 +932,7 @@ var canvas_upperECAM_iae_eis1 = {
|
|||
|
||||
var canvas_upperECAM_iae_eis2 = {
|
||||
new: func(canvas_group, file) {
|
||||
var m = { parents: [canvas_upperECAM_iae_eis2 , canvas_upperECAM_base] };
|
||||
var m = {parents: [canvas_upperECAM_iae_eis2, canvas_upperECAM_base]};
|
||||
m.init(canvas_group, file);
|
||||
|
||||
return m;
|
||||
|
|
|
|||
|
|
@ -7,6 +7,24 @@
|
|||
|
||||
setprop("/FMGC/internal/cruise-ft", 10000);
|
||||
setprop("/it-autoflight/internal/alt", 10000);
|
||||
setprop("/modes/pfd/fma/throttle-mode", " ");
|
||||
setprop("/modes/pfd/fma/pitch-mode", " ");
|
||||
setprop("/modes/pfd/fma/pitch-mode-armed", " ");
|
||||
setprop("/modes/pfd/fma/pitch-mode2-armed", " ");
|
||||
setprop("/modes/pfd/fma/roll-mode", " ");
|
||||
setprop("/modes/pfd/fma/roll-mode-armed", " ");
|
||||
setprop("/modes/pfd/fma/ap-mode", " ");
|
||||
setprop("/modes/pfd/fma/fd-mode", " ");
|
||||
setprop("/modes/pfd/fma/at-mode", " ");
|
||||
setprop("/modes/pfd/fma/throttle-mode-box", 0);
|
||||
setprop("/modes/pfd/fma/pitch-mode-box", 0);
|
||||
setprop("/modes/pfd/fma/pitch-mode-armed-box", 0);
|
||||
setprop("/modes/pfd/fma/pitch-mode2-armed-box", 0);
|
||||
setprop("/modes/pfd/fma/roll-mode-box", 0);
|
||||
setprop("/modes/pfd/fma/roll-mode-armed-box", 0);
|
||||
setprop("/modes/pfd/fma/ap-mode-box", 0);
|
||||
setprop("/modes/pfd/fma/fd-mode-box", 0);
|
||||
setprop("/modes/pfd/fma/athr-mode-box", 0);
|
||||
|
||||
setlistener("sim/signals/fdm-initialized", func {
|
||||
loopFMA.start();
|
||||
|
|
@ -379,11 +397,11 @@ var ap = func {
|
|||
var ap2 = getprop("/it-autoflight/output/ap2");
|
||||
var newap = getprop("/modes/pfd/fma/ap-mode");
|
||||
if (ap1 and ap2 and newap != "AP1+2") {
|
||||
setprop("/modes/pfd/fma/ap-mode", "AP1+2");
|
||||
} else if (ap1 and !ap2 and newap != "AP1") {
|
||||
setprop("/modes/pfd/fma/ap-mode", "AP1");
|
||||
} else if (ap2 and !ap1 and newap != "AP2") {
|
||||
setprop("/modes/pfd/fma/ap-mode", "AP2");
|
||||
setprop("/modes/pfd/fma/ap-mode", "AP 1+2");
|
||||
} else if (ap1 and !ap2 and newap != "AP 1") {
|
||||
setprop("/modes/pfd/fma/ap-mode", "AP 1");
|
||||
} else if (ap2 and !ap1 and newap != "AP 2") {
|
||||
setprop("/modes/pfd/fma/ap-mode", "AP 2");
|
||||
} else if (!ap1 and !ap2) {
|
||||
setprop("/modes/pfd/fma/ap-mode", " ");
|
||||
}
|
||||
|
|
@ -395,11 +413,11 @@ var fd = func {
|
|||
var fd2 = getprop("/it-autoflight/output/fd2");
|
||||
var newfd = getprop("/modes/pfd/fma/fd-mode");
|
||||
if (fd1 and fd2 and newfd != "1FD2") {
|
||||
setprop("/modes/pfd/fma/fd-mode", "1FD2");
|
||||
} else if (fd1 and !fd2 and newfd != "1FD-") {
|
||||
setprop("/modes/pfd/fma/fd-mode", "1FD-");
|
||||
} else if (fd2 and !fd1 and newfd != "-FD2") {
|
||||
setprop("/modes/pfd/fma/fd-mode", "-FD2");
|
||||
setprop("/modes/pfd/fma/fd-mode", "1 FD 2");
|
||||
} else if (fd1 and !fd2 and newfd != "1 FD -") {
|
||||
setprop("/modes/pfd/fma/fd-mode", "1 FD -");
|
||||
} else if (fd2 and !fd1 and newfd != "- FD 2") {
|
||||
setprop("/modes/pfd/fma/fd-mode", "- FD 2");
|
||||
} else if (!fd1 and !fd2) {
|
||||
setprop("/modes/pfd/fma/fd-mode", " ");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
2137
|
||||
2138
|
||||
Reference in a new issue