EM build working now

bsp_q7s/core/CoreController.cpp

@@ -31,7 +31,7 @@
 xsc::Chip CoreController::CURRENT_CHIP = xsc::Chip::NO_CHIP;
 xsc::Copy CoreController::CURRENT_COPY = xsc::Copy::NO_COPY;
 
-CoreController::CoreController(object_id_t objectId, const std::atomic_uint16_t& i2cErrors)
+CoreController::CoreController(object_id_t objectId, const std::atomic_uint16_t &i2cErrors)
     : ExtendedControllerBase(objectId, 5),
       cmdExecutor(4096),
       cmdReplyBuf(4096, true),
@@ -108,7 +108,7 @@ void CoreController::performControlOperation() {
   sdStateMachine();
   performMountedSdCardOperations();
   readHkData();
-  if(i2cErrors >= 5) {
+  if (i2cErrors >= 5) {
     bool protOpPerformed = false;
     triggerEvent(I2C_UNAVAILABLE_REBOOT);
     gracefulShutdownTasks(CURRENT_CHIP, CURRENT_COPY, protOpPerformed);

bsp_q7s/core/CoreController.h

@@ -6,6 +6,7 @@
 #include <fsfw/globalfunctions/PeriodicOperationDivider.h>
 #include <libxiphos.h>
 
+#include <atomic>
 #include <cstddef>
 
 #include "CoreDefinitions.h"
@@ -15,7 +16,6 @@
 #include "fsfw/controller/ExtendedControllerBase.h"
 #include "mission/devices/devicedefinitions/GPSDefinitions.h"
 #include "mission/trace.h"
-#include <atomic>
 
 class Timer;
 class SdCardManager;
@@ -132,7 +132,8 @@ class CoreController : public ExtendedControllerBase {
   //! P1: First 16 bits boot count of image 0 0, last 16 bits boot count of image 0 1.
   //! P2: First 16 bits boot count of image 1 0, last 16 bits boot count of image 1 1.
   static constexpr Event INDIVIDUAL_BOOT_COUNTS = event::makeEvent(SUBSYSTEM_ID, 8, severity::INFO);
-  static constexpr Event I2C_UNAVAILABLE_REBOOT = event::makeEvent(SUBSYSTEM_ID, 10, severity::MEDIUM);
+  static constexpr Event I2C_UNAVAILABLE_REBOOT =
+      event::makeEvent(SUBSYSTEM_ID, 10, severity::MEDIUM);
 
   CoreController(object_id_t objectId, const std::atomic_uint16_t& i2cErrors);
   virtual ~CoreController();

bsp_q7s/core/ObjectFactory.h

@@ -11,8 +11,8 @@
 #include <mission/tmtc/PersistentLogTmStoreTask.h>
 #include <mission/tmtc/PusTmFunnel.h>
 
-#include <string>
 #include <atomic>
+#include <string>
 
 class LinuxLibgpioIF;
 class SerialComIF;

bsp_q7s/em/emObjectFactory.cpp

@@ -66,7 +66,7 @@ void ObjectFactory::produce(void* args) {
 
   dummy::createDummies(dummyCfg, *pwrSwitcher, gpioComIF);
 
-  new CoreController(objects::CORE_CONTROLLER);
+  new CoreController(objects::CORE_CONTROLLER, I2C_FATAL_ERRORS);
 
   // Regular FM code, does not work for EM if the hardware is not connected
   // createPcduComponents(gpioComIF, &pwrSwitcher);

linux/devices/GpsHyperionLinuxController.cpp

@@ -303,7 +303,7 @@ ReturnValue_t GpsHyperionLinuxController::handleGpsReadData() {
   bool timeValid = false;
   if (TIME_SET == (TIME_SET & gps.set)) {
     // To prevent totally incorrect times from being declared valid.
-    if(gpsSet.satInView.isValid() and gpsSet.satInView.value >= 1) {
+    if (gpsSet.satInView.isValid() and gpsSet.satInView.value >= 1) {
       timeValid = true;
     }
     timeval time = {};

linux/devices/ImtqPollingTask.cpp

@@ -10,9 +10,8 @@
 
 #include "fsfw/FSFW.h"
 
-ImtqPollingTask::ImtqPollingTask(object_id_t imtqPollingTask,
+ImtqPollingTask::ImtqPollingTask(object_id_t imtqPollingTask, std::atomic_uint16_t& i2cFatalErrors)
-    std::atomic_uint16_t& i2cFatalErrors): SystemObject(imtqPollingTask),
+    : SystemObject(imtqPollingTask), i2cFatalErrors(i2cFatalErrors) {
-    i2cFatalErrors(i2cFatalErrors) {
   semaphore = SemaphoreFactory::instance()->createBinarySemaphore();
   semaphore->acquire();
   ipcLock = MutexFactory::instance()->createMutex();
@@ -429,7 +428,7 @@ ReturnValue_t ImtqPollingTask::performI2cFullRequest(uint8_t* reply, size_t repl
     if (ioctl(fd, I2C_SLAVE, i2cAddr) < 0) {
       sif::warning << "Opening IMTQ slave device failed with code " << errno << ": "
                    << strerror(errno) << std::endl;
-      if(errno == EBUSY) {
+      if (errno == EBUSY) {
         i2cFatalErrors++;
       }
     }
@@ -440,7 +439,7 @@ ReturnValue_t ImtqPollingTask::performI2cFullRequest(uint8_t* reply, size_t repl
                  << ". Error description: " << strerror(errno) << std::endl;
       // This is a weird issue which sometimes occurs on debug builds. All I2C buses are busy
       // for all writes,
-      if(errno == EBUSY) {
+      if (errno == EBUSY) {
         i2cFatalErrors++;
       }
       return returnvalue::FAILED;

linux/devices/ImtqPollingTask.h

@@ -4,11 +4,12 @@
 #include <fsfw/tasks/SemaphoreIF.h>
 #include <fsfw_hal/linux/i2c/I2cCookie.h>
 
+#include <atomic>
+
 #include "fsfw/devicehandlers/DeviceCommunicationIF.h"
 #include "fsfw/objectmanager/SystemObject.h"
 #include "fsfw/tasks/ExecutableObjectIF.h"
 #include "mission/devices/devicedefinitions/imtqHelpers.h"
-#include <atomic>
 
 class ImtqPollingTask : public SystemObject,
                         public ExecutableObjectIF,

mission/system/objects/EiveSystem.cpp

@@ -102,9 +102,7 @@ void EiveSystem::handleEventMessages() {
         }
         break;
       default:
-        sif::debug << "AcsSubsystem::performChildOperation: Did not subscribe "
+        sif::debug << "EiveSystem: Did not subscribe to event " << event.getEvent() << std::endl;
-                      "to this event message"
-                   << std::endl;
         break;
     }
   }