feat(fcu): add SPD vars to FCU shim, add missing HDG var to shim, fix…

… VS dashes
flybywiresim · Jul 7, 2024 · 46ab3cf · 46ab3cf
1 parent 147dc9c
commit 46ab3cf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/fbw-a32nx/src/wasm/fbw_a320/src/FlyByWireInterface.cpp b/fbw-a32nx/src/wasm/fbw_a320/src/FlyByWireInterface.cpp
@@ -757,7 +757,8 @@ void FlyByWireInterface::setupLocalVariables() {
   idFcuShimRightBaroMode = std::make_unique<LocalVariable>("XMLVAR_Baro2_Mode");
 
   idFcuShimTrkFpaActive = std::make_unique<LocalVariable>("A32NX_TRK_FPA_MODE_ACTIVE");
-  idFcuShimHdgValue = std::make_unique<LocalVariable>("A32NX_FCU_HEADING_SELECTED");
+  idFcuShimHdgValue1 = std::make_unique<LocalVariable>("A32NX_FCU_HEADING_SELECTED");
+  idFcuShimHdgValue2 = std::make_unique<LocalVariable>("A32NX_AUTOPILOT_HEADING_SELECTED");
   idFcuShimShowHdg = std::make_unique<LocalVariable>("A320_FCU_SHOW_SELECTED_HEADING");
   idFcuShimAltManaged = std::make_unique<LocalVariable>("A32NX_FCU_ALT_MANAGED");
   idFcuShimVsValue = std::make_unique<LocalVariable>("A32NX_AUTOPILOT_VS_SELECTED");
@@ -2126,13 +2127,18 @@ bool FlyByWireInterface::updateFcu(double sampleTime) {
   idFcuAfsDisplayVsFpaDashes->set(discreteOutputs.afs_outputs.vs_fpa_dashes);
 
   // Update AFS CP variables (Sim AP vars and legacy Lvars)
+  idFcuShimSpdDashes->set(discreteOutputs.afs_outputs.spd_mach_dashes);
+  idFcuShimSpdDot->set(discreteOutputs.afs_outputs.spd_mach_managed);
+  idFcuShimSpdValue->set(discreteOutputs.afs_outputs.spd_mach_value);
+
   idFcuShimTrkFpaActive->set(discreteOutputs.afs_outputs.trk_fpa_mode);
 
   simConnectInterface.sendEventEx1(SimConnectInterface::Events::HEADING_BUG_SET, SIMCONNECT_GROUP_PRIORITY_STANDARD,
                                    discreteOutputs.afs_outputs.hdg_trk_value, 1);
   simConnectInterface.sendEvent(SimConnectInterface::Events::AP_HEADING_SLOT_INDEX_SET, discreteOutputs.afs_outputs.hdg_trk_managed ? 2 : 1,
                                 SIMCONNECT_GROUP_PRIORITY_STANDARD);
-  idFcuShimHdgValue->set(discreteOutputs.afs_outputs.hdg_trk_dashes ? -1 : discreteOutputs.afs_outputs.hdg_trk_value);
+  idFcuShimHdgValue1->set(discreteOutputs.afs_outputs.hdg_trk_dashes ? -1 : discreteOutputs.afs_outputs.hdg_trk_value);
+  idFcuShimHdgValue2->set(discreteOutputs.afs_outputs.hdg_trk_dashes ? -1 : discreteOutputs.afs_outputs.hdg_trk_value);
   idFcuShimShowHdg->set(!discreteOutputs.afs_outputs.hdg_trk_dashes);
 
   simConnectInterface.sendEventEx1(SimConnectInterface::Events::AP_ALT_VAR_SET, SIMCONNECT_GROUP_PRIORITY_STANDARD,
@@ -2143,7 +2149,7 @@ bool FlyByWireInterface::updateFcu(double sampleTime) {
 
   idFcuShimVsValue->set(discreteOutputs.afs_outputs.trk_fpa_mode ? 0 : discreteOutputs.afs_outputs.vs_fpa_value);
   idFcuShimFpaValue->set(!discreteOutputs.afs_outputs.trk_fpa_mode ? 0 : discreteOutputs.afs_outputs.vs_fpa_value);
-  idFcuShimVsManaged->set(discreteOutputs.afs_outputs.vs_fpa_dashes);
+  idFcuShimVsManaged->set(!discreteOutputs.afs_outputs.vs_fpa_dashes);
 
   // Shim Hevents
   if (Arinc429Utils::bitFromValueOr(fcuBusOutputs.fcu_discrete_word_1, 13, false)) {

diff --git a/fbw-a32nx/src/wasm/fbw_a320/src/FlyByWireInterface.h b/fbw-a32nx/src/wasm/fbw_a320/src/FlyByWireInterface.h
@@ -598,8 +598,12 @@ class FlyByWireInterface {
   std::unique_ptr<LocalVariable> idFcuShimRightLsActive;
   std::unique_ptr<LocalVariable> idFcuShimRightBaroMode;
 
+  std::unique_ptr<LocalVariable> idFcuShimSpdDashes;
+  std::unique_ptr<LocalVariable> idFcuShimSpdDot;
+  std::unique_ptr<LocalVariable> idFcuShimSpdValue;
   std::unique_ptr<LocalVariable> idFcuShimTrkFpaActive;
-  std::unique_ptr<LocalVariable> idFcuShimHdgValue;
+  std::unique_ptr<LocalVariable> idFcuShimHdgValue1;
+  std::unique_ptr<LocalVariable> idFcuShimHdgValue2;
   std::unique_ptr<LocalVariable> idFcuShimShowHdg;
   std::unique_ptr<LocalVariable> idFcuShimAltManaged;
   std::unique_ptr<LocalVariable> idFcuShimVsValue;