From bf4356406cabbf9f2bfd53e928fbdda3c78ccf23 Mon Sep 17 00:00:00 2001 From: merspieler Date: Mon, 19 Nov 2018 18:46:27 +0100 Subject: [PATCH] First part of ACP fixes. On ACP1 only at this moment Signed-off-by: merspieler --- Models/FlightDeck/a320.flightdeck.xml | 15 - Models/Instruments/Audio/Audio1.xml | 1421 ++++++++++++++++++++++++- 2 files changed, 1420 insertions(+), 16 deletions(-) diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index f8143cc8..1ba33844 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -4765,21 +4765,6 @@ mcdu_glare radio_glare audio_glare - audio_vhf1_glare - audio_vhf2_glare - audio_vhf3_glare - audio_hf1_glare - audio_hf2_glare - audio_int_glare - audio_cab_glare - audio_pa_rot_glare - audio_vor1_glare - audio_vor2_glare - audio_mkr_glare - audio_ils_glare - audio_mls_glare - audio_adf1_glare - audio_adf2_glare audio_int_rad.mark vu111_glare vu112_glare diff --git a/Models/Instruments/Audio/Audio1.xml b/Models/Instruments/Audio/Audio1.xml index 2fcc64eb..52e1a0f2 100644 --- a/Models/Instruments/Audio/Audio1.xml +++ b/Models/Instruments/Audio/Audio1.xml @@ -9,6 +9,941 @@ res/Audio1.ac + + + + pick + audio_int_rad + audio_int_rad.mark + + + + property-assign + controls/audio/acp[0]/int-rad + 2 + + + + + + property-assign + controls/audio/acp[0]/int-rad + 1 + + + + property-assign + controls/audio/acp[0]/int-rad + 0 + + + + + + rotate + audio_int_rad + audio_int_rad.mark + controls/audio/acp[0]/int-rad + + + 0 + 0 + + + 1 + -20 + + + 2 + 20 + + + + audio_int_rad.axis + + + + + + pick + audio_pa + + + + property-assign + systems/audio/acp[0]/pa + 1 + + + + property-assign + systems/audio/acp[0]/pa + 0 + + + + + + select + audio_pa_led + + + + controls/switches/annun-test + 1 + + + + systems/electrical/bus/dc-ess + 25 + + + systems/audio/acp[0]/pa + 1 + + + + + + + + + pick + audio_call_vhf1 + + + false + + property-assign + systems/audio/acp[0]/call_chan + vhf1 + + + systems/electrical/bus/dc-ess + 25 + + + + + + + + + pick + audio_call_vhf2 + + + false + + property-assign + systems/audio/acp[0]/call_chan + vhf2 + + + systems/electrical/bus/dc-ess + 25 + + + + + + + + + pick + audio_call_vhf3 + + + false + + property-assign + systems/audio/acp[0]/call_chan + vhf3 + + + systems/electrical/bus/dc-ess + 25 + + + + + + + + + pick + audio_call_hf1 + + + false + + property-assign + systems/audio/acp[0]/call_chan + hf1 + + + systems/electrical/bus/dc-ess + 25 + + + + + + + + + pick + audio_call_hf2 + + + false + + property-assign + systems/audio/acp[0]/call_chan + hf2 + + + systems/electrical/bus/dc-ess + 25 + + + + + + + + + pick + audio_mech + + + false + + property-assign + systems/audio/acp[0]/call_chan + mech + + + systems/electrical/bus/dc-ess + 25 + + + + + + + + + pick + audio_att + + + false + + property-assign + systems/audio/acp[0]/call_chan + att + + + systems/electrical/bus/dc-ess + 25 + + + + + + + + + pick + audio_voice + + + false + + property-toggle + systems/audio/acp[0]/on_voice + + + systems/electrical/bus/dc-ess + 25 + + + + + + + + + pick + audio_vhf1 + audio_vhf1_glare + + + false + + + property-toggle + controls/audio/acp[0]/vhf1-recive + + + + + true + + + property-adjust + controls/audio/acp[0]/vhf1-volume + 0.05 + 0 + 1 + false + + + + + true + + + property-adjust + controls/audio/acp[0]/vhf1-volume + -0.05 + 0 + 1 + false + + + + + + pick + audio_vhf2 + + + false + + + property-toggle + controls/audio/acp[0]/vhf2-recive + + + + + true + + + property-adjust + controls/audio/acp[0]/vhf2-volume + 0.05 + 0 + 1 + false + + + + + true + + + property-adjust + controls/audio/acp[0]/vhf2-volume + -0.05 + 0 + 1 + false + + + + + + pick + audio_vhf3 + + + false + + + property-toggle + controls/audio/acp[0]/vhf3-recive + + + + + true + + + property-adjust + controls/audio/acp[0]/vhf3-volume + 0.05 + 0 + 1 + false + + + + + true + + + property-adjust + controls/audio/acp[0]/vhf3-volume + -0.05 + 0 + 1 + false + + + + + + pick + audio_hf1 + + + false + + + property-toggle + controls/audio/acp[0]/hf1-recive + + + + + true + + + property-adjust + controls/audio/acp[0]/hf1-volume + 0.05 + 0 + 1 + false + + + + + true + + + property-adjust + controls/audio/acp[0]/hf1-volume + -0.05 + 0 + 1 + false + + + + + + pick + audio_hf2 + + + false + + + property-toggle + controls/audio/acp[0]/hf2-recive + + + + + true + + + property-adjust + controls/audio/acp[0]/hf2-volume + 0.05 + 0 + 1 + false + + + + + true + + + property-adjust + controls/audio/acp[0]/hf2-volume + -0.05 + 0 + 1 + false + + + + + + pick + audio_int + + + false + + + property-toggle + controls/audio/acp[0]/int-recive + + + + + true + + + property-adjust + controls/audio/acp[0]/int-volume + 0.05 + 0 + 1 + false + + + + + true + + + property-adjust + controls/audio/acp[0]/int-volume + -0.05 + 0 + 1 + false + + + + + + pick + audio_cab + + + false + + + property-toggle + controls/audio/acp[0]/cab-recive + + + + + true + + + property-adjust + controls/audio/acp[0]/cab-volume + 0.05 + 0 + 1 + false + + + + + true + + + property-adjust + controls/audio/acp[0]/cab-volume + -0.05 + 0 + 1 + false + + + + + + pick + audio_pa_rot + + + false + + + property-toggle + controls/audio/acp[0]/pa-recive + + + + + true + + + property-adjust + controls/audio/acp[0]/pa-volume + 0.05 + 0 + 1 + false + + + + + true + + + property-adjust + controls/audio/acp[0]/pa-volume + -0.05 + 0 + 1 + false + + + + + + pick + audio_vor1 + + + false + + + property-toggle + controls/audio/acp[0]/vor1-recive + + + + + true + + + property-adjust + controls/audio/acp[0]/vor1-volume + 0.05 + 0 + 1 + false + + + + + true + + + property-adjust + controls/audio/acp[0]/vor1-volume + -0.05 + 0 + 1 + false + + + + + + pick + audio_vor2 + + + false + + + property-toggle + controls/audio/acp[0]/vor2-recive + + + + + true + + + property-adjust + controls/audio/acp[0]/vor2-volume + 0.05 + 0 + 1 + false + + + + + true + + + property-adjust + controls/audio/acp[0]/vor2-volume + -0.05 + 0 + 1 + false + + + + + + pick + audio_mkr + + + false + + + property-toggle + controls/audio/acp[0]/mkr-recive + + + + + true + + + property-adjust + controls/audio/acp[0]/mkr-volume + 0.05 + 0 + 1 + false + + + + + true + + + property-adjust + controls/audio/acp[0]/mkr-volume + -0.05 + 0 + 1 + false + + + + + + pick + audio_ils + + + false + + + property-toggle + controls/audio/acp[0]/ils-recive + + + + + true + + + property-adjust + controls/audio/acp[0]/ils-volume + 0.05 + 0 + 1 + false + + + + + true + + + property-adjust + controls/audio/acp[0]/ils-volume + -0.05 + 0 + 1 + false + + + + + + pick + audio_mls + + + false + + + property-toggle + controls/audio/acp[0]/mls-recive + + + + + true + + + property-adjust + controls/audio/acp[0]/mls-volume + 0.05 + 0 + 1 + false + + + + + true + + + property-adjust + controls/audio/acp[0]/mls-volume + -0.05 + 0 + 1 + false + + + + + + pick + audio_adf1 + + + false + + + property-toggle + controls/audio/acp[0]/adf1-recive + + + + + true + + + property-adjust + controls/audio/acp[0]/adf1-volume + 0.05 + 0 + 1 + false + + + + + true + + + property-adjust + controls/audio/acp[0]/adf1-volume + -0.05 + 0 + 1 + false + + + + + + pick + audio_adf2 + + + false + + + property-toggle + controls/audio/acp[0]/adf2-recive + + + + + true + + + property-adjust + controls/audio/acp[0]/adf2-volume + 0.05 + 0 + 1 + false + + + + + true + + + property-adjust + controls/audio/acp[0]/adf2-volume + -0.05 + 0 + 1 + false + + + + + + + select + audio_vhf1_led + + + + controls/switches/annun-test + 1 + + + + systems/electrical/bus/dc-ess + 25 + + + systems/audio/acp[0]/call_chan + vhf1 + + + + + + + + select + audio_vhf2_led + + + + controls/switches/annun-test + 1 + + + + systems/electrical/bus/dc-ess + 25 + + + systems/audio/acp[0]/call_chan + vhf2 + + + + + + + + select + audio_vhf3_led + + + + controls/switches/annun-test + 1 + + + + systems/electrical/bus/dc-ess + 25 + + + systems/audio/acp[0]/call_chan + vhf3 + + + + + Panel lighting @@ -21,10 +956,494 @@ sim/model/lights/dome-light - + Aircraft/IDG-A32X/Models/Effects/cockpit-irradiance audio_body audio_glare + + + select + audio_hf2_led + + + + controls/switches/annun-test + 1 + + + + systems/electrical/bus/dc-ess + 25 + + + systems/audio/acp[0]/call_chan + hf2 + + + + + + + + select + audio_mech_led + + + + controls/switches/annun-test + 1 + + + + systems/electrical/bus/dc-ess + 25 + + + systems/audio/acp[0]/call_chan + mech + + + + + + + + select + audio_att_led + + + + controls/switches/annun-test + 1 + + + + systems/electrical/bus/dc-ess + 25 + + + systems/audio/acp[0]/call_chan + att + + + + + + + + + select + audio_voice_led + + + + controls/switches/annun-test + 1 + + + + systems/electrical/bus/dc-ess + 25 + + + systems/audio/acp[0]/on_voice + 1 + + + + + + + + + translate + audio_vhf1 + audio_vhf1_glare + controls/audio/acp[0]/vhf1-recive + 0.01 + + 0 + 0 + 1 + + + + rotate + audio_vhf1 + audio_vhf1_glare + controls/audio/acp[0]/vhf1-volume + + 0-129 + 1129 + + + audio_vhf1.axis + + + + + translate + audio_vhf2 + audio_vhf2_glare + controls/audio/acp[0]/vhf2-recive + 0.01 + + 0 + 0 + 1 + + + + rotate + audio_vhf2 + audio_vhf2_glare + controls/audio/acp[0]/vhf2-volume + + 0-129 + 1129 + + + audio_vhf2.axis + + + + + translate + audio_vhf3 + audio_vhf3_glare + controls/audio/acp[0]/vhf3-recive + 0.01 + + 0 + 0 + 1 + + + + rotate + audio_vhf3 + audio_vhf3_glare + controls/audio/acp[0]/vhf3-volume + + 0-129 + 1129 + + + audio_vhf3.axis + + + + + translate + audio_hf1 + audio_hf1_glare + controls/audio/acp[0]/hf1-recive + 0.01 + + 0 + 0 + 1 + + + + rotate + audio_hf1 + audio_hf1_glare + controls/audio/acp[0]/hf1-volume + + 0-129 + 1129 + + + audio_hf1.axis + + + + + translate + audio_hf2 + audio_hf2_glare + controls/audio/acp[0]/hf2-recive + 0.01 + + 0 + 0 + 1 + + + + rotate + audio_hf2 + audio_hf2_glare + controls/audio/acp[0]/hf2-volume + + 0-129 + 1129 + + + audio_hf2.axis + + + + + translate + audio_int + audio_int_glare + controls/audio/acp[0]/int-recive + 0.01 + + 0 + 0 + 1 + + + + rotate + audio_int + audio_int_glare + controls/audio/acp[0]/int-volume + + 0-129 + 1129 + + + audio_int.axis + + + + + translate + audio_cab + audio_cab_glare + controls/audio/acp[0]/cab-recive + 0.01 + + 0 + 0 + 1 + + + + rotate + audio_cab + audio_cab_glare + controls/audio/acp[0]/cab-volume + + 0-129 + 1129 + + + audio_cab.axis + + + + + translate + audio_pa_rot + audio_pa_glare + controls/audio/acp[0]/pa-recive + 0.01 + + 0 + 0 + 1 + + + + rotate + audio_pa_rot + audio_pa_glare + controls/audio/acp[0]/pa-volume + + 0-129 + 1129 + + + audio_pa_rot.axis + + + + + translate + audio_vor1 + audio_vor1_glare + controls/audio/acp[0]/vor1-recive + 0.01 + + 0 + 0 + 1 + + + + rotate + audio_vor1 + audio_vor1_glare + controls/audio/acp[0]/vor1-volume + + 0-129 + 1129 + + + audio_vor1.axis + + + + + translate + audio_vor2 + audio_vor2_glare + controls/audio/acp[0]/vor2-recive + 0.01 + + 0 + 0 + 1 + + + + rotate + audio_vor2 + audio_vor2_glare + controls/audio/acp[0]/vor2-volume + + 0-129 + 1129 + + + audio_vor2.axis + + + + + translate + audio_mkr + audio_mkr_glare + controls/audio/acp[0]/mkr-recive + 0.01 + + 0 + 0 + 1 + + + + rotate + audio_mkr + audio_mkr_glare + controls/audio/acp[0]/mkr-volume + + 0-129 + 1129 + + + audio_mkr.axis + + + + + translate + audio_ils + audio_ils_glare + controls/audio/acp[0]/ils-recive + 0.01 + + 0 + 0 + 1 + + + + rotate + audio_ils + audio_ils_glare + controls/audio/acp[0]/ils-volume + + 0-129 + 1129 + + + audio_ils.axis + + + + + translate + audio_mls + audio_mls_glare + controls/audio/acp[0]/mls-recive + 0.01 + + 0 + 0 + 1 + + + + rotate + audio_mls + audio_mls_glare + controls/audio/acp[0]/mls-volume + + 0-129 + 1129 + + + audio_mls.axis + + + + + translate + audio_adf1 + audio_adf1_glare + controls/audio/acp[0]/adf1-recive + 0.01 + + 0 + 0 + 1 + + + + rotate + audio_adf1 + audio_adf1_glare + controls/audio/acp[0]/adf1-volume + + 0-129 + 1129 + + + audio_adf1.axis + + + + + translate + audio_adf2 + audio_adf2_glare + controls/audio/acp[0]/adf2-recive + 0.01 + + 0 + 0 + 1 + + + + rotate + audio_adf2 + audio_adf2_glare + controls/audio/acp[0]/adf2-volume + + 0-129 + 1129 + + + audio_adf2.axis + +