chore: typescript port

flybywiresim · Feb 4, 2025 · 1238b19 · 1238b19
1 parent c4e6300
commit 1238b19
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/fbw-a32nx/src/systems/instruments/src/MCDU/legacy/A32NX_FMCMainDisplay.ts b/fbw-a32nx/src/systems/instruments/src/MCDU/legacy/A32NX_FMCMainDisplay.ts
@@ -2097,10 +2097,11 @@ export abstract class FMCMainDisplay implements FmsDataInterface, FmsDisplayInte
       }
     }
     if (tempString) {
-      const temp = parseInt(tempString.replace('M', '-'));
-      console.log('tS: ' + tempString);
-      console.log('ti: ' + temp);
+      let temp = parseInt(tempString);
       if (isFinite(temp) && this.cruiseLevel) {
+        if (!tempString.startsWith('+') && !tempString.startsWith('-')) {
+          temp = -temp;
+        }
         if (temp > -270 && temp < 100) {
           this.cruiseTemperature = temp;
           return true;

diff --git a/fbw-a32nx/src/systems/instruments/src/MCDU/legacy_pages/A320_Neo_CDU_InitPage.ts b/fbw-a32nx/src/systems/instruments/src/MCDU/legacy_pages/A320_Neo_CDU_InitPage.ts
@@ -139,10 +139,14 @@ export class CDUInitPage {
         if (mcdu.cruiseLevel) {
           cruiseFl.update('FL' + mcdu.cruiseLevel.toFixed(0).padStart(3, '0'), Column.cyan);
           if (mcdu.cruiseTemperature) {
-            cruiseTemp.update(mcdu.cruiseTemperature.toFixed(0) + '°', Column.cyan);
+            cruiseTemp.update(CDUInitPage.formatTemperature(mcdu.cruiseTemperature), Column.cyan);
             cruiseFlTempSeparator.updateAttributes(Column.cyan);
           } else {
-            cruiseTemp.update(mcdu.tempCurve.evaluate(mcdu.cruiseLevel).toFixed(0) + '°', Column.cyan, Column.small);
+            cruiseTemp.update(
+              CDUInitPage.formatTemperature(Math.trunc(mcdu.tempCurve.evaluate(mcdu.cruiseLevel))),
+              Column.cyan,
+              Column.small,
+            );
             cruiseFlTempSeparator.updateAttributes(Column.cyan, Column.small);
           }
         }
@@ -265,7 +269,7 @@ export class CDUInitPage {
     const groundTemp = new Column(23, '---°', Column.right);
     if (mcdu.groundTemp !== undefined) {
       groundTemp.update(
-        mcdu.groundTemp.toFixed(0) + '°',
+        CDUInitPage.formatTemperature(mcdu.groundTemp),
         Column.cyan,
         mcdu.groundTempPilot !== undefined ? Column.big : Column.small,
       );
@@ -785,4 +789,8 @@ export class CDUInitPage {
   static formatWindComponent(tailwindComponent) {
     return Math.round(Math.abs(tailwindComponent)).toFixed(0).padStart(3, '0');
   }
+
+  static formatTemperature(temperature: number): string {
+    return (temperature > 0 ? '+' : '') + temperature.toFixed(0) + '°';
+  }
 }