Merge branch 'master' into feat/A380X/add-atccom-d-atis-page

flybywiresim · Jan 12, 2025 · d30172d · d30172d
2 parents 7b2dbe5 + 4e9c1f8
commit d30172d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -8,6 +8,3 @@
 # line endings.
 /fbw-a32nx/src/localization/flypad/*.json text eol=lf
 /fbw-a32nx/src/localization/msfs/*.locPak text eol=lf
-
-# try to deconflict changelog
-.github/CHANGELOG.md merge=union
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -117,6 +117,7 @@
 1. [A32NX/FWS] Fix autopilot instinctive disconnect button logic for 3D model - @flogross89 (floridude)
 1. [A380X/EFIS] Fix VV pb indicator not turning on when TRK-FPA mode is selected - @heclak (Heclak)
 1. [FMS] Transition altitude/level and RNP now come from navdata in MSFS2024 - @tracernz (Mike)
+1. [ATSU] Fixed issues with the ALL-CALLSIGNS recipient on Hoppie - @CronixZero (CronixZero)
 1. [A380X/MFD] Add ATCCOM D-ATIS page layout - @heclak (Heclak)
 
 ## 0.12.0

diff --git a/fbw-common/src/systems/datalink/router/src/webinterfaces/HoppieConnector.ts b/fbw-common/src/systems/datalink/router/src/webinterfaces/HoppieConnector.ts
@@ -43,13 +43,13 @@ export class HoppieConnector {
     const body = {
       logon: NXDataStore.get('CONFIG_HOPPIE_USERID', ''),
       from: 'FBWA32NX',
-      to: 'ALL-CALLSIGNS',
+      to: 'SERVER',
       type: 'ping',
       packet: '',
     };
 
     Hoppie.sendRequest(body).then((resp) => {
-      if (resp.response !== 'error {illegal logon code}') {
+      if (resp.response !== 'error {invalid logon code}') {
         SimVar.SetSimVarValue('L:A32NX_HOPPIE_ACTIVE', 'number', 1);
         console.log('Activated Hoppie ID');
       } else {
@@ -90,13 +90,13 @@ export class HoppieConnector {
     const body = {
       logon: NXDataStore.get('CONFIG_HOPPIE_USERID', ''),
       from: station,
-      to: 'ALL-CALLSIGNS',
+      to: 'SERVER',
       type: 'ping',
       packet: station,
     };
     const text = await Hoppie.sendRequest(body).then((resp) => resp.response);
 
-    if (text === 'error {callsign already in use}') {
+    if (text === 'error {callsign already in use}' || text.includes(station)) {
       return AtsuStatusCodes.CallsignInUse;
     }
     if (text.includes('error')) {
@@ -121,7 +121,7 @@ export class HoppieConnector {
     const body = {
       logon: NXDataStore.get('CONFIG_HOPPIE_USERID', ''),
       from: HoppieConnector.flightNumber,
-      to: 'ALL-CALLSIGNS',
+      to: 'SERVER', // Not needed as Hoppie ignores this field usually
       type: 'ping',
       packet: station,
     };

diff --git a/fbw-common/src/systems/instruments/src/EFB/Settings/Pages/AtsuAocPage.tsx b/fbw-common/src/systems/instruments/src/EFB/Settings/Pages/AtsuAocPage.tsx
@@ -36,12 +36,12 @@ export const AtsuAocPage = () => {
       const body = {
         logon: value,
         from: 'FBWA32NX',
-        to: 'ALL-CALLSIGNS',
+        to: 'SERVER',
         type: 'ping',
         packet: '',
       };
       return Hoppie.sendRequest(body).then((resp) => {
-        if (resp.response === 'error {illegal logon code}') {
+        if (resp.response === 'error {invalid logon code}') {
           reject(new Error(`Error: Unknown user ID: ${resp.response}`));
         } else {
           resolve(value);