diff --git a/Models/Instruments/DCDU/DCDU.nas b/Models/Instruments/DCDU/DCDU.nas index f84c7c23..ac1b20f4 100644 --- a/Models/Instruments/DCDU/DCDU.nas +++ b/Models/Instruments/DCDU/DCDU.nas @@ -16,6 +16,8 @@ var dcdu_test_time = props.globals.initNode("/instrumentation/du/dcdu-test-time" var dcdu_offtime = props.globals.initNode("/instrumentation/du/dcdu-off-time", 0.0, "DOUBLE"); var dcdu_test_amount = props.globals.initNode("/instrumentation/du/dcdu-test-amount", 0.0, "DOUBLE"); +# todo 16.5 watts + var canvas_DCDU_base = { init: func(canvas_group, file) { var font_mapper = func(family, weight) { @@ -117,7 +119,7 @@ var canvas_DCDU = { me["MessageTimeStamp"].hide(); me["RecallMode"].hide(); me["LinkLost"].hide(); - me["Recall"].hide(); + me["Recall"].show(); me["Close"].hide(); if (atsu.ADS.getCount() != me.cache.adsCount) { diff --git a/Nasal/Systems/Comm/CPDLC.nas b/Nasal/Systems/Comm/CPDLC.nas index e411cc98..be761d91 100644 --- a/Nasal/Systems/Comm/CPDLC.nas +++ b/Nasal/Systems/Comm/CPDLC.nas @@ -18,26 +18,29 @@ var CPDLCnewMsgLight = props.globals.initNode("/network/cpdlc/new-message-light" setlistener("/network/cpdlc/rx/new-message", func() { if (CPDLCnewMsgFlag.getBoolValue()) { # add to DCDU message buffer to display - ATCMSGRingCancel = 0; - ATCMSGRing(); + var messageType = 0; # urgent or normal + ATCMSGRing(messageType); ATCMsgFlashCancel = 0; ATCMSGFlash(); # ATC MSG pushbutton: flashes, ringtone after 15 secs, therafter every 15 secs # add DCDU prompts (wilco, etc) associated to message --> so the CPDLC message object must store the correct response for the actual message - CPDLCnewMsgFlag.setBoolValue(0); } -}, 0, 0); +}, 0, 1); var ATCMSGRingCancel = 0; -var ATCMSGRing = func() { - CPDLCnewMsgAlert.setBoolValue(0); +var ATCMSGRing = func(messageType) { + print("Going to ring"); settimer(func() { if (!ATCMSGRingCancel) { - CPDLCnewMsgAlert.setBoolValue(1); - ATCMSGRing(); + print("Rang, will ring 15 seconds later again"); + CPDLCnewMsgAlert.setBoolValue(0); + settimer(func() { + CPDLCnewMsgAlert.setBoolValue(1); + ATCMSGRing(messageType); + }, 0.1); } - }, 15); + }, (messageType == 0 ? 15 : 5)); }; var ATCMsgFlashCancel = 0; diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml index 26000189..35255b9d 100644 --- a/Sounds/A320-common-sound.xml +++ b/Sounds/A320-common-sound.xml @@ -1913,6 +1913,22 @@ + + ATC MSG + Aircraft/A320-family/Sounds/Cockpit/ATC-msg-ring.wav + once + avionics + + /network/cpdlc/new-message-ringtone + + + /sim/current-view/internal + 1.5 + + 10 + 100 + + Chime Aircraft/A320-family/Sounds/Cockpit/chime.wav @@ -1946,7 +1962,7 @@ 10 100 - + Cricket Aircraft/A320-family/Sounds/Cockpit/cricket.wav diff --git a/Sounds/Cockpit/ATC-msg-ring.wav b/Sounds/Cockpit/ATC-msg-ring.wav new file mode 100644 index 00000000..08091e7b Binary files /dev/null and b/Sounds/Cockpit/ATC-msg-ring.wav differ