fix: revert fadec init with empty atcID (#10349) (#10358)

Revert "fix: fadec init with empty atcID (#10349)"

This reverts commit c1c61f7.

(cherry picked from commit 9ba42b3)

Author: Saschl

fbw-a32nx/src/wasm/fadec_a32nx/src/Fadec/EngineControlA32NX.cpp

@@ -34,13 +34,19 @@ void EngineControl_A32NX::update() {
   profilerUpdate.start();
 #endif
 
-  if (!fadecInitialized) {
-    initializeEngineControlData();
-    fadecInitialized = true;
+  // Get ATC ID from sim to be able to load and store fuel levels
+  // If not yet available, request it from sim and return early
+  // If available initialize the engine control data
+  if (atcId.empty()) {
+    simData.atcIdDataPtr->requestUpdateFromSim(msfsHandlerPtr->getTimeStamp(), msfsHandlerPtr->getTickCounter());
+    if (simData.atcIdDataPtr->hasChanged()) {
+      atcId = simData.atcIdDataPtr->data().atcID;
+      LOG_INFO("Fadec::EngineControl_A32NX::update() - received ATC ID: " + atcId);
+      initializeEngineControlData();
+    }
+    return;
   }
 
-  loadFuelConfigIfPossible();
-
   const double deltaTime          = std::max(0.002, msfsHandlerPtr->getSimulationDeltaTime());
   const double simTime            = msfsHandlerPtr->getSimulationTime();
   const double mach               = simData.simVarsDataPtr->data().airSpeedMach;
@@ -145,40 +151,6 @@ void EngineControl_A32NX::update() {
 // PRIVATE
 // =============================================================================
 
-void EngineControl_A32NX::loadFuelConfigIfPossible() {
-#ifdef PROFILING
-  profilerEnsureFadecIsInitialized.start();
-#endif
-  const FLOAT64 simTime     = msfsHandlerPtr->getSimulationTime();
-  const UINT64  tickCounter = msfsHandlerPtr->getTickCounter();
-
-  if (!hasLoadedFuelConfig) {
-    bool isSimulationReady = msfsHandlerPtr->getAircraftIsReadyVar();
-
-    simData.atcIdDataPtr->requestUpdateFromSim(msfsHandlerPtr->getTimeStamp(), tickCounter);
-
-    // we only receive the data one tick later as we request it via simconnect. But it should be enought to only perform the check after
-    // isSimulationReady as this is set by the JS instruments after spawn
-    if (isSimulationReady) {
-      if (simData.atcIdDataPtr->data().atcID[0] != '\0') {
-        atcId = simData.atcIdDataPtr->data().atcID;
-        LOG_INFO("Fadec::EngineControl_A32NX::ensureFadecIsInitialized() - received ATC ID: " + atcId);
-        initializeFuelTanks(simTime, tickCounter);
-      } else {
-        LOG_INFO("Fadec::EngineControl_A32NX::ensureFadecIsInitialized() - no ATC ID received, taking default: " + atcId);
-      }
-      // if ATC ID is empty, we take the default and still set hasLoadedFuelConfig to as it won't change anymore
-      hasLoadedFuelConfig = true;
-    }
-  }
-
-#ifdef PROFILING
-  profilerEnsureFadecIsInitialized.stop();
-  if (msfsHandlerPtr->getTickCounter() % 100 == 0) {
-    profilerEnsureFadecIsInitialized.print();
-  }
-#endif
-}
 /**
  * @brief Initializes the engine control data.
  *
@@ -237,26 +209,7 @@ void EngineControl_A32NX::initializeEngineControlData() {
   simData.engineTimer[L]->set(0);
   simData.engineTimer[R]->set(0);
 
-  initializeFuelTanks(timeStamp, tickCounter);
-
-  // Initialize Pump State
-  simData.fuelPumpState[L]->set(0);
-  simData.fuelPumpState[R]->set(0);
-
-  // Initialize Thrust Limits
-  simData.thrustLimitIdle->set(0);
-  simData.thrustLimitClimb->set(0);
-  simData.thrustLimitFlex->set(0);
-  simData.thrustLimitMct->set(0);
-  simData.thrustLimitToga->set(0);
-}
-
-void EngineControl_A32NX::initializeFuelTanks(FLOAT64 timeStamp, UINT64 tickCounter) {
-  LOG_INFO("Fadec::EngineControl_A32NX::initializeFuelTanks()");
-
-#ifdef PROFILING
-  ScopedTimer timer("Fadec::EngineControl_A32NX::initializeFuelTanks()");
-#endif
+  // Initialize Fuel Tanks
   const double fuelWeightGallon = simData.simVarsDataPtr->data().fuelWeightPerGallon;  // weight of gallon of jet A in lbs
 
   const double centerQuantity   = simData.simVarsDataPtr->data().fuelTankQuantityCenter;    // gal
@@ -265,10 +218,6 @@ void EngineControl_A32NX::initializeFuelTanks(FLOAT64 timeStamp, UINT64 tickCoun
   const double leftAuxQuantity  = simData.simVarsDataPtr->data().fuelTankQuantityLeftAux;   // gal
   const double rightAuxQuantity = simData.simVarsDataPtr->data().fuelTankQuantityRightAux;  // gal
 
-  LOG_INFO("Fadec::EngineControl_A32NX::initializeFuelTanks() - Current Fuel Levels from Sim:\n Center: " + std::to_string(centerQuantity) +
-           " gal\n Left: " + std::to_string(leftQuantity) + " gal\n Right: " + std::to_string(rightQuantity) +
-           " gal\n Left Aux: " + std::to_string(leftAuxQuantity) + " gal\n Right Aux: " + std::to_string(rightAuxQuantity) + " gal");
-
   // only loads saved fuel quantity on C/D spawn
   if (simData.startState->updateFromSim(timeStamp, tickCounter) == 2) {
     // Load fuel configuration from file
@@ -298,6 +247,17 @@ void EngineControl_A32NX::initializeFuelTanks(FLOAT64 timeStamp, UINT64 tickCoun
     simData.fuelAuxLeftPre->set(leftAuxQuantity * fuelWeightGallon);    // in Pounds
     simData.fuelAuxRightPre->set(rightAuxQuantity * fuelWeightGallon);  // in Pounds
   }
+
+  // Initialize Pump State
+  simData.fuelPumpState[L]->set(0);
+  simData.fuelPumpState[R]->set(0);
+
+  // Initialize Thrust Limits
+  simData.thrustLimitIdle->set(0);
+  simData.thrustLimitClimb->set(0);
+  simData.thrustLimitFlex->set(0);
+  simData.thrustLimitMct->set(0);
+  simData.thrustLimitToga->set(0);
 }
 
 double EngineControl_A32NX::generateEngineImbalance() {
@@ -1013,11 +973,8 @@ void EngineControl_A32NX::updateFuel(double deltaTimeSeconds) {
 
   //--------------------------------------------
   // Will save the current fuel quantities at a certain interval
-  // if the simulation is ready
-  // and the aircraft is on the ground and the engines are off/shutting down
-
-  if (msfsHandlerPtr->getAircraftIsReadyVar() && msfsHandlerPtr->getSimOnGround() &&
-      (msfsHandlerPtr->getSimulationTime() - lastFuelSaveTime) > FUEL_SAVE_INTERVAL &&
+  // if the aircraft is on the ground and the engines are off/shutting down
+  if (msfsHandlerPtr->getSimOnGround() && (msfsHandlerPtr->getSimulationTime() - lastFuelSaveTime) > FUEL_SAVE_INTERVAL &&
       (engine1State == OFF || engine1State == SHUTTING || engine2State == OFF || engine2State == SHUTTING)) {
     fuelConfiguration.setFuelLeft(simData.fuelLeftPre->get() / weightLbsPerGallon);
     fuelConfiguration.setFuelRight(simData.fuelRightPre->get() / weightLbsPerGallon);

fbw-a32nx/src/wasm/fadec_a32nx/src/Fadec/EngineControlA32NX.h

@@ -34,12 +34,7 @@ class EngineControl_A32NX {
   FadecSimData_A32NX simData{};
 
   // ATC ID for the aircraft used to load and store the fuel levels
-  std::string atcId = "A32NX";
-
-  // Whether we have already loaded the fuel configuration from the config file
-  bool hasLoadedFuelConfig = false;
-
-  bool fadecInitialized = false;
+  std::string atcId{};
 
   // Fuel configuration for loading and storing fuel levels
   FuelConfiguration_A32NX fuelConfiguration{};
@@ -103,8 +98,6 @@ class EngineControl_A32NX {
   SimpleProfiler profilerUpdateFuel{"Fadec::EngineControl_A32NX::updateFuel()", 100};
   SimpleProfiler profilerUpdateThrustLimits{"Fadec::EngineControl_A32NX::updateThrustLimits()", 100};
   SimpleProfiler profilerUpdateOil{"Fadec::EngineControl_A32NX::updateOil()", 100};
-  SimpleProfiler profilerUpdateOil{"Fadec::EngineControl_A32NX::updateOil()", 100};
-  SimpleProfiler profilerEnsureFadecIsInitialized{"Fadec::EngineControl_A32NX::ensureFadecIsInitialized()", 100};
 #endif
 
   // ===========================================================================
@@ -133,22 +126,12 @@ class EngineControl_A32NX {
   // ===========================================================================
 
  private:
-  /**
-   * @brief Initializes the required data for the engine simulation if it has not been initialized
-   */
-  void loadFuelConfigIfPossible();
-
   /**
    * @brief Initialize the FADEC and Fuel model
+   * This is done after we have retrieved the ATC ID so we can load the fuel levels
    */
   void initializeEngineControlData();
 
-  /**
-   * @brief Initializes the fuel tanks based on a default config or the saved state of this livery
-   * This method may be called multiple times during initialization
-   */
-  void initializeFuelTanks(FLOAT64 timeStamp, UINT64 tickCounter);
-
   /**
    * @brief Generates a random engine imbalance.
    *

fbw-a380x/src/wasm/fadec_a380x/src/Fadec/EngineControl_A380X.cpp

@@ -31,13 +31,19 @@ void EngineControl_A380X::update() {
   profilerUpdate.start();
 #endif
 
-  if (!fadecInitialized) {
-    initializeEngineControlData();
-    fadecInitialized = true;
+  // Get ATC ID from sim to be able to load and store fuel levels
+  // If not yet available, request it from sim and return early
+  // If available initialize the engine control data
+  if (atcId.empty()) {
+    simData.atcIdDataPtr->requestUpdateFromSim(msfsHandlerPtr->getTimeStamp(), msfsHandlerPtr->getTickCounter());
+    if (simData.atcIdDataPtr->hasChanged()) {
+      atcId = simData.atcIdDataPtr->data().atcID;
+      LOG_INFO("Fadec::EngineControl_A380X::update() - received ATC ID: " + atcId);
+      initializeEngineControlData();
+    }
+    return;
   }
 
-  loadFuelConfigIfPossible();
-
   const double deltaTime          = std::max(0.002, msfsHandlerPtr->getSimulationDeltaTime());
   const double mach               = simData.simVarsDataPtr->data().airSpeedMach;
   const double pressureAltitude   = simData.simVarsDataPtr->data().pressureAltitude;
@@ -124,40 +130,6 @@ void EngineControl_A380X::update() {
 // Private methods
 // =====================================================================================================================
 
-void EngineControl_A380X::loadFuelConfigIfPossible() {
-#ifdef PROFILING
-  profilerEnsureFadecIsInitialized.start();
-#endif
-  const FLOAT64 simTime     = msfsHandlerPtr->getSimulationTime();
-  const UINT64  tickCounter = msfsHandlerPtr->getTickCounter();
-
-  if (!hasLoadedFuelConfig) {
-    bool isSimulationReady = msfsHandlerPtr->getAircraftIsReadyVar();
-
-    simData.atcIdDataPtr->requestUpdateFromSim(msfsHandlerPtr->getTimeStamp(), tickCounter);
-
-    // we only receive the data one tick later as we request it via simconnect. But it should be enought to only perform the check after
-    // isSimulationReady as this is set by the JS instruments after spawn
-    if (isSimulationReady) {
-      if (simData.atcIdDataPtr->data().atcID[0] != '\0') {
-        atcId = simData.atcIdDataPtr->data().atcID;
-        LOG_INFO("Fadec::EngineControl_A380X::ensureFadecIsInitialized() - received ATC ID: " + atcId);
-        initializeFuelTanks(simTime, tickCounter);
-      } else {
-        LOG_INFO("Fadec::EngineControl_A380X::ensureFadecIsInitialized() - no ATC ID received, taking default: " + atcId);
-      }
-      // if ATC ID is empty, we take the default and still set hasLoadedFuelConfig to as it won't change anymore
-      hasLoadedFuelConfig = true;
-    }
-  }
-#ifdef PROFILING
-  profilerEnsureFadecIsInitialized.stop();
-  if (msfsHandlerPtr->getTickCounter() % 100 == 0) {
-    profilerEnsureFadecIsInitialized.print();
-  }
-#endif
-}
-
 void EngineControl_A380X::initializeEngineControlData() {
   LOG_INFO("Fadec::EngineControl_A380X::initializeEngineControlData()");
 
@@ -221,23 +193,6 @@ void EngineControl_A380X::initializeEngineControlData() {
   simData.engineTimer[E3]->set(0);
   simData.engineTimer[E4]->set(0);
 
-  initializeFuelTanks(timeStamp, tickCounter);
-
-  // Setting initial Fuel Flow
-  simData.fuelPumpState[E1]->set(0);
-  simData.fuelPumpState[E2]->set(0);
-  simData.fuelPumpState[E3]->set(0);
-  simData.fuelPumpState[E4]->set(0);
-
-  // Setting initial Thrust Limits
-  simData.thrustLimitIdle->set(0);
-  simData.thrustLimitClimb->set(0);
-  simData.thrustLimitFlex->set(0);
-  simData.thrustLimitMct->set(0);
-  simData.thrustLimitToga->set(0);
-}
-
-void EngineControl_A380X::initializeFuelTanks(FLOAT64 timeStamp, UINT64 tickCounter) {
   // Setting initial Fuel Levels
   const double weightLbsPerGallon = simData.simVarsDataPtr->data().fuelWeightLbsPerGallon;
 
@@ -287,6 +242,19 @@ void EngineControl_A380X::initializeFuelTanks(FLOAT64 timeStamp, UINT64 tickCoun
     simData.fuelRightOuterPre->set(simData.fuelTankDataPtr->data().fuelSystemRightOuter * weightLbsPerGallon);
     simData.fuelTrimPre->set(simData.fuelTankDataPtr->data().fuelSystemTrim * weightLbsPerGallon);
   }
+
+  // Setting initial Fuel Flow
+  simData.fuelPumpState[E1]->set(0);
+  simData.fuelPumpState[E2]->set(0);
+  simData.fuelPumpState[E3]->set(0);
+  simData.fuelPumpState[E4]->set(0);
+
+  // Setting initial Thrust Limits
+  simData.thrustLimitIdle->set(0);
+  simData.thrustLimitClimb->set(0);
+  simData.thrustLimitFlex->set(0);
+  simData.thrustLimitMct->set(0);
+  simData.thrustLimitToga->set(0);
 }
 
 void EngineControl_A380X::generateIdleParameters(double pressAltitude, double mach, double ambientTemperature, double ambientPressure) {
@@ -905,7 +873,7 @@ void EngineControl_A380X::updateFuel(double deltaTimeSeconds) {
     simData.fuelExtraTankDataPtr->writeDataToSim();
   }
 
-  // Will save the current fuel quantities if the aircraft is on the ground AND engines being shutdown
+  // Will save the current fuel quantities if on the ground AND engines being shutdown
   // AND 5 seconds have passed since the last save
   if (msfsHandlerPtr->getSimOnGround() && (msfsHandlerPtr->getSimulationTime() - lastFuelSaveTime) > 5.0 &&
       (engine1State == OFF || engine1State == SHUTTING ||  // 1

fbw-a380x/src/wasm/fadec_a380x/src/Fadec/EngineControl_A380X.h

@@ -34,12 +34,7 @@ class EngineControl_A380X {
   FadecSimData_A380X simData{};
 
   // ATC ID for the aircraft used to load and store the fuel levels
-  std::string atcId = "A380X";
-
-  // Whether we have already loaded the fuel configuration from the config file
-  bool hasLoadedFuelConfig = false;
-
-  bool fadecInitialized = false;
+  std::string atcId{};
 
   // Fuel configuration for loading and storing fuel levels
   FuelConfiguration_A380X fuelConfiguration{};
@@ -132,23 +127,12 @@ class EngineControl_A380X {
   // ===========================================================================
 
  private:
-  /**
-   * @brief Initializes the required data for the engine simulation if it has not been initialized
-   */
-  void loadFuelConfigIfPossible();
-
   /**
    * @brief Initialize the FADEC and Fuel model
    * This is done after we have retrieved the ATC ID so we can load the fuel levels
    */
   void initializeEngineControlData();
 
-  /**
-   * @brief Initializes the fuel tanks based on a default config or the saved state of this livery
-   * This method may be called multiple times during initialization
-   */
-  void initializeFuelTanks(FLOAT64 timeStamp, UINT64 tickCounter);
-
   /**
    * @brief Generate Idle / Initial Engine Parameters (non-imbalanced)
    *