bsp_q7s/OBSWConfig.h.in

@@ -77,7 +77,6 @@
 // If this is enabled, all other I2C code should be disabled
 #define OBSW_ADD_I2C_TEST_CODE                      0
 #define OBSW_ADD_UART_TEST_CODE                     0
-#define OBSW_THREAD_TRACING                         1
 
 #define OBSW_TEST_ACS                               0
 #define OBSW_DEBUG_ACS                              0

bsp_q7s/core/CoreController.cpp

@@ -9,7 +9,6 @@
 #include "fsfw/serviceinterface/ServiceInterface.h"
 #include "fsfw/timemanager/Stopwatch.h"
 #include "fsfw/version.h"
-#include "mission/trace.h"
 #include "watchdog/definitions.h"
 #if OBSW_ADD_TMTC_UDP_SERVER == 1
 #include "fsfw/osal/common/UdpTmTcBridge.h"

bsp_q7s/core/CoreController.h

@@ -12,6 +12,7 @@
 #include "events/subsystemIdRanges.h"
 #include "fsfw/controller/ExtendedControllerBase.h"
 #include "mission/devices/devicedefinitions/GPSDefinitions.h"
+#include "mission/trace.h"
 
 class Timer;
 class SdCardManager;

linux/devices/ploc/PlocMPSoCHelper.cpp

@@ -3,7 +3,6 @@
 #include <filesystem>
 #include <fstream>
 
-#include "OBSWConfig.h"
 #ifdef XIPHOS_Q7S
 #include "bsp_q7s/fs/FilesystemHelper.h"
 #endif
@@ -34,6 +33,9 @@ ReturnValue_t PlocMPSoCHelper::performOperation(uint8_t operationCode) {
   ReturnValue_t result = returnvalue::OK;
   semaphore.acquire();
   while (true) {
+#if OBSW_THREAD_TRACING == 1
+    trace::threadTrace(opCounter, "PLOC MPSOC Helper");
+#endif
     switch (internalState) {
       case InternalState::IDLE: {
         semaphore.acquire();

linux/devices/ploc/PlocMPSoCHelper.h

@@ -11,6 +11,7 @@
 #include "fsfw/tmtcservices/SourceSequenceCounter.h"
 #include "fsfw_hal/linux/serial/SerialComIF.h"
 #include "linux/devices/devicedefinitions/PlocMPSoCDefinitions.h"
+#include "mission/trace.h"
 #ifdef XIPHOS_Q7S
 #include "bsp_q7s/fs/SdCardManager.h"
 #endif
@@ -116,6 +117,10 @@ class PlocMPSoCHelper : public SystemObject, public ExecutableObjectIF {
 
   struct FlashWrite flashWrite;
 
+#if OBSW_THREAD_TRACING == 1
+  uint32_t opCounter = 0;
+#endif
+
   enum class InternalState { IDLE, FLASH_WRITE, FLASH_READ };
 
   InternalState internalState = InternalState::IDLE;

linux/devices/ploc/PlocSupvUartMan.cpp

@@ -101,6 +101,9 @@ ReturnValue_t PlocSupvUartManager::performOperation(uint8_t operationCode) {
     lock->unlockMutex();
     semaphore->acquire();
     putTaskToSleep = false;
+#if OBSW_THREAD_TRACING == 1
+    trace::threadTrace(opCounter, "PLOC SUPV Helper PST");
+#endif
     while (true) {
       if (putTaskToSleep) {
         performUartShutdown();

linux/devices/ploc/PlocSupvUartMan.h

@@ -7,6 +7,7 @@
 #include <string>
 
 #include "OBSWConfig.h"
+#include "mission/trace.h"
 #include "fsfw/container/FIFO.h"
 #include "fsfw/devicehandlers/CookieIF.h"
 #include "fsfw/objectmanager/SystemObject.h"
@@ -15,6 +16,7 @@
 #include "fsfw/tasks/ExecutableObjectIF.h"
 #include "fsfw_hal/linux/serial/SerialComIF.h"
 #include "linux/devices/devicedefinitions/PlocSupervisorDefinitions.h"
+#include "mission/trace.h"
 #include "tas/crc.h"
 
 #ifdef XIPHOS_Q7S
@@ -211,6 +213,9 @@ class PlocSupvUartManager : public DeviceCommunicationIF,
   supv::TmBase tmReader;
   int serialPort = 0;
   struct termios tty = {};
+#if OBSW_THREAD_TRACING == 1
+  uint32_t opCounter = 0;
+#endif
 
   struct EventBufferRequest {
     std::string path = "";

mission/controller/AcsController.cpp

@@ -4,7 +4,6 @@
 
 #include "mission/acsDefs.h"
 #include "mission/config/torquer.h"
-#include "mission/trace.h"
 
 AcsController::AcsController(object_id_t objectId)
     : ExtendedControllerBase(objectId),

mission/controller/AcsController.h

@@ -6,7 +6,6 @@
 #include <fsfw/parameters/ParameterHelper.h>
 #include <fsfw/parameters/ReceivesParameterMessagesIF.h>
 
-#include "OBSWConfig.h"
 #include "acs/ActuatorCmd.h"
 #include "acs/Guidance.h"
 #include "acs/Navigation.h"
@@ -20,6 +19,7 @@
 #include "fsfw_hal/devicehandlers/MgmRM3100Handler.h"
 #include "mission/devices/devicedefinitions/SusDefinitions.h"
 #include "mission/devices/devicedefinitions/imtqHandlerDefinitions.h"
+#include "mission/trace.h"
 
 class AcsController : public ExtendedControllerBase, public ReceivesParameterMessagesIF {
  public:

mission/devices/BpxBatteryHandler.cpp

@@ -2,8 +2,6 @@
 
 #include <fsfw/datapool/PoolReadGuard.h>
 
-#include "mission/trace.h"
-
 BpxBatteryHandler::BpxBatteryHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie)
     : DeviceHandlerBase(objectId, comIF, comCookie), hkSet(this), cfgSet(this) {}
 

mission/devices/BpxBatteryHandler.h

@@ -3,8 +3,8 @@
 
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
 
-#include "OBSWConfig.h"
 #include "devicedefinitions/BpxBatteryDefinitions.h"
+#include "mission/trace.h"
 
 class BpxBatteryHandler : public DeviceHandlerBase {
  public:

mission/devices/SolarArrayDeploymentHandler.cpp

@@ -11,6 +11,7 @@
 #include "fsfw/ipc/QueueFactory.h"
 #include "fsfw/objectmanager/ObjectManager.h"
 #include "fsfw_hal/common/gpio/GpioCookie.h"
+#include "mission/trace.h"
 
 static constexpr bool DEBUG_MODE = true;
 

mission/devices/SolarArrayDeploymentHandler.h

@@ -19,6 +19,7 @@
 #include "fsfw/timemanager/Countdown.h"
 #include "fsfw_hal/common/gpio/GpioIF.h"
 #include "mission/memory/SdCardMountedIF.h"
+#include "mission/trace.h"
 #include "returnvalues/classIds.h"
 
 enum DeploymentChannels : uint8_t { SA_1 = 1, SA_2 = 2 };
@@ -173,7 +174,7 @@ class SolarArrayDeploymentHandler : public ExecutableObjectIF,
   ActionId_t activeCmd = HasActionsIF::INVALID_ACTION_ID;
   std::optional<uint64_t> initUptime;
 #if OBSW_THREAD_TRACING == 1
-  uint32_t opCounter;
+  uint32_t opCounter = 0;
 #endif
   PeriodicOperationDivider opDivider = PeriodicOperationDivider(5);
   uint8_t retryCounter = 3;

mission/trace.h

@@ -3,6 +3,8 @@
 
 #include <cstdint>
 
+#define OBSW_THREAD_TRACING 1
+
 namespace trace {
 
 void threadTrace(uint32_t& counter, const char* name);