refactor(a380x/prim): split prim into parts (#10777)

* refactor(a380x/prim): split prim into parts

* fix: remove debug logging

Author: lukecologne

fbw-a380x/src/wasm/fbw_a380/build.sh

@@ -123,8 +123,10 @@ clang++ \
   "${DIR}/src/model/Double2MultiWord.cpp" \
   "${DIR}/src/model/A380FacComputer_data.cpp" \
   "${DIR}/src/model/A380FacComputer.cpp" \
-  "${DIR}/src/model/A380PrimComputer_data.cpp" \
-  "${DIR}/src/model/A380PrimComputer.cpp" \
+  "${DIR}/src/model/A380PrimComputerGeneralLogic_data.cpp" \
+  "${DIR}/src/model/A380PrimComputerGeneralLogic.cpp" \
+  "${DIR}/src/model/A380PrimComputerFctl_data.cpp" \
+  "${DIR}/src/model/A380PrimComputerFctl.cpp" \
   "${DIR}/src/model/A380SecComputer_data.cpp" \
   "${DIR}/src/model/A380SecComputer.cpp" \
   "${DIR}/src/model/A380PitchNormalLaw.cpp" \

fbw-a380x/src/wasm/fbw_a380/src/Arinc429Utils.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include "model/A380PrimComputer_types.h"
+#include "model/A380PrimComputerGeneralLogic_types.h"
 
 namespace Arinc429Utils {
 base_arinc_429 fromSimVar(double simVar);

fbw-a380x/src/wasm/fbw_a380/src/FlyByWireInterface.cpp

@@ -55,6 +55,8 @@ class FlyByWireInterface {
   bool autopilotLawsEnabled = false;
   bool flyByWireEnabled = false;
   int primDisabled = -1;
+  bool primGeneralLogicDisabled = false;
+  bool primFctlDisabled = false;
   int secDisabled = -1;
   int facDisabled = -1;
   bool autoThrustEnabled = false;

fbw-a380x/src/wasm/fbw_a380/src/FlyByWireInterface.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../interface/SimConnectData.h"
-#include "../model/A380PrimComputer.h"
+#include "../model/A380PrimComputerGeneralLogic.h"
 #include "../model/AutopilotLaws.h"
 #include "../model/Autothrust.h"
 

fbw-a380x/src/wasm/fbw_a380/src/fcdc/FcdcIO.h

@@ -16,6 +16,8 @@ bool SimConnectInterface::connect(bool clientDataEnabled,
                                   bool autopilotLawsEnabled,
                                   bool flyByWireEnabled,
                                   int primDisabled,
+                                  bool primGeneralLogicDisabled,
+                                  bool primFctlDisabled,
                                   int secDisabled,
                                   int facDisabled,
                                   const std::vector<std::shared_ptr<ThrottleAxisMapping>>& throttleAxis,
@@ -49,6 +51,8 @@ bool SimConnectInterface::connect(bool clientDataEnabled,
     // store is client data is enabled
     this->clientDataEnabled = clientDataEnabled;
     this->primDisabled = primDisabled;
+    this->primGeneralLogicDisabled = primGeneralLogicDisabled;
+    this->primFctlDisabled = primFctlDisabled;
     this->secDisabled = secDisabled;
     this->facDisabled = facDisabled;
     // store key change value for each axis
@@ -986,6 +990,24 @@ bool SimConnectInterface::prepareClientDataDefinitions() {
 
   // ------------------------------------------------------------------------------------------------------------------
 
+  // map client id
+  result &=
+      SimConnect_MapClientDataNameToID(hSimConnect, "A32NX_CLIENT_DATA_PRIM_GENERAL_LOGIC_OUTPUT", ClientData::PRIM_GENERAL_LOGIC_OUTPUT);
+  // create client data
+  result &= SimConnect_CreateClientData(hSimConnect, ClientData::PRIM_GENERAL_LOGIC_OUTPUT, sizeof(base_prim_general_logic_outputs),
+                                        SIMCONNECT_CREATE_CLIENT_DATA_FLAG_DEFAULT);
+  // add data definitions
+  result &= SimConnect_AddToClientDataDefinition(hSimConnect, ClientData::PRIM_GENERAL_LOGIC_OUTPUT, SIMCONNECT_CLIENTDATAOFFSET_AUTO,
+                                                 sizeof(base_prim_general_logic_outputs));
+
+  if (primFctlDisabled) {
+    // request data to be updated when set
+    result &= SimConnect_RequestClientData(hSimConnect, ClientData::PRIM_GENERAL_LOGIC_OUTPUT, ClientData::PRIM_GENERAL_LOGIC_OUTPUT,
+                                           ClientData::PRIM_GENERAL_LOGIC_OUTPUT, SIMCONNECT_CLIENT_DATA_PERIOD_ON_SET);
+  }
+
+  // ------------------------------------------------------------------------------------------------------------------
+
   for (int i = 0; i < 3; i++) {
     auto defineId = ClientData::PRIM_1_BUS_OUTPUT + i;
 
@@ -1454,6 +1476,10 @@ bool SimConnectInterface::setClientDataPrimBusInput(base_prim_out_bus& output, i
   return sendClientData(ClientData::PRIM_1_BUS_OUTPUT + primIndex, sizeof(output), &output);
 }
 
+bool SimConnectInterface::setClientDataPrimGeneralLogicOutput(const base_prim_general_logic_outputs& output) {
+  return sendClientData(ClientData::PRIM_GENERAL_LOGIC_OUTPUT, sizeof(output), const_cast<base_prim_general_logic_outputs*>(&output));
+}
+
 bool SimConnectInterface::setClientDataSecDiscretes(base_sec_discrete_inputs& output) {
   return sendClientData(ClientData::SEC_DISCRETE_INPUTS, sizeof(output), &output);
 }
@@ -1490,6 +1516,10 @@ base_prim_out_bus& SimConnectInterface::getClientDataPrimBusOutput() {
   return clientDataPrimBusOutputs;
 }
 
+base_prim_general_logic_outputs& SimConnectInterface::getClientDataPrimGeneralLogicOutput() {
+  return clientDataPrimGeneralLogicOutput;
+}
+
 base_sec_discrete_outputs& SimConnectInterface::getClientDataSecDiscretesOutput() {
   return clientDataSecDiscreteOutputs;
 }
@@ -3231,6 +3261,11 @@ void SimConnectInterface::simConnectProcessClientData(const SIMCONNECT_RECV_CLIE
       clientDataPrimBusOutputs = *((base_prim_out_bus*)&data->dwData);
       return;
 
+    case ClientData::PRIM_GENERAL_LOGIC_OUTPUT:
+      // store aircraft data
+      clientDataPrimGeneralLogicOutput = *((base_prim_general_logic_outputs*)&data->dwData);
+      return;
+
     case ClientData::SEC_DISCRETE_OUTPUTS:
       // store aircraft data
       clientDataSecDiscreteOutputs = *((base_sec_discrete_outputs*)&data->dwData);

fbw-a380x/src/wasm/fbw_a380/src/interface/SimConnectInterface.cpp

@@ -11,7 +11,7 @@
 #include "SimConnectData.h"
 
 #include "../model/A380FacComputer_types.h"
-#include "../model/A380PrimComputer_types.h"
+#include "../model/A380PrimComputerGeneralLogic_types.h"
 #include "../model/A380SecComputer_types.h"
 
 class SimConnectInterface {
@@ -208,6 +208,8 @@ class SimConnectInterface {
                bool autopilotLawsEnabled,
                bool flyByWireEnabled,
                int primDisabled,
+               bool primGeneralLogicDisabled,
+               bool primFctlDisabled,
                int secDisabled,
                int facDisabled,
                const std::vector<std::shared_ptr<ThrottleAxisMapping>>& throttleAxis,
@@ -290,10 +292,12 @@ class SimConnectInterface {
   bool setClientDataPrimAnalog(base_prim_analog_inputs& output);
   bool setClientDataPrimTemporaryAp(base_prim_temporary_ap_input& output);
   bool setClientDataPrimBusInput(base_prim_out_bus& output, int primIndex);
+  bool setClientDataPrimGeneralLogicOutput(const base_prim_general_logic_outputs& output);
 
   base_prim_discrete_outputs& getClientDataPrimDiscretesOutput();
   base_prim_analog_outputs& getClientDataPrimAnalogsOutput();
   base_prim_out_bus& getClientDataPrimBusOutput();
+  base_prim_general_logic_outputs& getClientDataPrimGeneralLogicOutput();
 
   bool setClientDataSecDiscretes(base_sec_discrete_inputs& output);
   bool setClientDataSecAnalog(base_sec_analog_inputs& output);
@@ -347,6 +351,7 @@ class SimConnectInterface {
     PRIM_1_BUS_OUTPUT,
     PRIM_2_BUS_OUTPUT,
     PRIM_3_BUS_OUTPUT,
+    PRIM_GENERAL_LOGIC_OUTPUT,
     SEC_DISCRETE_INPUTS,
     SEC_ANALOG_INPUTS,
     SEC_DISCRETE_OUTPUTS,
@@ -390,6 +395,8 @@ class SimConnectInterface {
   bool clientDataEnabled = false;
 
   int primDisabled = -1;
+  bool primGeneralLogicDisabled = false;
+  bool primFctlDisabled = false;
   int secDisabled = -1;
   int facDisabled = -1;
 
@@ -421,6 +428,7 @@ class SimConnectInterface {
   base_prim_discrete_outputs clientDataPrimDiscreteOutputs = {};
   base_prim_analog_outputs clientDataPrimAnalogOutputs = {};
   base_prim_out_bus clientDataPrimBusOutputs = {};
+  base_prim_general_logic_outputs clientDataPrimGeneralLogicOutput = {};
 
   base_sec_discrete_outputs clientDataSecDiscreteOutputs = {};
   base_sec_analog_outputs clientDataSecAnalogOutputs = {};