From 0c78037fb859f2c1b13046754f72dcb9ceb20d31 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 17 Feb 2023 19:27:28 +0100 Subject: [PATCH 1/8] move changelog entry --- CHANGELOG.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 70abf29d..891a4d76 100644 --- a/CHANGELOG.md +++ b/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 From de4e28fcecc52a430ffe561e46f0e6f7b9f310cb Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sat, 18 Feb 2023 01:18:36 +0100 Subject: [PATCH 2/8] possible fix in scanForReply --- mission/devices/SyrlinksHandler.cpp | 2 +- tmtc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mission/devices/SyrlinksHandler.cpp b/mission/devices/SyrlinksHandler.cpp index c1ebfa48..edb2ae1f 100644 --- a/mission/devices/SyrlinksHandler.cpp +++ b/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; } diff --git a/tmtc b/tmtc index 556060a3..676f8516 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 556060a3f3e204e7a171385d31a3ec409755c6b1 +Subproject commit 676f85165912daf78da7f673e3d5ee17116b12bf From 8f5a45477174e861e5d3d3e271c619ed8b9343a5 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sat, 18 Feb 2023 13:12:29 +0100 Subject: [PATCH 3/8] bump tmtc --- tmtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmtc b/tmtc index 676f8516..201e08af 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 676f85165912daf78da7f673e3d5ee17116b12bf +Subproject commit 201e08afe13777ef06d0da1cd3a58ba087ea04df From cab2d00530bc033fbc0fc19aaf1efd6d762818d8 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sat, 18 Feb 2023 13:12:44 +0100 Subject: [PATCH 4/8] initialize CRC16 in rw handler --- mission/devices/RwHandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mission/devices/RwHandler.cpp b/mission/devices/RwHandler.cpp index 13da2784..6d6032b3 100644 --- a/mission/devices/RwHandler.cpp +++ b/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); From a0f4b031be814c7e07b98c75d78f19106f760db7 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sat, 18 Feb 2023 13:46:00 +0100 Subject: [PATCH 5/8] improvement for unix file guard --- fsfw | 2 +- linux/boardtest/I2cTestClass.cpp | 4 ++-- linux/boardtest/SpiTestClass.cpp | 8 ++++---- mission/devices/GyroADIS1650XHandler.cpp | 2 +- mission/devices/PayloadPcduHandler.cpp | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fsfw b/fsfw index be015b4c..3568bdbe 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit be015b4c669995dc55bc316b006699be8542d941 +Subproject commit 3568bdbecf74733970211d7ff713ad030b332a98 diff --git a/linux/boardtest/I2cTestClass.cpp b/linux/boardtest/I2cTestClass.cpp index 40a66125..4d4e6267 100644 --- a/linux/boardtest/I2cTestClass.cpp +++ b/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; diff --git a/linux/boardtest/SpiTestClass.cpp b/linux/boardtest/SpiTestClass.cpp index e995a846..2521c9a8 100644 --- a/linux/boardtest/SpiTestClass.cpp +++ b/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; diff --git a/mission/devices/GyroADIS1650XHandler.cpp b/mission/devices/GyroADIS1650XHandler.cpp index 765bc589..0993e233 100644 --- a/mission/devices/GyroADIS1650XHandler.cpp +++ b/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; } diff --git a/mission/devices/PayloadPcduHandler.cpp b/mission/devices/PayloadPcduHandler.cpp index 0f691c75..44dd667c 100644 --- a/mission/devices/PayloadPcduHandler.cpp +++ b/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; } From 263b62e6d0255c9e88e480987f6660763edddbf8 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sat, 18 Feb 2023 13:46:58 +0100 Subject: [PATCH 6/8] bump fsfw --- fsfw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsfw b/fsfw index 3568bdbe..5f9eb01d 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 3568bdbecf74733970211d7ff713ad030b332a98 +Subproject commit 5f9eb01d943d8eed610d395aa3f0c6017ea1c58f From 953d7f1db4740a97b44dfde13fc8959635500070 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sat, 18 Feb 2023 13:51:32 +0100 Subject: [PATCH 7/8] bump fsft --- fsfw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsfw b/fsfw index 5f9eb01d..2d6622b8 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 5f9eb01d943d8eed610d395aa3f0c6017ea1c58f +Subproject commit 2d6622b8b86f9e77eb9e350698cfb10d863f32f7 From a2cb348ee34669114f78938d0e84cb76a276a14b Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sat, 18 Feb 2023 14:04:15 +0100 Subject: [PATCH 8/8] that shoould fix it --- fsfw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsfw b/fsfw index 2d6622b8..c8469ca6 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 2d6622b8b86f9e77eb9e350698cfb10d863f32f7 +Subproject commit c8469ca6473f64676e007e2e2f1c733fe6252053