feat(engine): rework engine model and payload

headwindsim · Sep 18, 2023 · 90c6af6 · 90c6af6
1 parent 9b7e55d
commit 90c6af6
Show file tree

Hide file tree

Showing 51 changed files with 18,239 additions and 5,838 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -144,7 +144,9 @@
     "__functional_03": "cpp",
     "memory_resource": "cpp",
     "numbers": "cpp",
-    "xmemory0": "cpp"
+    "xmemory0": "cpp",
+    "span": "cpp",
+    "ranges": "cpp"
   },
   "typescript.preferences.quoteStyle": "single",
   "typescript.preferences.importModuleSpecifier": "non-relative"

diff --git a/...se/headwindsim-aircraft-a330-900/SimObjects/Airplanes/Headwind_ACJ330_900/panel/panel.cfg b/...se/headwindsim-aircraft-a330-900/SimObjects/Airplanes/Headwind_ACJ330_900/panel/panel.cfg
@@ -122,7 +122,7 @@ size_mm = 1430,1000
 pixel_size = 1430,1000
 texture = $EFB
 
-htmlgauge00 = ACJ339X/EFB/efb.html, 0,0,1430,1000
+htmlgauge00 = ACJ339X/EFB/efb.html?Airframe=ACJ330_941, 0,0,1430,1000
 
 [VCockpit17]
 size_mm = 0,0

diff --git a/hdw-a339x-acj/src/systems/instruments/src/EFB/Ground/Pages/Payload/Payload.tsx b/hdw-a339x-acj/src/systems/instruments/src/EFB/Ground/Pages/Payload/Payload.tsx
diff --git a/...39x-acj/src/wasm/fadec_a320/CMakeList.txt → ...39x-acj/src/wasm/fadec_a330/CMakeList.txt b/...39x-acj/src/wasm/fadec_a320/CMakeList.txt → ...39x-acj/src/wasm/fadec_a330/CMakeList.txt
diff --git a/hdw-a339x-acj/src/wasm/fadec_a320/build.sh → hdw-a339x-acj/src/wasm/fadec_a330/build.sh b/hdw-a339x-acj/src/wasm/fadec_a320/build.sh → hdw-a339x-acj/src/wasm/fadec_a330/build.sh
diff --git a/...j/src/wasm/fadec_a320/src/EngineControl.h → ...j/src/wasm/fadec_a330/src/EngineControl.h b/...j/src/wasm/fadec_a320/src/EngineControl.h → ...j/src/wasm/fadec_a330/src/EngineControl.h
diff --git a/hdw-a339x-acj/src/wasm/fadec_a330/src/FadecGauge.cpp b/hdw-a339x-acj/src/wasm/fadec_a330/src/FadecGauge.cpp
@@ -0,0 +1,32 @@
+#include "FadecGauge.h"
+
+FadecGauge FADEC_GAUGE;
+
+__attribute__((export_name("FadecGauge_gauge_callback"))) extern "C" bool FadecGauge_gauge_callback(FsContext ctx,
+                                                                                                    int service_id,
+                                                                                                    void* pData) {
+  switch (service_id) {
+    case PANEL_SERVICE_PRE_INSTALL: {
+      return true;
+    } break;
+    case PANEL_SERVICE_POST_INSTALL: {
+      return FADEC_GAUGE.initializeFADEC();
+    } break;
+    case PANEL_SERVICE_PRE_DRAW: {
+      /* Start updating the engines only if all needed data was fetched */
+      /* Due to the data fetching feature from the sim being available at this stage only (from what I have observed) */
+      /* Event SIMCONNECT_RECV_ID_OPEN received after the first PANEL_SERVICE_POST_INSTALL */
+      if (FADEC_GAUGE.isReady()) {
+        sGaugeDrawData* drawData = static_cast<sGaugeDrawData*>(pData);
+        return FADEC_GAUGE.onUpdate(drawData->dt);
+      } else {
+        return FADEC_GAUGE.fetchNeededData();
+      }
+    } break;
+    case PANEL_SERVICE_PRE_KILL: {
+      FADEC_GAUGE.killFADEC();
+      return true;
+    } break;
+  }
+  return false;
+}