fly/A320-family
1
0
Fork 0
Code Activity

Merge branch 'dev' into 3D

Browse source
This commit is contained in:
legoboyvdlp R 2021-06-19 15:14:18 +01:00
commit 425083482f
12 changed files with 122 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Models/FlightDeck/res/main_labels.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 104 KiB

After

Width:  |  Height:  |  Size: 105 KiB

15
Models/Instruments/PFD/PFD.nas
View file

@ -218,7 +218,7 @@ var canvas_PFD_base = {
"AI_agl_g","AI_agl","AI_error","AI_group","FD_roll","FD_pitch","ALT_box_flash","ALT_box","ALT_box_amber","ALT_scale","ALT_target","ALT_target_digit","ALT_one","ALT_two","ALT_three","ALT_four","ALT_five","ALT_digits","ALT_tens","ALT_digit_UP",
"ALT_digit_DN","ALT_error","ALT_neg","ALT_group","ALT_group2","ALT_frame","VS_pointer","VS_box","VS_digit","VS_error","VS_group","QNH","QNH_setting","QNH_std","QNH_box","LOC_pointer","LOC_scale","GS_scale","GS_pointer","CRS_pointer","HDG_target","HDG_scale",
"HDG_one","HDG_two","HDG_three","HDG_four","HDG_five","HDG_six","HDG_seven","HDG_digit_L","HDG_digit_R","HDG_error","HDG_group","HDG_frame","TRK_pointer","machError","ilsError","ils_code","ils_freq","dme_dist","dme_dist_legend","ILS_HDG_R","ILS_HDG_L",
"ILS_right","ILS_left","outerMarker","middleMarker","innerMarker","v1_group","v1_text","vr_speed","F_target","S_target","FS_targets","flap_max","clean_speed","ground","ground_ref","FPV","spdLimError"];
"ILS_right","ILS_left","outerMarker","middleMarker","innerMarker","v1_group","v1_text","vr_speed","F_target","S_target","FS_targets","flap_max","clean_speed","ground","ground_ref","FPV","spdLimError","vsFMArate"];
},
updateDu1: func() {
var elapsedtime_act = elapsedtime.getValue();
@ -868,7 +868,18 @@ var canvas_PFD_base = {
}
# FMA Pitch
me["FMA_pitch"].setText(sprintf("%s", pitch_mode_act));
if (pitch_mode_act == "V/S") {
me["FMA_pitch"].setText(sprintf("%s ", pitch_mode_act));
me["vsFMArate"].setText(sprintf("%+4.0f",fmgc.Input.vs.getValue()));
me["vsFMArate"].show();
} elsif (pitch_mode_act == "FPA") {
me["FMA_pitch"].setText(sprintf("%s ", pitch_mode_act));
me["vsFMArate"].setText(sprintf("%+3.1f°",fmgc.Input.fpa.getValue()));
me["vsFMArate"].show();
}else {
me["FMA_pitch"].setText(sprintf("%s", pitch_mode_act));
me["vsFMArate"].hide();
}
me["FMA_pitcharm"].setText(sprintf("%s", pitch_mode_armed_act));
me["FMA_pitcharm2"].setText(sprintf("%s", pitch_mode2_armed_act));

13
Models/Instruments/PFD/res/pfd.svg
View file

@ -6256,4 +6256,17 @@
x="823.7511"
sodipodi:role="line"
id="tspan1797">G</tspan></text>
<text
inkscape:label="#text983"
xml:space="preserve"
style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#179ab7;fill-opacity:1;stroke:none;stroke-width:0.65757698"
x="417.56354"
y="34.634907"
id="vsFMArate"
transform="scale(0.87678236,1.1405339)"><tspan
sodipodi:role="line"
id="tspan1777"
x="417.56354"
y="34.634907"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:35.99950027px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#179ab7;fill-opacity:1;stroke-width:0.65757698">-800</tspan></text>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 340 KiB

After

Width:  |  Height:  |  Size: 341 KiB

4
Nasal/ECAM/ECAM-controller.nas
View file

@ -14,7 +14,7 @@ var overflow = props.globals.initNode("/ECAM/warnings/overflow", 0, "BOOL");
var lights = [props.globals.initNode("/ECAM/warnings/master-warning-light", 0, "BOOL"), props.globals.initNode("/ECAM/warnings/master-caution-light", 0, "BOOL")];
var aural = [props.globals.initNode("/sim/sound/warnings/crc", 0, "BOOL"), props.globals.initNode("/sim/sound/warnings/chime", 0, "BOOL"), props.globals.initNode("/sim/sound/warnings/cricket", 0, "BOOL"), props.globals.initNode("/sim/sound/warnings/retard", 0, "BOOL"), props.globals.initNode("/sim/sound/warnings/cchord", 0, "BOOL")];
var aural = [props.globals.initNode("/sim/sound/warnings/crc", 0, "BOOL"), props.globals.initNode("/sim/sound/warnings/chime", 0, "BOOL"), props.globals.initNode("/sim/sound/warnings/cricket", 0, "BOOL"), props.globals.initNode("/sim/sound/warnings/retard", 0, "BOOL"), props.globals.initNode("/sim/sound/warnings/cchord", 0, "BOOL"), props.globals.initNode("/sim/sound/warnings/click", 0, "BOOL")];
var warningFlash = props.globals.initNode("/ECAM/warnings/master-warning-flash", 0, "BOOL");
var lineIndex = 0;
@ -223,7 +223,7 @@ var warning = {
me.noRepeat = 1;
},
sound: func() {
if (me.aural > 3) { return; }
if (me.aural == 9) { return; }
if (me.active == 0 and me.wasActive == 1) {
aural[me.aural].setBoolValue(0);
me.wasActive = 0;

2
Nasal/ECAM/ECAM-logic.nas
View file

@ -66,7 +66,7 @@ var messages_priority_3 = func {
ECAM_controller.warningReset(flap_not_zero);
}
if (overspeed.clearFlag == 0 and (phaseVar3 == 1 or (phaseVar3 >= 5 and phaseVar3 <= 7)) and getprop("/systems/navigation/adr/output/overspeed")) {
if (overspeed.clearFlag == 0 and (phaseVar3 == 1 or (phaseVar3 >= 5 and phaseVar3 <= 7)) and pts.Systems.Navigation.ADR.Output.overspeed.getBoolValue()) {
overspeed.active = 1;
if (getprop("/systems/navigation/adr/computation/overspeed-vmo") or getprop("/systems/navigation/adr/computation/overspeed-mmo")) {
overspeedVMO.active = 1;

8
Nasal/FMGC/FCU.nas
View file

@ -107,18 +107,18 @@ var FCUController = {
FD1: func() {
if (me.FCUworking) {
if (!fmgc.Output.fd1.getBoolValue()) {
fd1Input.setValue(1);
fmgc.Input.fd1.setValue(1);
} else {
fd1Input.setValue(0);
fmgc.Input.fd1.setValue(0);
}
}
},
FD2: func() {
if (me.FCUworking) {
if (!fmgc.Output.fd2.getBoolValue()) {
fd2Input.setValue(1);
fmgc.Input.fd2.setValue(1);
} else {
fd2Input.setValue(0);
fmgc.Input.fd2.setValue(0);
}
}
},

26
Nasal/FMGC/FMGC-b.nas
View file

@ -1043,7 +1043,31 @@ setlistener("/it-autoflight/input/vert", func() {
}
});
setlistener("/sim/signals/fdm-initialized", func() {
# Mode Reversions
setlistener(pts.Systems.Navigation.ADR.Output.overspeed, func(v) {
if (v.getBoolValue() and !Output.ap1.getBoolValue() and !Output.ap2.getBoolValue() and Output.athr.getBoolValue() and Modes.PFD.FMA.pitchMode.getValue() == "OP CLB" and Modes.PFD.FMA.throttle.getValue() == "THR CLB") {
Input.fd1.setValue(0);
Input.fd2.setValue(0);
ecam.aural[5].setBoolValue(0);
settimer(func() {
ecam.aural[5].setBoolValue(1);
}, 0.15);
}
}, 0, 0);
setlistener(pts.Systems.Navigation.ADR.Output.underspeed, func(v) {
if (v.getBoolValue() and !Output.ap1.getBoolValue() and !Output.ap2.getBoolValue() and Output.athr.getBoolValue() and Modes.PFD.FMA.pitchMode.getValue() == "OP DES" and Modes.PFD.FMA.throttle.getValue() == "THR IDLE") {
Input.fd1.setValue(0);
Input.fd2.setValue(0);
ecam.aural[5].setBoolValue(0);
settimer(func() {
ecam.aural[5].setBoolValue(1);
}, 0.15);
}
}, 0, 0);
setlistener("/sim/signals/fdm-initialized", func {
ITAF.init();
});

15
Nasal/Libraries/property-tree-setup.nas
View file

@ -295,6 +295,21 @@ var Sim = {
},
};
var Systems = {
Navigation: {
ADR: {
Output: {
overspeed: props.globals.getNode("/systems/navigation/adr/output/overspeed"),
underspeed: props.globals.getNode("/systems/navigation/adr/output/underspeed"),
},
},
},
Thrust: {
engOut: props.globals.getNode("/systems/thrust/eng-out"),
state: [props.globals.getNode("/systems/thrust/state1"), props.globals.getNode("/systems/thrust/state2")],
},
};
var Velocities = {
airspeedKt: props.globals.getNode("/velocities/airspeed-kt"),
groundspeedKt: props.globals.getNode("/velocities/groundspeed-kt"),

15
Sounds/A320-common-sound.xml
View file

@ -2001,6 +2001,21 @@
</volume>
</announcements>
<chime>
<name>Chime</name>
<path>Aircraft/A320-family/Sounds/Cockpit/click.wav</path>
<mode>once</mode>
<type>avionics</type>
<condition>
<property>/sim/sound/warnings/click</property>
</condition>
<volume>
<property>/sim/current-view/internal</property>
</volume>
<reference-dist>10</reference-dist>
<max-dist>100</max-dist>
</chime>
<chime>
<name>Chime</name>
<path>Aircraft/A320-family/Sounds/Cockpit/chime.wav</path>

32
Systems/a320-adr.xml
View file

@ -736,6 +736,33 @@
</function>
</fcs_function>
<switch name="/systems/navigation/adr/computation/underspeed-difference">
<default value="2"/>
<test logic="OR" value="19">
/controls/flight/speedbrake eq 1.0
</test>
</switch>
<fcs_function name="/systems/navigation/adr/computation/underspeed">
<function>
<ifthen>
<lt>
<max>
<property>/systems/navigation/adr/output/cas-1</property>
<property>/systems/navigation/adr/output/cas-2</property>
<property>/systems/navigation/adr/output/cas-3</property>
</max>
<difference>
<property>/FMGC/internal/vls-min</property>
<property>/systems/navigation/adr/computation/underspeed-difference</property>
</difference>
</lt>
<value>1</value>
<value>0</value>
</ifthen>
</function>
</fcs_function>
</channel>
<channel name="ADR Output" execrate="2"> <!-- todo - need lowpass? -->
@ -905,6 +932,11 @@
<gain>/systems/navigation/adr/any-adr-on</gain>
</pure_gain>
<pure_gain name="/systems/navigation/adr/output/underspeed">
<input>/systems/navigation/adr/computation/underspeed</input>
<gain>/systems/navigation/adr/any-adr-on</gain>
</pure_gain>
<pure_gain name="/instrumentation/radar-altimeter[0]/radar-altitude-ft-corrected">
<input>/instrumentation/radar-altimeter[0]/radar-altitude-ft</input>
<gain>1</gain>

1
Systems/a320-cfm56-5b4-engine-fadec.xml
View file

@ -1042,6 +1042,7 @@
<test logic="OR" value="0"> <!-- Reset -->
position/wow eq 1
/it-fbw/law ne 0
/FMGC/FCU-working eq 0
</test>
<test logic="AND" value="0"> <!-- Reset -->
fadec/eng-out eq 1

1
Systems/a320-v2527-a5-engine-fadec.xml
View file

@ -1501,6 +1501,7 @@
<test logic="OR" value="0"> <!-- Reset -->
position/wow eq 1
/it-fbw/law ne 0
/FMGC/FCU-working eq 0
fadec/control-1/n1-mode eq 1
fadec/control-2/n1-mode eq 1
</test>