fly/A320-family
1
0
Fork 0
Code Activity

Merge branch 'dev' into 3D

Browse source
This commit is contained in:
legoboyvdlp R 2021-09-16 13:02:37 +01:00
commit ed532804b5
15 changed files with 2124 additions and 2789 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
A320-main.xml
View file

@ -1930,6 +1930,11 @@
<pfd n="0">
<hundred-above type="int">99999</hundred-above>
<minimums type="int">99999</minimums>
<heading-deg type="double">0</heading-deg>
<heading-scale type="double">0</heading-scale>
<horizon-ground type="double">0</horizon-ground>
<horizon-pitch type="double">0</horizon-pitch>
<track-deg type="double">0</track-deg>
</pfd>
<radar-altimeter n="0">

4
AircraftConfig/acconfig.nas
View file

@ -61,12 +61,8 @@ setprop("/systems/acconfig/options/no-rendering-warn", 0);
setprop("/systems/acconfig/options/save-state", 0);
setprop("/systems/acconfig/options/hide-canvas-outside", 0);
setprop("/systems/acconfig/options/seperate-tiller-axis", 0);
setprop("/systems/acconfig/options/pfd-rate", 1);
setprop("/systems/acconfig/options/nd-rate", 1);
setprop("/systems/acconfig/options/dcdu-rate", 1);
setprop("/systems/acconfig/options/uecam-rate", 1);
setprop("/systems/acconfig/options/lecam-rate", 1);
setprop("/systems/acconfig/options/iesi-rate", 1);
setprop("/systems/acconfig/options/autopush/show-route", 1);
setprop("/systems/acconfig/options/autopush/show-wingtip", 1);
var main_dlg = gui.Dialog.new("/sim/gui/dialogs/acconfig/main/dialog", "Aircraft/A320-family/AircraftConfig/main.xml");

6
AircraftConfig/du-quality.xml
View file

@ -25,9 +25,7 @@
<command>nasal</command>
<script>
acconfig.writeSettings();
canvas_pfd.rateApply();
canvas_nd.rateApply();
canvas_ecam.l_rateApply();
</script>
</binding>
<binding>
@ -268,9 +266,7 @@
<command>nasal</command>
<script>
acconfig.writeSettings();
canvas_pfd.rateApply();
canvas_nd.rateApply();
canvas_ecam.l_rateApply();
</script>
</binding>
</button>
@ -282,9 +278,7 @@
<command>nasal</command>
<script>
acconfig.writeSettings();
canvas_pfd.rateApply();
canvas_nd.rateApply();
canvas_ecam.l_rateApply();
</script>
</binding>
<binding>

14
Models/FlightDeck/a320.flightdeck.xml
View file

@ -6609,16 +6609,10 @@
<property>controls/switches/annun-test</property>
<value>1</value>
</equals>
<and>
<equals>
<property>instrumentation/pfd/lights/autoland-armed</property>
<value>1</value>
</equals>
<equals>
<property>instrumentation/pfd/lights/autoland-on</property>
<value>1</value>
</equals>
</and>
<equals>
<property>instrumentation/pfd/lights/autoland-on</property>
<value>1</value>
</equals>
</or>
</condition>
</animation>

39
Models/Instruments/Audio/Audio1.xml
View file

@ -29,25 +29,54 @@
<binding>
<command>property-assign</command>
<property>controls/audio/acp[0]/int-rad</property>
<value>2</value>
<value>1</value>
<condition>
<not>
<equals>
<property>controls/audio/acp[0]/int-rad</property>
<value>2</value>
</equals>
</not>
</condition>
</binding>
</action>
<action>
<button>1</button>
<binding>
<command>property-assign</command>
<property>controls/audio/acp[0]/int-rad</property>
<value>1</value>
<value>0</value>
<condition>
<equals>
<property>controls/audio/acp[0]/int-rad</property>
<value>2</value>
</equals>
</condition>
</binding>
<mod-up>
<binding>
<command>property-assign</command>
<property>controls/audio/acp[0]/int-rad</property>
<value>0</value>
<condition>
<not>
<equals>
<property>controls/audio/acp[0]/int-rad</property>
<value>2</value>
</equals>
</not>
</condition>
</binding>
</mod-up>
</action>
<action>
<button>1</button>
<binding>
<command>property-cycle</command>
<property>controls/audio/acp[0]/int-rad</property>
<value>2</value>
<value>0</value>
</binding>
</action>
</animation>
<animation>
<type>rotate</type>
<object-name>audio_int_rad</object-name>

39
Models/Instruments/Audio/Audio2.xml
View file

@ -29,25 +29,54 @@
<binding>
<command>property-assign</command>
<property>controls/audio/acp[1]/int-rad</property>
<value>2</value>
<value>1</value>
<condition>
<not>
<equals>
<property>controls/audio/acp[1]/int-rad</property>
<value>2</value>
</equals>
</not>
</condition>
</binding>
</action>
<action>
<button>1</button>
<binding>
<command>property-assign</command>
<property>controls/audio/acp[1]/int-rad</property>
<value>1</value>
<value>0</value>
<condition>
<equals>
<property>controls/audio/acp[1]/int-rad</property>
<value>2</value>
</equals>
</condition>
</binding>
<mod-up>
<binding>
<command>property-assign</command>
<property>controls/audio/acp[1]/int-rad</property>
<value>0</value>
<condition>
<not>
<equals>
<property>controls/audio/acp[1]/int-rad</property>
<value>2</value>
</equals>
</not>
</condition>
</binding>
</mod-up>
</action>
<action>
<button>1</button>
<binding>
<command>property-cycle</command>
<property>controls/audio/acp[1]/int-rad</property>
<value>2</value>
<value>0</value>
</binding>
</action>
</animation>
<animation>
<type>rotate</type>
<object-name>audio_int_rad</object-name>

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

File diff suppressed because it is too large Load diff

2
Nasal/Displays/DMC.nas
View file

@ -75,7 +75,7 @@ var DMController = {
# update DMC2 to correct properties for first officer PFD
me.DMCs[1].altitudes = [props.globals.getNode("/systems/navigation/adr/output/baro-alt-corrected-1-fo", 1), props.globals.getNode("/systems/navigation/adr/output/baro-alt-corrected-2-fo", 1), props.globals.getNode("/systems/navigation/adr/output/baro-alt-corrected-3-fo", 1)];
me.DMCs[1].altitudesPfd = [props.globals.getNode("/instrumentation/altimeter[3]/indicated-altitude-ft-pfd", 1), props.globals.getNode("/instrumentation/altimeter[4]/indicated-altitude-ft-pfd", 1), props.globals.getNode("/instrumentation/altimeter[5]/indicated-altitude-ft-pfd", 1)];
me.DMCs[1].altitudeDiffs = [props.globals.getNode("//instrumentation/pfd/alt-diff[3]", 1), props.globals.getNode("//instrumentation/pfd/alt-diff[4]", 1), props.globals.getNode("//instrumentation/pfd/alt-diff[5]", 1)];
me.DMCs[1].altitudeDiffs = [props.globals.getNode("/instrumentation/pfd/alt-diff[3]", 1), props.globals.getNode("/instrumentation/pfd/alt-diff[4]", 1), props.globals.getNode("/instrumentation/pfd/alt-diff[5]", 1)];
me._init = 1;
}
},

4
Nasal/FMGC/FCU.nas
View file

@ -493,8 +493,8 @@ var FCUController = {
},
MetricAlt: func() {
if (me.FCUworking) {
canvas_pfd.PFD_1.showMetricAlt = !canvas_pfd.PFD_1.showMetricAlt;
canvas_pfd.PFD_2.showMetricAlt = !canvas_pfd.PFD_2.showMetricAlt;
canvas_pfd.A320PFD1.MainScreen.showMetricAlt = !canvas_pfd.A320PFD1.MainScreen.showMetricAlt;
canvas_pfd.A320PFD2.MainScreen.showMetricAlt = !canvas_pfd.A320PFD2.MainScreen.showMetricAlt;
}
},
};

50
Nasal/Systems/Comm/HF.nas
View file

@ -100,7 +100,7 @@ var highFrequencyRadio = {
}
},
datalink: func() {
if (me.powerNode.getValue() < 115) {
if (me.powerNode.getValue() < 110) {
me.datalinkConnected = 0;
return;
}
@ -118,33 +118,41 @@ var HFS = [highFrequencyRadio.new(systems.ELEC.Bus.acEssShed, 0), highFrequencyR
# Can't use setlistener on the voltage as it always gets written to by JSB (and changes according to engine rpm)
var update_items_HF_radio = [
props.UpdateManager.FromHashValue("elecACEssShed", 0.1, func(val)
props.UpdateManager.FromHashValue("elecACEssShed", 0.2, func(val)
{
if (val < 110) {
HFS[0].transmit = 0;
HFS[0].receptionProp.setValue(0);
toneTimer1.stop();
transmitTimer1.stop();
HFS[0].toneControl.setValue(0);
HFS[0]._toneTime = nil;
ecam.transmitFlag1 = 0;
if (HFS[0].receptionProp.getBoolValue()) {
HFS[0].transmit = 0;
HFS[0].receptionProp.setValue(0);
toneTimer1.stop();
transmitTimer1.stop();
HFS[0].toneControl.setValue(0);
HFS[0]._toneTime = nil;
ecam.transmitFlag1 = 0;
}
} else {
HFS[0].receptionProp.setValue(1);
if (!HFS[0].receptionProp.getBoolValue()) {
HFS[0].receptionProp.setValue(1);
}
}
}
),
props.UpdateManager.FromHashValue("elecAC2", 0.1, func(val)
props.UpdateManager.FromHashValue("elecAC2", 0.2, func(val)
{
if (val) {
HFS[1].transmit = 0;
HFS[1].receptionProp.setValue(0);
toneTimer2.stop();
transmitTimer2.stop();
HFS[1].toneControl.setValue(0);
HFS[1]._toneTime = nil;
ecam.transmitFlag2 = 0;
if (val < 110) {
if (HFS[1].receptionProp.getBoolValue()) {
HFS[1].transmit = 0;
HFS[1].receptionProp.setValue(0);
toneTimer2.stop();
transmitTimer2.stop();
HFS[1].toneControl.setValue(0);
HFS[1]._toneTime = nil;
ecam.transmitFlag2 = 0;
}
} else {
HFS[1].receptionProp.setValue(1);
if (!HFS[1].receptionProp.getBoolValue()) {
HFS[1].receptionProp.setValue(1);
}
}
}
),
@ -178,4 +186,4 @@ var transmitTimer1 = maketimer(1, func() {
var transmitTimer2 = maketimer(1, func() {
HFS[1].monitorPTT();
});
});

6
Nasal/Systems/hydraulics.nas
View file

@ -69,9 +69,9 @@ var HYD = {
},
init: func() {
me.resetFail();
me.Qty.blueInput.setValue(math.round((rand() * 2) + 6 , 0.1)); # Random between 6 and 8
me.Qty.greenInput.setValue(math.round((rand() * 4) + 14 , 0.1)); # Random between 14 and 18
me.Qty.yellowInput.setValue(math.round((rand() * 4) + 10 , 0.1)); # Random between 10 and 14
me.Qty.blueInput.setValue(8);
me.Qty.greenInput.setValue(16);
me.Qty.yellowInput.setValue(15);
me.Switch.blueElec.setValue(1);
me.Switch.blueElecOvrd.setValue(0);
me.Switch.greenEDP.setValue(1);

2
Nasal/emesary/exec.nas
View file

@ -30,7 +30,7 @@ var execLoop = func
emesary.GlobalTransmitter.NotifyAll(notifications.frameNotification);
notifications.frameNotification.FrameCount = notifications.frameNotification.FrameCount + 1;
frame_inc = 0.0333; #30 Hz
frame_inc = 0.02; #50 Hz
if (frame_inc != cur_frame_inc) {
cur_frame_inc = frame_inc;
}

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

@ -1021,7 +1021,7 @@
<factor>40.0</factor>
</volume>
</priority-left>
<priority-right>
<name>priority-right</name>
<mode>once</mode>
@ -1097,7 +1097,23 @@
<factor>40.0</factor>
</volume>
</dual-input>
<autolandwarning>
<name>autolandwarning-single</name>
<mode>once</mode>
<path>Aircraft/A320-family/Sounds/Cockpit/calvary-charge-once.wav</path>
<condition>
<equals>
<property>/instrumentation/pfd/logic/autoland/autoland-alarm</property>
<value>1</value>
</equals>
</condition>
<volume>
<property>/sim/current-view/internal</property>
<factor>40.0</factor>
</volume>
</autolandwarning>
<gear>
<name>gear0</name>
<mode>in-transit</mode>
@ -1706,6 +1722,7 @@
<hftone>
<name>HF PTT tone</name>
<mode>looped</mode>
<type>avionics</type>
<path>Aircraft/A320-family/Sounds/Cockpit/1000hz.wav</path>
<condition>
<and>
@ -1723,6 +1740,7 @@
<hftone>
<name>HF PTT tone 2</name>
<mode>looped</mode>
<type>avionics</type>
<path>Aircraft/A320-family/Sounds/Cockpit/1000hz.wav</path>
<condition>
<and>
@ -1740,6 +1758,7 @@
<hfstatic>
<name>HF static</name>
<mode>looped</mode>
<type>avionics</type>
<path>Aircraft/A320-family/Sounds/Cockpit/hf-radio-static.wav</path>
<condition>
<and>
@ -1758,6 +1777,7 @@
<hfstatic>
<name>HF static 2</name>
<mode>looped</mode>
<type>avionics</type>
<path>Aircraft/A320-family/Sounds/Cockpit/hf-radio-static.wav</path>
<condition>
<and>

71
Systems/a320-fwc.xml
View file

@ -2302,40 +2302,73 @@
</test>
</switch>
<switch name="/instrumentation/pfd/lights/autoland-armed">
<default value="0"/>
<test logic="OR" value="1">
<!-- /gear/gear[0]/wow eq 0 -->
<test logic="AND">
/modes/pfd/ILS1 eq 1
/instrumentation/radar-altimeter[0]/radar-altitude-ft-corrected le 200
</test>
<test logic="AND">
/modes/pfd/ILS2 eq 1
/instrumentation/radar-altimeter[1]/radar-altitude-ft-corrected le 200
</test>
<!-- /instrumentation/radar-altimeter[1]/radar-altitude-ft-corrected le 200 -->
</test>
</switch>
<switch name="/instrumentation/pfd/lights/autoland-on">
<switch name="/instrumentation/pfd/logic/autoland/autoland-armed">
<default value="0"/>
<test logic="AND" value="1">
/instrumentation/pfd/lights/autoland-armed eq 1
<test logic="OR">
/systems/electrical/bus/ac-2 ge 110
/systems/electrical/bus/ac-ess-shed ge 110
</test>
<test logic="OR">
<test logic="AND">
/modes/pfd/ILS1 eq 1
/instrumentation/radar-altimeter[0]/radar-altitude-ft-corrected lt 200
</test>
<test logic="AND">
/modes/pfd/ILS2 eq 1
/instrumentation/radar-altimeter[1]/radar-altitude-ft-corrected lt 200
</test>
</test>
</test>
</switch>
<switch name="/instrumentation/pfd/logic/autoland/autoland-alarm">
<default value="0"/>
<test logic="AND" value="1">
/instrumentation/pfd/logic/autoland/autoland-armed eq 1
/instrumentation/pfd/logic/autoland/pitch-land eq 1
<test logic="OR">
<test logic="AND">
/it-autoflight/output/ap1 eq 0
/it-autoflight/output/ap2 eq 0
</test>
/instrumentation/radar-altimeter-difference-ft gt 15
<test logic="AND">
<test logic="OR">
/instrumentation/nav[0]/gs-needle-deflection-norm gt 0.5
/instrumentation/nav[0]/gs-needle-deflection-norm lt -0.5
</test>
/position/gear-agl-ft ge 100
</test>
<test logic="AND">
<test logic="OR">
/instrumentation/nav[0]/heading-needle-deflection-norm gt 0.125
/instrumentation/nav[0]/heading-needle-deflection-norm lt -0.125
</test>
/position/gear-agl-ft ge 15
</test>
<!-- TODO
- Localizer deviation excessive
- Loss of localizer signal
-->
</test>
</test>
</switch>
<switch name="/instrumentation/pfd/lights/autoland-on">
<default value="0"/>
<test logic="OR" value="1">
<test logic="AND">
/instrumentation/pfd/logic/autoland/autoland-alarm eq 1
/instrumentation/pfd/logic/autoland/autoland-sw-pulse eq 1
</test>
<test logic="AND">
/instrumentation/pfd/logic/autoland/autoland-alarm eq 1
/it-autoflight/output/ap-warning ge 1
/ECAM/warnings/master-warning-flash eq 1
</test>
</test>
</switch>
</channel>
<channel name="ENG" execrate="16">

2
Systems/a320-lights.xml
View file

@ -180,7 +180,7 @@
/systems/electrical/bus/ac-2 ge 110
</test>
<test logic="OR">
/controls/flight/slats-cmd ge 0
fcs/flap-pos-deg ge 15
/gear/gear[2]/wow eq 1
</test>
</test>