Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage

CHANGELOG.md

@@ -21,14 +21,17 @@ change warranting a new major release:
 
 - Add `-Wshadow=local` shadowing warnings and fixed all of them
 
+## Added
+
+- git post checkout hook which initializes and updates the submodules
+  automatically.
+
 # [v1.28.0] 2023-02-17
 
 eive-tmtc: v2.12.7
 
 ## Added
 
-- git post checkout hook which initializes and updates the submodules
-  automatically.
 - In case the ACS Controller does recognize more than one RW to be invalid and therefore not
   available, it does not perform pointing control but aborts shortly after `sensorProcessing`. If the
   problem persits for 5 ACS cycles, the `MULTIPLE_RW_INVALID` event is triggered, which invokes the

fsfw

@@ -1 +1 @@
-Subproject commit c745c0c8b49f3edd713af5a083dc6bfdca08882a
+Subproject commit b45206ccd69d040bd0f0f9c476c40ae7fb955946

generators/.gitignore

@@ -1,2 +1,4 @@
 .~lock*
 /venv
+/.idea/*
+!/.idea/runConfigurations

linux/boardtest/I2cTestClass.cpp

@@ -29,7 +29,7 @@ ReturnValue_t I2cTestClass::performPeriodicAction() {
 
 void I2cTestClass::battInit() {
   sif::info << "I2cTestClass: BPX Initialization" << std::endl;
-  UnixFileGuard fileHelper(i2cdev, &bpxInfo.fd, O_RDWR, "I2cTestClass::sendMessage");
+  UnixFileGuard fileHelper(i2cdev, bpxInfo.fd, O_RDWR, "I2cTestClass::sendMessage");
   if (fileHelper.getOpenResult() != returnvalue::OK) {
     sif::error << "Opening I2C device" << i2cdev << " failed" << std::endl;
     return;
@@ -58,7 +58,7 @@ void I2cTestClass::battInit() {
 }
 
 void I2cTestClass::battPeriodic() {
-  UnixFileGuard fileHelper(i2cdev, &bpxInfo.fd, O_RDWR, "I2cTestClass::sendMessage");
+  UnixFileGuard fileHelper(i2cdev, bpxInfo.fd, O_RDWR, "I2cTestClass::sendMessage");
   if (fileHelper.getOpenResult() != returnvalue::OK) {
     sif::error << "Opening I2C device" << i2cdev << " failed" << std::endl;
     return;

linux/boardtest/SpiTestClass.cpp

@@ -94,7 +94,7 @@ void SpiTestClass::performRm3100Test(uint8_t mgmId) {
 #endif
   int fileDescriptor = 0;
 
-  UnixFileGuard fileHelper(deviceName, &fileDescriptor, O_RDWR, "SpiComIF::initializeInterface");
+  UnixFileGuard fileHelper(deviceName, fileDescriptor, O_RDWR, "SpiComIF::initializeInterface");
   if (fileHelper.getOpenResult()) {
     sif::error << "SpiTestClass::performRm3100Test: File descriptor could not be opened!"
                << std::endl;
@@ -191,7 +191,7 @@ void SpiTestClass::performLis3MdlTest(uint8_t lis3Id) {
 #endif
   int fileDescriptor = 0;
 
-  UnixFileGuard fileHelper(deviceName, &fileDescriptor, O_RDWR, "SpiComIF::initializeInterface");
+  UnixFileGuard fileHelper(deviceName, fileDescriptor, O_RDWR, "SpiComIF::initializeInterface");
   if (fileHelper.getOpenResult()) {
     sif::error << "SpiTestClass::performLis3Mdl3100Test: File descriptor could not be opened!"
                << std::endl;
@@ -231,7 +231,7 @@ void SpiTestClass::performL3gTest(uint8_t l3gId) {
 #endif
   int fileDescriptor = 0;
 
-  UnixFileGuard fileHelper(deviceName, &fileDescriptor, O_RDWR, "SpiComIF::initializeInterface");
+  UnixFileGuard fileHelper(deviceName, fileDescriptor, O_RDWR, "SpiComIF::initializeInterface");
   if (fileHelper.getOpenResult()) {
     sif::error << "SpiTestClass::performLis3Mdl3100Test: File descriptor could not be opened!"
                << std::endl;
@@ -341,7 +341,7 @@ void SpiTestClass::performMax1227Test() {
 #elif defined(TE0720_1CFA)
 #endif
   int fd = 0;
-  UnixFileGuard fileHelper(deviceName, &fd, O_RDWR, "SpiComIF::initializeInterface");
+  UnixFileGuard fileHelper(deviceName, fd, O_RDWR, "SpiComIF::initializeInterface");
   if (fileHelper.getOpenResult()) {
     sif::error << "SpiTestClass::performLis3Mdl3100Test: File descriptor could not be opened!"
                << std::endl;

mission/devices/GyroADIS1650XHandler.cpp

@@ -434,7 +434,7 @@ ReturnValue_t GyroADIS1650XHandler::spiSendCallback(SpiComIF *comIf, SpiCookie *
       // Prepare transfer
       int fileDescriptor = 0;
       std::string device = comIf->getSpiDev();
-      UnixFileGuard fileHelper(device, &fileDescriptor, O_RDWR, "SpiComIF::sendMessage");
+      UnixFileGuard fileHelper(device, fileDescriptor, O_RDWR, "SpiComIF::sendMessage");
       if (fileHelper.getOpenResult() != returnvalue::OK) {
         return SpiComIF::OPENING_FILE_FAILED;
       }

mission/devices/PayloadPcduHandler.cpp

@@ -722,7 +722,7 @@ ReturnValue_t PayloadPcduHandler::transferAsTwo(SpiComIF* comIf, SpiCookie* cook
   int retval = 0;
   // Prepare transfer
   int fileDescriptor = 0;
-  UnixFileGuard fileHelper(comIf->getSpiDev(), &fileDescriptor, O_RDWR, "SpiComIF::sendMessage");
+  UnixFileGuard fileHelper(comIf->getSpiDev(), fileDescriptor, O_RDWR, "SpiComIF::sendMessage");
   if (fileHelper.getOpenResult() != returnvalue::OK) {
     return SpiComIF::OPENING_FILE_FAILED;
   }

mission/devices/RwHandler.cpp

@@ -168,7 +168,7 @@ ReturnValue_t RwHandler::interpretDeviceReply(DeviceCommandId_t id, const uint8_
     // data is one more flag byte to show whether the value was read at least once.
     auto packetLen = rws::idToPacketLen(currentId);
     // arrayprinter::print(packetPtr, packetLen);
-    uint16_t replyCrc;
+    uint16_t replyCrc = 0;
     size_t dummy = 0;
     SerializeAdapter::deSerialize(&replyCrc, packetPtr + packetLen - 2, &dummy,
                                   SerializeIF::Endianness::LITTLE);

mission/devices/SyrlinksHandler.cpp

@@ -279,7 +279,7 @@ ReturnValue_t SyrlinksHandler::scanForReply(const uint8_t* start, size_t remaini
       break;
     default:
       sif::warning << "SyrlinksHkHandler::scanForReply: Unknown reply identifier" << std::endl;
-      result = IGNORE_REPLY_DATA;
+      result = IGNORE_FULL_PACKET;
       break;
   }
 

tmtc

@@ -1 +1 @@
-Subproject commit 2ef56ae8c4cbca4c5838d39597ee12849ea7d565
+Subproject commit 6e22e3528a321b3da711187ed36b2cd3727931d7