bsp_hosted/ObjectFactory.cpp

@@ -7,9 +7,9 @@
 #include <objects/systemObjectList.h>
 #include <tmtc/apid.h>
 #include <tmtc/pusIds.h>
-#include "fsfw_tests/integration/task/TestTask.h"
 
 #include "OBSWConfig.h"
+#include "fsfw_tests/integration/task/TestTask.h"
 
 #if OBSW_USE_TMTC_TCP_BRIDGE == 0
 #include "fsfw/osal/common/UdpTcPollingTask.h"

bsp_q7s/boardtest/Q7STestTask.cpp

@@ -273,7 +273,7 @@ void Q7STestTask::testGpsDaemonShm() {
 }
 
 void Q7STestTask::testGpsDaemonSocket() {
-  if(gpsmmShmPtr == nullptr) {
+  if (gpsmmShmPtr == nullptr) {
     gpsmmShmPtr = new gpsmm("localhost", DEFAULT_GPSD_PORT);
   }
   // The data from the device will generally be read all at once. Therefore, we
@@ -291,17 +291,16 @@ void Q7STestTask::testGpsDaemonSocket() {
     return;
   }
   // Stopwatch watch;
-  gps_data_t *gps = nullptr;
+  gps_data_t* gps = nullptr;
   gpsmmShmPtr->stream(WATCH_ENABLE | WATCH_JSON);
-  if(not gpsmmShmPtr->waiting(50000000)) {
+  if (not gpsmmShmPtr->waiting(50000000)) {
     return;
   }
   gps = gpsmmShmPtr->read();
   if (gps == nullptr) {
     if (gpsReadFailedSwitch) {
       gpsReadFailedSwitch = false;
-      sif::warning << "Q7STestTask::testGpsDaemonSocket: Reading GPS data failed"
+      sif::warning << "Q7STestTask::testGpsDaemonSocket: Reading GPS data failed" << std::endl;
-          << std::endl;
     }
     return;
   }

bsp_q7s/boardtest/Q7STestTask.h

@@ -2,6 +2,7 @@
 #define BSP_Q7S_BOARDTEST_Q7STESTTASK_H_
 
 #include <libgpsmm.h>
+
 #include "test/testtasks/TestTask.h"
 
 class CoreController;

linux/boardtest/LibgpiodTest.cpp

@@ -29,8 +29,8 @@ ReturnValue_t LibgpiodTest::performPeriodicAction() {
         sif::warning << "LibgpiodTest::performPeriodicAction: Failed to read gpio " << std::endl;
         return RETURN_FAILED;
       } else {
-        sif::debug << "LibgpiodTest::performPeriodicAction: MIO 0 state = " <<
+        sif::debug << "LibgpiodTest::performPeriodicAction: MIO 0 state = "
-            static_cast<int>(gpioState) << std::endl;
+                   << static_cast<int>(gpioState) << std::endl;
       }
       break;
     }

linux/fsfwconfig/pollingsequence/pollingSequenceFactory.h

@@ -46,7 +46,7 @@ ReturnValue_t pstUart(FixedTimeslotTaskIF* thisSequence);
 
 ReturnValue_t pstSpi(FixedTimeslotTaskIF* thisSequence);
 
-ReturnValue_t pstSpiRw(FixedTimeslotTaskIF *thisSequence);
+ReturnValue_t pstSpiRw(FixedTimeslotTaskIF* thisSequence);
 
 ReturnValue_t pstI2c(FixedTimeslotTaskIF* thisSequence);
 

mission/devices/RwHandler.cpp

@@ -340,13 +340,14 @@ void RwHandler::handleResetStatusReply(const uint8_t* packet) {
     lastResetStatusSet.lastNonClearedResetStatus = resetStatus;
     triggerEvent(RwDefinitions::RESET_OCCURED, resetStatus, 0);
   }
-  lastResetStatusSet.lastResetStatus = resetStatus;
+  lastResetStatusSet.currentResetStatus = resetStatus;
   if (debugMode) {
 #if OBSW_VERBOSE_LEVEL >= 1
     sif::info << "RwHandler::handleResetStatusReply: Last reset status: "
-              << static_cast<unsigned int>(lastResetStatusSet.lastNonClearedResetStatus.value) << std::endl;
+              << static_cast<unsigned int>(lastResetStatusSet.lastNonClearedResetStatus.value)
+              << std::endl;
     sif::info << "RwHandler::handleResetStatusReply: Current reset status: "
-              << static_cast<unsigned int>(lastResetStatusSet.lastResetStatus.value)
+              << static_cast<unsigned int>(lastResetStatusSet.currentResetStatus.value)
               << std::endl;
 #endif
   }

mission/devices/RwHandler.h

@@ -71,8 +71,6 @@ class RwHandler : public DeviceHandlerBase {
                                         LocalDataPoolManager& poolManager) override;
 
  private:
-
-
   //! [EXPORT] : [COMMENT] Action Message with invalid speed was received. Valid speeds must be in
   //! the range of [-65000; 1000] or [1000; 65000]
   static const ReturnValue_t INVALID_SPEED = MAKE_RETURN_CODE(0xA0);

mission/devices/devicedefinitions/RwDefinitions.h

@@ -144,7 +144,7 @@ class LastResetSatus : public StaticLocalDataSet<LAST_RESET_ENTRIES> {
   lp_var_t<uint8_t> lastNonClearedResetStatus =
       lp_var_t<uint8_t>(sid.objectId, PoolIds::LAST_RESET_STATUS, this);
   // This will always contain the last polled reset status
-  lp_var_t<uint8_t> lastResetStatus =
+  lp_var_t<uint8_t> currentResetStatus =
       lp_var_t<uint8_t>(sid.objectId, PoolIds::CURRRENT_RESET_STATUS, this);
 };
 

tmtc

@@ -1 +1 @@
-Subproject commit 510ba82fefa3da20c7e34cf788a9637a514e0385
+Subproject commit 7e460d05c3530b3053b3b10054788d98ed509b20