fly/A320-family
1
0
Fork 0
Code Activity

Merge branch 'dev' into rework

Browse source
This commit is contained in:
Inuyaksa 2021-09-15 19:05:45 +02:00
commit 6dfeeac3cf
5 changed files with 102 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,26 +28,55 @@
<button>0</button> <button>0</button>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>controls/audio/acp[0]/int-rad</property>
<value>1</value>
<condition>
<not>
<equals>
<property>controls/audio/acp[0]/int-rad</property> <property>controls/audio/acp[0]/int-rad</property>
<value>2</value> <value>2</value>
</equals>
</not>
</condition>
</binding> </binding>
</action>
<action>
<button>1</button>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>controls/audio/acp[0]/int-rad</property> <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> </binding>
<mod-up> <mod-up>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>controls/audio/acp[0]/int-rad</property> <property>controls/audio/acp[0]/int-rad</property>
<value>0</value> <value>0</value>
<condition>
<not>
<equals>
<property>controls/audio/acp[0]/int-rad</property>
<value>2</value>
</equals>
</not>
</condition>
</binding> </binding>
</mod-up> </mod-up>
</action> </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>
<animation> <animation>
<type>rotate</type> <type>rotate</type>
<object-name>audio_int_rad</object-name> <object-name>audio_int_rad</object-name>

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

@ -28,26 +28,55 @@
<button>0</button> <button>0</button>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>controls/audio/acp[1]/int-rad</property>
<value>1</value>
<condition>
<not>
<equals>
<property>controls/audio/acp[1]/int-rad</property> <property>controls/audio/acp[1]/int-rad</property>
<value>2</value> <value>2</value>
</equals>
</not>
</condition>
</binding> </binding>
</action>
<action>
<button>1</button>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>controls/audio/acp[1]/int-rad</property> <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> </binding>
<mod-up> <mod-up>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>controls/audio/acp[1]/int-rad</property> <property>controls/audio/acp[1]/int-rad</property>
<value>0</value> <value>0</value>
<condition>
<not>
<equals>
<property>controls/audio/acp[1]/int-rad</property>
<value>2</value>
</equals>
</not>
</condition>
</binding> </binding>
</mod-up> </mod-up>
</action> </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>
<animation> <animation>
<type>rotate</type> <type>rotate</type>
<object-name>audio_int_rad</object-name> <object-name>audio_int_rad</object-name>

2
Nasal/Displays/DMC.nas
View file

@ -75,7 +75,7 @@ var DMController = {
# update DMC2 to correct properties for first officer PFD # 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].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].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; me._init = 1;
} }
}, },

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

@ -100,7 +100,7 @@ var highFrequencyRadio = {
} }
}, },
datalink: func() { datalink: func() {
if (me.powerNode.getValue() < 115) { if (me.powerNode.getValue() < 110) {
me.datalinkConnected = 0; me.datalinkConnected = 0;
return; return;
} }
@ -118,9 +118,10 @@ 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) # 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 = [ var update_items_HF_radio = [
props.UpdateManager.FromHashValue("elecACEssShed", 0.1, func(val) props.UpdateManager.FromHashValue("elecACEssShed", 0.2, func(val)
{ {
if (val < 110) { if (val < 110) {
if (HFS[0].receptionProp.getBoolValue()) {
HFS[0].transmit = 0; HFS[0].transmit = 0;
HFS[0].receptionProp.setValue(0); HFS[0].receptionProp.setValue(0);
toneTimer1.stop(); toneTimer1.stop();
@ -128,14 +129,18 @@ var update_items_HF_radio = [
HFS[0].toneControl.setValue(0); HFS[0].toneControl.setValue(0);
HFS[0]._toneTime = nil; HFS[0]._toneTime = nil;
ecam.transmitFlag1 = 0; ecam.transmitFlag1 = 0;
}
} else { } else {
if (!HFS[0].receptionProp.getBoolValue()) {
HFS[0].receptionProp.setValue(1); HFS[0].receptionProp.setValue(1);
} }
} }
}
), ),
props.UpdateManager.FromHashValue("elecAC2", 0.1, func(val) props.UpdateManager.FromHashValue("elecAC2", 0.2, func(val)
{ {
if (val) { if (val < 110) {
if (HFS[1].receptionProp.getBoolValue()) {
HFS[1].transmit = 0; HFS[1].transmit = 0;
HFS[1].receptionProp.setValue(0); HFS[1].receptionProp.setValue(0);
toneTimer2.stop(); toneTimer2.stop();
@ -143,10 +148,13 @@ var update_items_HF_radio = [
HFS[1].toneControl.setValue(0); HFS[1].toneControl.setValue(0);
HFS[1]._toneTime = nil; HFS[1]._toneTime = nil;
ecam.transmitFlag2 = 0; ecam.transmitFlag2 = 0;
}
} else { } else {
if (!HFS[1].receptionProp.getBoolValue()) {
HFS[1].receptionProp.setValue(1); HFS[1].receptionProp.setValue(1);
} }
} }
}
), ),
]; ];

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

@ -1634,6 +1634,7 @@
<hftone> <hftone>
<name>HF PTT tone</name> <name>HF PTT tone</name>
<mode>looped</mode> <mode>looped</mode>
<type>avionics</type>
<path>Aircraft/A320-family/Sounds/Cockpit/1000hz.wav</path> <path>Aircraft/A320-family/Sounds/Cockpit/1000hz.wav</path>
<condition> <condition>
<and> <and>
@ -1651,6 +1652,7 @@
<hftone> <hftone>
<name>HF PTT tone 2</name> <name>HF PTT tone 2</name>
<mode>looped</mode> <mode>looped</mode>
<type>avionics</type>
<path>Aircraft/A320-family/Sounds/Cockpit/1000hz.wav</path> <path>Aircraft/A320-family/Sounds/Cockpit/1000hz.wav</path>
<condition> <condition>
<and> <and>
@ -1668,6 +1670,7 @@
<hfstatic> <hfstatic>
<name>HF static</name> <name>HF static</name>
<mode>looped</mode> <mode>looped</mode>
<type>avionics</type>
<path>Aircraft/A320-family/Sounds/Cockpit/hf-radio-static.wav</path> <path>Aircraft/A320-family/Sounds/Cockpit/hf-radio-static.wav</path>
<condition> <condition>
<and> <and>
@ -1686,6 +1689,7 @@
<hfstatic> <hfstatic>
<name>HF static 2</name> <name>HF static 2</name>
<mode>looped</mode> <mode>looped</mode>
<type>avionics</type>
<path>Aircraft/A320-family/Sounds/Cockpit/hf-radio-static.wav</path> <path>Aircraft/A320-family/Sounds/Cockpit/hf-radio-static.wav</path>
<condition> <condition>
<and> <and>