apply afmt, some more renaming

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

@@ -156,13 +156,13 @@ void Q7STestTask::testDummyParams() {
   result = param.getValue<int>(DummyParameter::DUMMY_KEY_PARAM_1, test);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::warning << "Q7STestTask::testDummyParams: Key " << DummyParameter::DUMMY_KEY_PARAM_1
-        << " does not exist" << std::endl;
+                 << " does not exist" << std::endl;
   }
   std::string test2;
   result = param.getValue<std::string>(DummyParameter::DUMMY_KEY_PARAM_2, test2);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::warning << "Q7STestTask::testDummyParams: Key " << DummyParameter::DUMMY_KEY_PARAM_1
-        << " does not exist" << std::endl;
+                 << " does not exist" << std::endl;
   }
   sif::info << "Test value (3 expected): " << test << std::endl;
   sif::info << "Test value 2 (\"blirb\" expected): " << test2 << std::endl;
@@ -172,7 +172,7 @@ ReturnValue_t Q7STestTask::initialize() {
   coreController = ObjectManager::instance()->get<CoreController>(objects::CORE_CONTROLLER);
   if (coreController == nullptr) {
     sif::warning << "Q7STestTask::initialize: Could not retrieve CORE_CONTROLLER object"
-        << std::endl;
+                 << std::endl;
   }
   return TestTask::initialize();
 }
@@ -182,14 +182,14 @@ void Q7STestTask::testProtHandler() {
   ReturnValue_t result = HasReturnvaluesIF::RETURN_OK;
   // If any chips are unlocked, lock them here
   result = coreController->setBootCopyProtection(xsc::Chip::ALL_CHIP, xsc::Copy::ALL_COPY, true,
-      opPerformed, true);
+                                                 opPerformed, true);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::warning << "Q7STestTask::testProtHandler: Op failed" << std::endl;
   }
 
   // unlock own copy
   result = coreController->setBootCopyProtection(xsc::Chip::SELF_CHIP, xsc::Copy::SELF_COPY, false,
-      opPerformed, true);
+                                                 opPerformed, true);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::warning << "Q7STestTask::testProtHandler: Op failed" << std::endl;
   }
@@ -203,7 +203,7 @@ void Q7STestTask::testProtHandler() {
 
   // lock own copy
   result = coreController->setBootCopyProtection(xsc::Chip::SELF_CHIP, xsc::Copy::SELF_COPY, true,
-      opPerformed, true);
+                                                 opPerformed, true);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::warning << "Q7STestTask::testProtHandler: Op failed" << std::endl;
   }
@@ -217,7 +217,7 @@ void Q7STestTask::testProtHandler() {
 
   // unlock specific copy
   result = coreController->setBootCopyProtection(xsc::Chip::CHIP_1, xsc::Copy::COPY_1, false,
-      opPerformed, true);
+                                                 opPerformed, true);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::warning << "Q7STestTask::testProtHandler: Op failed" << std::endl;
   }
@@ -231,7 +231,7 @@ void Q7STestTask::testProtHandler() {
 
   // lock specific copy
   result = coreController->setBootCopyProtection(xsc::Chip::CHIP_1, xsc::Copy::COPY_1, true,
-      opPerformed, true);
+                                                 opPerformed, true);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::warning << "Q7STestTask::testProtHandler: Op failed" << std::endl;
   }
@@ -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
@@ -283,7 +283,7 @@ void Q7STestTask::testGpsDaemonSocket() {
       // Opening failed
 #if FSFW_VERBOSE_LEVEL >= 1
       sif::warning << "Q7STestTask::testGpsDaemonSocket: Opening GPSMM failed | "
-          << "Error " << errno << " | " << gps_errstr(errno) << std::endl;
+                   << "Error " << errno << " | " << gps_errstr(errno) << std::endl;
 #endif
 
       gpsNotOpenSwitch = false;
@@ -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;
   }
@@ -312,8 +311,8 @@ void Q7STestTask::testGpsDaemonSocket() {
     if (noModeSetCntr == 10) {
       // TODO: Trigger event here
       sif::warning << "Q7STestTask::testGpsDaemonSocket: No mode could be "
-          "read for 10 consecutive reads"
+                      "read for 10 consecutive reads"
-          << std::endl;
+                   << std::endl;
       noModeSetCntr = -1;
     }
     return;
@@ -339,7 +338,7 @@ void Q7STestTask::testFileSystemHandlerDirect(FsOpCodes opCode) {
   auto fsHandler = ObjectManager::instance()->get<FileSystemHandler>(objects::FILE_SYSTEM_HANDLER);
   if (fsHandler == nullptr) {
     sif::warning << "Q7STestTask::testFileSystemHandlerDirect: No FS handler running.."
-        << std::endl;
+                 << std::endl;
   }
   FileSystemHandler::FsCommandCfg cfg = {};
   ReturnValue_t result = HasReturnvaluesIF::RETURN_OK;
@@ -366,115 +365,115 @@ void Q7STestTask::testFileSystemHandlerDirect(FsOpCodes opCode) {
   };
 
   switch (opCode) {
-  case (FsOpCodes::CREATE_EMPTY_FILE_IN_TMP): {
+    case (FsOpCodes::CREATE_EMPTY_FILE_IN_TMP): {
-    // No mount prefix, cause file is created in tmp
+      // No mount prefix, cause file is created in tmp
-    cfg.useMountPrefix = false;
+      cfg.useMountPrefix = false;
-    sif::info << "Creating empty file in /tmp folder" << std::endl;
+      sif::info << "Creating empty file in /tmp folder" << std::endl;
-    // Do not delete file, user can check existence in shell
+      // Do not delete file, user can check existence in shell
-    fsHandler->createFile("/tmp/", "test.txt", nullptr, 0, &cfg);
-    break;
-  }
-  case (FsOpCodes::REMOVE_TMP_FILE): {
-    sif::info << "Deleting /tmp/test.txt sample file" << std::endl;
-    // No mount prefix, cause file is created in tmp
-    cfg.useMountPrefix = false;
-    if (not std::filesystem::exists("/tmp/test.txt")) {
-      // Creating sample file
-      sif::info << "Creating sample file /tmp/test.txt to delete" << std::endl;
       fsHandler->createFile("/tmp/", "test.txt", nullptr, 0, &cfg);
+      break;
     }
-    result = fsHandler->removeFile("/tmp", "test.txt", &cfg);
+    case (FsOpCodes::REMOVE_TMP_FILE): {
-    if (result == HasReturnvaluesIF::RETURN_OK) {
+      sif::info << "Deleting /tmp/test.txt sample file" << std::endl;
-      sif::info << "File removed successfully" << std::endl;
+      // No mount prefix, cause file is created in tmp
-    } else {
+      cfg.useMountPrefix = false;
-      sif::warning << "File removal failed!" << std::endl;
+      if (not std::filesystem::exists("/tmp/test.txt")) {
+        // Creating sample file
+        sif::info << "Creating sample file /tmp/test.txt to delete" << std::endl;
+        fsHandler->createFile("/tmp/", "test.txt", nullptr, 0, &cfg);
+      }
+      result = fsHandler->removeFile("/tmp", "test.txt", &cfg);
+      if (result == HasReturnvaluesIF::RETURN_OK) {
+        sif::info << "File removed successfully" << std::endl;
+      } else {
+        sif::warning << "File removal failed!" << std::endl;
+      }
+      break;
     }
-    break;
+    case (FsOpCodes::CREATE_DIR_IN_TMP): {
-  }
+      // No mount prefix, cause file is created in tmp
-  case (FsOpCodes::CREATE_DIR_IN_TMP): {
+      cfg.useMountPrefix = false;
-    // No mount prefix, cause file is created in tmp
+      sif::info << "Creating empty file in /tmp folder" << std::endl;
-    cfg.useMountPrefix = false;
+      // Do not delete file, user can check existence in shell
-    sif::info << "Creating empty file in /tmp folder" << std::endl;
+      ReturnValue_t result = fsHandler->createDirectory("/tmp/", "test", false, &cfg);
-    // Do not delete file, user can check existence in shell
+      if (result == HasReturnvaluesIF::RETURN_OK) {
-    ReturnValue_t result = fsHandler->createDirectory("/tmp/", "test", false, &cfg);
+        sif::info << "Directory created successfully" << std::endl;
-    if (result == HasReturnvaluesIF::RETURN_OK) {
+      } else {
-      sif::info << "Directory created successfully" << std::endl;
+        sif::warning << "Directory creation failed!" << std::endl;
-    } else {
+      }
-      sif::warning << "Directory creation failed!" << std::endl;
+      break;
     }
-    break;
+    case (FsOpCodes::REMOVE_EMPTY_DIR_IN_TMP): {
-  }
+      // No mount prefix, cause file is created in tmp
-  case (FsOpCodes::REMOVE_EMPTY_DIR_IN_TMP): {
+      cfg.useMountPrefix = false;
-    // No mount prefix, cause file is created in tmp
+      if (not std::filesystem::exists("/tmp/test")) {
-    cfg.useMountPrefix = false;
+        result = fsHandler->createDirectory("/tmp", "test", false, &cfg);
-    if (not std::filesystem::exists("/tmp/test")) {
+      } else {
-      result = fsHandler->createDirectory("/tmp", "test", false, &cfg);
+        // Delete any leftover files to regular dir removal works
-    } else {
+        std::remove("/tmp/test/*");
-      // Delete any leftover files to regular dir removal works
+      }
-      std::remove("/tmp/test/*");
+      result = fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
+      if (result == HasReturnvaluesIF::RETURN_OK) {
+        sif::info << "Directory removed successfully" << std::endl;
+      } else {
+        sif::warning << "Directory removal failed!" << std::endl;
+      }
+      break;
     }
-    result = fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
+    case (FsOpCodes::REMOVE_FILLED_DIR_IN_TMP): {
-    if (result == HasReturnvaluesIF::RETURN_OK) {
+      result = createNonEmptyTmpDir();
-      sif::info << "Directory removed successfully" << std::endl;
+      if (result != HasReturnvaluesIF::RETURN_OK) {
-    } else {
+        return;
-      sif::warning << "Directory removal failed!" << std::endl;
+      }
+      result = fsHandler->removeDirectory("/tmp/", "test", true, &cfg);
+      if (result == HasReturnvaluesIF::RETURN_OK) {
+        sif::info << "Directory removed recursively successfully" << std::endl;
+      } else {
+        sif::warning << "Recursive directory removal failed!" << std::endl;
+      }
+      break;
     }
-    break;
+    case (FsOpCodes::ATTEMPT_DIR_REMOVAL_NON_EMPTY): {
-  }
+      result = createNonEmptyTmpDir();
-  case (FsOpCodes::REMOVE_FILLED_DIR_IN_TMP): {
+      if (result != HasReturnvaluesIF::RETURN_OK) {
-    result = createNonEmptyTmpDir();
+        return;
-    if (result != HasReturnvaluesIF::RETURN_OK) {
+      }
-      return;
+      result = fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
+      if (result != HasReturnvaluesIF::RETURN_OK) {
+        sif::info << "Directory removal attempt failed as expected" << std::endl;
+      } else {
+        sif::warning << "Directory removal worked when it should not have!" << std::endl;
+      }
+      break;
     }
-    result = fsHandler->removeDirectory("/tmp/", "test", true, &cfg);
+    case (FsOpCodes::RENAME_FILE): {
-    if (result == HasReturnvaluesIF::RETURN_OK) {
+      // No mount prefix, cause file is created in tmp
-      sif::info << "Directory removed recursively successfully" << std::endl;
+      cfg.useMountPrefix = false;
-    } else {
+      if (std::filesystem::exists("/tmp/test.txt")) {
-      sif::warning << "Recursive directory removal failed!" << std::endl;
+        fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
+      }
+      sif::info << "Creating empty file /tmp/test.txt and rename to /tmp/test2.txt" << std::endl;
+      // Do not delete file, user can check existence in shell
+      fsHandler->createFile("/tmp/", "test.txt", nullptr, 0, &cfg);
+      fsHandler->renameFile("/tmp/", "test.txt", "test2.txt", &cfg);
+      break;
     }
-    break;
+    case (FsOpCodes::APPEND_TO_FILE): {
-  }
+      // No mount prefix, cause file is created in tmp
-  case (FsOpCodes::ATTEMPT_DIR_REMOVAL_NON_EMPTY): {
+      cfg.useMountPrefix = false;
-    result = createNonEmptyTmpDir();
+      if (std::filesystem::exists("/tmp/test.txt")) {
-    if (result != HasReturnvaluesIF::RETURN_OK) {
+        fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
-      return;
+      }
+      if (std::filesystem::exists("/tmp/test.txt")) {
+        fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
+      }
+      sif::info << "Creating empty file /tmp/test.txt and adding content" << std::endl;
+      std::string content = "Hello World\n";
+      // Do not delete file, user can check existence in shell
+      fsHandler->createFile("/tmp/", "test.txt", nullptr, 0, &cfg);
+      fsHandler->appendToFile("/tmp/", "test.txt", reinterpret_cast<const uint8_t*>(content.data()),
+                              content.size(), 0, &cfg);
     }
-    result = fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
-    if (result != HasReturnvaluesIF::RETURN_OK) {
-      sif::info << "Directory removal attempt failed as expected" << std::endl;
-    } else {
-      sif::warning << "Directory removal worked when it should not have!" << std::endl;
-    }
-    break;
-  }
-  case (FsOpCodes::RENAME_FILE): {
-    // No mount prefix, cause file is created in tmp
-    cfg.useMountPrefix = false;
-    if (std::filesystem::exists("/tmp/test.txt")) {
-      fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
-    }
-    sif::info << "Creating empty file /tmp/test.txt and rename to /tmp/test2.txt" << std::endl;
-    // Do not delete file, user can check existence in shell
-    fsHandler->createFile("/tmp/", "test.txt", nullptr, 0, &cfg);
-    fsHandler->renameFile("/tmp/", "test.txt", "test2.txt", &cfg);
-    break;
-  }
-  case (FsOpCodes::APPEND_TO_FILE): {
-    // No mount prefix, cause file is created in tmp
-    cfg.useMountPrefix = false;
-    if (std::filesystem::exists("/tmp/test.txt")) {
-      fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
-    }
-    if (std::filesystem::exists("/tmp/test.txt")) {
-      fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
-    }
-    sif::info << "Creating empty file /tmp/test.txt and adding content" << std::endl;
-    std::string content = "Hello World\n";
-    // Do not delete file, user can check existence in shell
-    fsHandler->createFile("/tmp/", "test.txt", nullptr, 0, &cfg);
-    fsHandler->appendToFile("/tmp/", "test.txt", reinterpret_cast<const uint8_t*>(content.data()),
-        content.size(), 0, &cfg);
-  }
   }
 }
 

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