Setting of payload

PackageSources/wasm-module/load-manager.cpp

@@ -500,6 +500,28 @@ int receiveData(const char* buf) {
                 }
                 break;
             }
+            // Trigger load
+            case 3: {
+                if (UserData->isCargo) {
+                    
+                }
+                else {
+                    load(targetPaxPayloadData, simConnect, UserData->isImperial);
+                }
+
+                break;
+            }
+            // Trigger unload
+            case 4: {
+                if (UserData->isCargo) {
+                    
+                }
+                else {
+                    unload(simConnect, UserData->isImperial);
+                }
+
+                break;
+            }
             default:
                 break;
         }

PackageSources/wasm-module/load-manager.h

@@ -12,8 +12,6 @@
 
 #include <MSFS/MSFS.h>
 #include <MSFS/MSFS_CommBus.h>
-#include <MSFS/MSFS_Core.h>
-#include <MSFS/MSFS_Render.h>
 #include <MSFS/Legacy/gauges.h>
 
 #include <rapidjson/document.h>
@@ -29,25 +27,6 @@
 #define COMM_BUS_LIVE_DATA_EVENT "khofmann_tfdi_md-11_load_manager_live_data"
 #define COMM_BUS_UPDATE_TARGET_EVENT "khofmann_tfdi_md-11_load_manager_update_target"
 
-// SimConnect ENUMs
-enum DATA_DEFINITIONS {
-    DATA_DEFINITION_EMPTY_WEIGHT,
-    DATA_DEFINITION_PAYLOAD_PAX,
-    DATA_DEFINITION_PAYLOAD_F,
-    DATA_DEFINITION_FUEL,
-    DATA_DEFINITION_GSX,
-    DATA_DEFINITION_USER_DATA,
-};
-
-enum DATA_REQUESTS {
-    DATA_REQUEST_EMPTY_WEIGHT,
-    DATA_REQUEST_PAYLOAD_PAX,
-    DATA_REQUEST_PAYLOAD_F,
-    DATA_REQUEST_FUEL,
-    DATA_REQUEST_GSX,
-    DATA_REQUEST_USER_DATA,
-};
-
 void commBusUpdateTargetCallback(const char* args, unsigned int size, void* ctx);
 int receiveData(const char* buf);
 void sendData();

PackageSources/wasm-module/pax.cpp

@@ -5,13 +5,13 @@ void distribute(paxPayloadData_t* const targetPayload, const FuelData_t* const f
     // Find payload, num pax and extra cargo
     double payload = ZFWTarget - targetPayload->empty - targetPayload->pilot - targetPayload->firstOfficer - targetPayload->engineer -
                      targetPayload->cabinCrewFront - targetPayload->cabinCrewRear - targetPayload->leftAux - targetPayload->rightAux;
-    unsigned short numPax = std::max(0.0, std::min((double)MAX_PAX, floor(payload / (PAX_WEIGHT(isImperial) + BAG_WEIGHT(isImperial)))));
+    unsigned short numPax = max(0.0, min((double)MAX_PAX, floor(payload / (PAX_WEIGHT(isImperial) + BAG_WEIGHT(isImperial)))));
     unsigned int cargo = round(payload - numPax * PAX_WEIGHT(isImperial) - numPax * BAG_WEIGHT(isImperial));
 
     distribute(targetPayload, fuel, numPax, cargo, isImperial);
 }
 
-//SimBrief Entry, SB pax count and total cargo
+//SimBrief Entry, SB pax count and extra cargo
 void distribute(paxPayloadData_t* const targetPayload, const FuelData_t* const fuel, unsigned short numPax, unsigned int cargo, const bool isImperial) {
     // Clear
     targetPayload->paxCount.business1 = targetPayload->paxCount.business2 = targetPayload->paxCount.economy1 = targetPayload->paxCount.economy2 =
@@ -288,4 +288,19 @@ void calculateCGs(const paxPayloadData_t* const targetPayload, const FuelData_t*
     totalWeight += fuel->total;
 
     *TOCG = TO_PERCENT_MAC(totalMoment / totalWeight);
-}
+}
+
+
+void load(const paxPayloadData_t* const targetPayload, const HANDLE simConnect, const bool isImperial) {
+    paxPayloadData_t localPayload = {};
+    memcpy(&localPayload, targetPayload, sizeof(localPayload));
+    normalisePayload(&localPayload, isImperial);
+
+    SimConnect_SetDataOnSimObject(simConnect, DATA_DEFINITION_PAYLOAD_PAX, SIMCONNECT_OBJECT_ID_USER, 0, 0, sizeof(paxPayloadDataSet_t), &localPayload);
+}
+
+void unload(const HANDLE simConnect, const bool isImperial) {
+    paxPayloadDataSet_t localPayload = {};
+
+    SimConnect_SetDataOnSimObject(simConnect, DATA_DEFINITION_PAYLOAD_PAX, SIMCONNECT_OBJECT_ID_USER, 0, 0, sizeof(localPayload), &localPayload);
+}

PackageSources/wasm-module/pax.h

@@ -10,10 +10,14 @@
 #	define __restrict__
 #endif
 
+#include <MSFS/MSFS_WindowsTypes.h>
+
 #include <math.h>
 
 #include <algorithm>
 
+#include <SimConnect.h>
+
 #include "types.h"
 
 //ZFW Entry, fill pax first (pax+bag), rest is cargo
@@ -28,3 +32,5 @@ void generatePayload(paxPayloadData_t* const targetPayload, const bool isImperia
 // For Station Entry: CALL AFTER `generatePayload`
 void normalisePayload(paxPayloadData_t* const targetPayload, const bool isImperial);
 void calculateCGs(const paxPayloadData_t* const targetPayload, const FuelData_t* const fuel, double* const ZFWCG, double* const TOCG, const bool isImperial);
+void load(const paxPayloadData_t* const targetPayload, const HANDLE simConnect, const bool isImperial);
+void unload(const HANDLE simConnect, const bool isImperial);

PackageSources/wasm-module/types.h

@@ -101,6 +101,25 @@
 #define TO_POUNDS(IS_IMPERIAL, VALUE) ((IS_IMPERIAL) ? (VALUE) : (VALUE) * 2.20462262185)
 #define FROM_POUNDS(IS_IMPERIAL, VALUE) ((IS_IMPERIAL) ? (VALUE) : (VALUE) * (1.0 / 2.20462262185))
 
+// SimConnect ENUMs
+enum DATA_DEFINITIONS {
+    DATA_DEFINITION_EMPTY_WEIGHT,
+    DATA_DEFINITION_PAYLOAD_PAX,
+    DATA_DEFINITION_PAYLOAD_F,
+    DATA_DEFINITION_FUEL,
+    DATA_DEFINITION_GSX,
+    DATA_DEFINITION_USER_DATA,
+};
+
+enum DATA_REQUESTS {
+    DATA_REQUEST_EMPTY_WEIGHT,
+    DATA_REQUEST_PAYLOAD_PAX,
+    DATA_REQUEST_PAYLOAD_F,
+    DATA_REQUEST_FUEL,
+    DATA_REQUEST_GSX,
+    DATA_REQUEST_USER_DATA,
+};
+
 // Data
 typedef struct {
     double isCargo;
@@ -155,6 +174,29 @@ typedef struct {
         unsigned short total;
     } paxCount;
 } paxPayloadData_t;
+typedef struct {
+    double pilot;
+    double firstOfficer;
+    double engineer;
+    double cabinCrewFront;
+    double business1Left;
+    double business1Center;
+    double business1Right;
+    double business2Left;
+    double business2Center;
+    double business2Right;
+    double economy1Left;
+    double economy1Center;
+    double economy1Right;
+    double economy2Left;
+    double economy2Center;
+    double economy2Right;
+    double cabinCrewRear;
+    double forwardCargo;
+    double rearCargo;
+    double leftAux;
+    double rightAux;
+} paxPayloadDataSet_t;
 
 typedef struct {
     // SimConnect mapped
@@ -181,6 +223,24 @@ typedef struct {
     double ZFWCG;
     double TOCG;
 } fPayloadData_t;
+typedef struct {
+    // SimConnect mapped
+    double pilot;
+    double firstOfficer;
+    double engineer;
+    double upper1Left;
+    double upper1Right;
+    double upper2Left;
+    double upper2Right;
+    double upper3Left;
+    double upper3Right;
+    double upper4Left;
+    double upper4Right;
+    double lowerForward;
+    double lowerRear;
+    double leftAux;
+    double rightAux;
+} fPayloadDataSet_t;
 
 typedef struct {
     // SimConnect mapped