fix(atsu): Fixes for NXApi-Freetext and CPDLC Logon-issues (#7174)

* fix the NXApi-Telex bug * show FBW if Hoppie is disabled * add UM0 as a possible reject * fix review finding
flybywiresim · May 9, 2022 · 6859812 · 6859812
1 parent 388a0a4
commit 6859812
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/...s/VCockpit/Instruments/Airliners/FlyByWire_A320_Neo/CDU/ATSU/A320_Neo_CDU_AOC_FreeText.js b/...s/VCockpit/Instruments/Airliners/FlyByWire_A320_Neo/CDU/ATSU/A320_Neo_CDU_AOC_FreeText.js
@@ -1,5 +1,5 @@
 class CDUAocFreeText {
-    static ShowPage(mcdu, store = { "msg_to": "", "reqID": 0, "msg_line1": "", "msg_line2": "", "msg_line3": "", "msg_line4": "", "sendStatus": ""}) {
+    static ShowPage(mcdu, store = { "msg_to": "", "reqID": SimVar.GetSimVarValue('L:A32NX_HOPPIE_ACTIVE', 'number') !== 0 ? 0 : 1, "msg_line1": "", "msg_line2": "", "msg_line3": "", "msg_line4": "", "sendStatus": ""}) {
         mcdu.clearDisplay();
         mcdu.page.Current = mcdu.page.AOCFreeText;
         const networkTypes = [

diff --git a/src/atsu/src/ATC.ts b/src/atsu/src/ATC.ts
@@ -351,7 +351,7 @@ export class Atc {
                 }
 
                 // logon rejected
-                if (response.Content?.TypeId === 'UM9996') {
+                if (response.Content?.TypeId === 'UM9996' || response.Content?.TypeId === 'UM0') {
                     response.DcduRelevantMessage = false;
                     this.dcduLink.setAtcLogonMessage('');
                     this.currentAtc = '';

diff --git a/src/atsu/src/com/webinterfaces/NXApiConnector.ts b/src/atsu/src/com/webinterfaces/NXApiConnector.ts
@@ -201,19 +201,20 @@ export class NXApiConnector {
             }
 
             // Fetch new messages
-            Telex.fetchMessages()
-                .then((data) => {
-                    for (const msg of data) {
-                        const message = new FreetextMessage();
-                        message.Network = AtsuMessageNetwork.FBW;
-                        message.Direction = AtsuMessageDirection.Uplink;
-                        message.Station = msg.from.flight;
-                        message.Message = msg.message.replace(/;/i, ' ');
-
-                        retval.push(message);
-                    }
-                })
-                .catch(() => [AtsuStatusCodes.ComFailed, retval]);
+            try {
+                const data = await Telex.fetchMessages();
+                for (const msg of data) {
+                    const message = new FreetextMessage();
+                    message.Network = AtsuMessageNetwork.FBW;
+                    message.Direction = AtsuMessageDirection.Uplink;
+                    message.Station = msg.from.flight;
+                    message.Message = msg.message.replace(/;/i, ' ');
+
+                    retval.push(message);
+                }
+            } catch (_e) {
+                return [AtsuStatusCodes.ComFailed, retval];
+            }
         }
 
         return [AtsuStatusCodes.Ok, retval];