From ebb575d49080a10626bad45d1fdc85f1e8b0761d Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 23 Sep 2021 17:22:30 +0200 Subject: [PATCH 1/8] updated subversion --- common/config/OBSWVersion.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/config/OBSWVersion.h b/common/config/OBSWVersion.h index 5e9b1b9c..39cb356a 100644 --- a/common/config/OBSWVersion.h +++ b/common/config/OBSWVersion.h @@ -4,7 +4,7 @@ const char* const SW_NAME = "eive"; #define SW_VERSION 1 -#define SW_SUBVERSION 7 +#define SW_SUBVERSION 8 #define SW_REVISION 0 #endif /* COMMON_CONFIG_OBSWVERSION_H_ */ From 0e43969b633e994a52005c802db9bedfb4c4aebb Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 23 Sep 2021 17:34:01 +0200 Subject: [PATCH 2/8] dont start empty PST --- bsp_q7s/core/InitMission.cpp | 8 ++++++-- fsfw | 2 +- .../pollingsequence/pollingSequenceFactory.cpp | 13 ++++++++++--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/bsp_q7s/core/InitMission.cpp b/bsp_q7s/core/InitMission.cpp index e7d8779b..bc9139fb 100644 --- a/bsp_q7s/core/InitMission.cpp +++ b/bsp_q7s/core/InitMission.cpp @@ -173,9 +173,13 @@ void initmission::createPstTasks(TaskFactory& factory, missedDeadlineFunc); result = pst::pstSpi(spiPst); if (result != HasReturnvaluesIF::RETURN_OK) { - sif::error << "InitMission::initTasks: Creating PST failed!" << std::endl; + if(result != FixedTimeslotTaskIF::SLOT_LIST_EMPTY) { + sif::error << "InitMission::initTasks: Creating PST failed!" << std::endl; + } + } + else { + taskVec.push_back(spiPst); } - taskVec.push_back(spiPst); #endif FixedTimeslotTaskIF* uartPst = factory.createFixedTimeslotTask( diff --git a/fsfw b/fsfw index e1a85b47..0987a160 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit e1a85b47c5018590e58b9b1130b1754b0079450f +Subproject commit 0987a160c9c200e1b7b72e992ae158d826147c30 diff --git a/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp b/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp index 3b826119..17cdc206 100644 --- a/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp +++ b/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp @@ -536,9 +536,16 @@ ReturnValue_t pst::pstSpi(FixedTimeslotTaskIF *thisSequence) { } #endif /* OBSW_ADD_ACS_BOARD == 1 */ - if (thisSequence->checkSequence() != HasReturnvaluesIF::RETURN_OK) { - sif::error << "SPI PST initialization failed" << std::endl; - return HasReturnvaluesIF::RETURN_FAILED; + ReturnValue_t seqCheck = thisSequence->checkSequence(); + if (seqCheck != HasReturnvaluesIF::RETURN_OK) { + if(seqCheck == FixedTimeslotTaskIF::SLOT_LIST_EMPTY) { + sif::warning << "SPI PST is empty.." << std::endl; + } + else { + sif::error << "SPI PST initialization failed" << std::endl; + } + + return seqCheck; } return HasReturnvaluesIF::RETURN_OK; } From 5348f059b01f41822fe81519d0ff119a2e3eb1e1 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 23 Sep 2021 17:34:45 +0200 Subject: [PATCH 3/8] fsfw update --- fsfw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsfw b/fsfw index 0987a160..dd610f0d 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 0987a160c9c200e1b7b72e992ae158d826147c30 +Subproject commit dd610f0d7edb3a152bec304b9b8452d1b5ea1f49 From c0dde1a0052dc364cb547cf8eebd7f2215aecaca Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sat, 25 Sep 2021 16:38:39 +0200 Subject: [PATCH 4/8] define renamed --- fsfw | 2 +- linux/fsfwconfig/FSFWConfig.h.in | 2 +- mission/devices/GyroADIS16507Handler.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fsfw b/fsfw index dd610f0d..e0671a39 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit dd610f0d7edb3a152bec304b9b8452d1b5ea1f49 +Subproject commit e0671a395ebea9d2297b2096293db80a2e412f4a diff --git a/linux/fsfwconfig/FSFWConfig.h.in b/linux/fsfwconfig/FSFWConfig.h.in index 1b8251da..3b87078c 100644 --- a/linux/fsfwconfig/FSFWConfig.h.in +++ b/linux/fsfwconfig/FSFWConfig.h.in @@ -72,7 +72,7 @@ static constexpr size_t FSFW_MAX_TM_PACKET_SIZE = 2048; } -#define FSFW_HAL_LINUX_SPI_WIRETAPPING 0 +#define FSFW_HAL_SPI_WIRETAPPING 0 #define FSFW_DEV_HYPERION_GPS_CREATE_NMEA_CSV 0 #define FSFW_HAL_L3GD20_GYRO_DEBUG 0 diff --git a/mission/devices/GyroADIS16507Handler.cpp b/mission/devices/GyroADIS16507Handler.cpp index 02e69eaf..07e0d643 100644 --- a/mission/devices/GyroADIS16507Handler.cpp +++ b/mission/devices/GyroADIS16507Handler.cpp @@ -441,7 +441,7 @@ ReturnValue_t GyroADIS16507Handler::spiSendCallback(SpiComIF *comIf, SpiCookie * utility::handleIoctlError("SpiComIF::sendMessage: ioctl error."); result = SpiComIF::FULL_DUPLEX_TRANSFER_FAILED; } -#if FSFW_HAL_LINUX_SPI_WIRETAPPING == 1 +#if FSFW_HAL_SPI_WIRETAPPING == 1 comIf->performSpiWiretapping(cookie); #endif /* FSFW_LINUX_SPI_WIRETAPPING == 1 */ From 8dd58ed4fe3248393a5e09d453c0c5451333969f Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sat, 25 Sep 2021 16:42:58 +0200 Subject: [PATCH 5/8] fsfw update --- fsfw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsfw b/fsfw index e0671a39..2b6c9963 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit e0671a395ebea9d2297b2096293db80a2e412f4a +Subproject commit 2b6c996364be4aee65a1353bbe29d07604c4bdc8 From 04d791824d26e3bf595387dd9b55737e97e5e4ab Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 26 Sep 2021 22:46:10 +0200 Subject: [PATCH 6/8] class IDs and subsystem IDs moved to framework --- common/config/commonClassIds.h | 2 -- common/config/commonSubsystemIds.h | 2 -- fsfw | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/common/config/commonClassIds.h b/common/config/commonClassIds.h index 793cb1ba..5c8e263a 100644 --- a/common/config/commonClassIds.h +++ b/common/config/commonClassIds.h @@ -7,8 +7,6 @@ namespace CLASS_ID { enum commonClassIds: uint8_t { COMMON_CLASS_ID_START = FW_CLASS_ID_COUNT, - MGM_LIS3MDL, //MGMLIS3 - MGM_RM3100, //MGMRM3100 PCDU_HANDLER, //PCDU HEATER_HANDLER, //HEATER SYRLINKS_HANDLER, //SYRLINKS diff --git a/common/config/commonSubsystemIds.h b/common/config/commonSubsystemIds.h index 58ebac66..4cef8774 100644 --- a/common/config/commonSubsystemIds.h +++ b/common/config/commonSubsystemIds.h @@ -6,8 +6,6 @@ namespace SUBSYSTEM_ID { enum: uint8_t { COMMON_SUBSYSTEM_ID_START = FW_SUBSYSTEM_ID_RANGE, - MGM_LIS3MDL = 106, - MGM_RM3100 = 107, PCDU_HANDLER = 108, HEATER_HANDLER = 109, SA_DEPL_HANDLER = 110, diff --git a/fsfw b/fsfw index 2b6c9963..36607c87 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 2b6c996364be4aee65a1353bbe29d07604c4bdc8 +Subproject commit 36607c876422738aabe23fd5ab3e43ae58e41746 From a5f9d0c0d5f2198d329e4df29d6b66fe075fe7ca Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 27 Sep 2021 10:09:38 +0200 Subject: [PATCH 7/8] fsfw update --- fsfw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsfw b/fsfw index 36607c87..e227b5de 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 36607c876422738aabe23fd5ab3e43ae58e41746 +Subproject commit e227b5dead43c292918fb9f140a1c7c4073c8081 From 3af5b8560d9efb4ae9afb414a0a69c2e97e90e10 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 27 Sep 2021 10:51:47 +0200 Subject: [PATCH 8/8] have to user proper types now --- bsp_q7s/core/ObjectFactory.cpp | 26 +++++++++++++------------- bsp_q7s/gpio/gpioCallbacks.cpp | 6 +++--- bsp_q7s/gpio/gpioCallbacks.h | 3 ++- fsfw | 2 +- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp index 828f6d33..e0cc084d 100644 --- a/bsp_q7s/core/ObjectFactory.cpp +++ b/bsp_q7s/core/ObjectFactory.cpp @@ -284,43 +284,43 @@ void ObjectFactory::createSunSensorComponents(LinuxLibgpioIF *gpioComIF, SpiComI GpioCookie* gpioCookieSus = new GpioCookie(); GpioCallback* susgpio = nullptr; - susgpio = new GpioCallback("Chip select SUS 1", gpio::OUT, 1, + susgpio = new GpioCallback("Chip select SUS 1", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); gpioCookieSus->addGpio(gpioIds::CS_SUS_1, susgpio); - susgpio = new GpioCallback("Chip select SUS 2", gpio::OUT, 1, + susgpio = new GpioCallback("Chip select SUS 2", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); gpioCookieSus->addGpio(gpioIds::CS_SUS_2, susgpio); - susgpio = new GpioCallback("Chip select SUS 3", gpio::OUT, 1, + susgpio = new GpioCallback("Chip select SUS 3", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); gpioCookieSus->addGpio(gpioIds::CS_SUS_3, susgpio); - susgpio = new GpioCallback("Chip select SUS 4", gpio::OUT, 1, + susgpio = new GpioCallback("Chip select SUS 4", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); gpioCookieSus->addGpio(gpioIds::CS_SUS_4, susgpio); - susgpio = new GpioCallback("Chip select SUS 5", gpio::OUT, 1, + susgpio = new GpioCallback("Chip select SUS 5", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); gpioCookieSus->addGpio(gpioIds::CS_SUS_5, susgpio); - susgpio = new GpioCallback("Chip select SUS 6", gpio::OUT, 1, + susgpio = new GpioCallback("Chip select SUS 6", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); gpioCookieSus->addGpio(gpioIds::CS_SUS_6, susgpio); - susgpio = new GpioCallback("Chip select SUS 7", gpio::OUT, 1, + susgpio = new GpioCallback("Chip select SUS 7", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); gpioCookieSus->addGpio(gpioIds::CS_SUS_7, susgpio); - susgpio = new GpioCallback("Chip select SUS 8", gpio::OUT, 1, + susgpio = new GpioCallback("Chip select SUS 8", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); gpioCookieSus->addGpio(gpioIds::CS_SUS_8, susgpio); - susgpio = new GpioCallback("Chip select SUS 9", gpio::OUT, 1, + susgpio = new GpioCallback("Chip select SUS 9", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); gpioCookieSus->addGpio(gpioIds::CS_SUS_9, susgpio); - susgpio = new GpioCallback("Chip select SUS 10", gpio::OUT, 1, + susgpio = new GpioCallback("Chip select SUS 10", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); gpioCookieSus->addGpio(gpioIds::CS_SUS_10, susgpio); - susgpio = new GpioCallback("Chip select SUS 11", gpio::OUT, 1, + susgpio = new GpioCallback("Chip select SUS 11", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); gpioCookieSus->addGpio(gpioIds::CS_SUS_11, susgpio); - susgpio = new GpioCallback("Chip select SUS 12", gpio::OUT, 1, + susgpio = new GpioCallback("Chip select SUS 12", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); gpioCookieSus->addGpio(gpioIds::CS_SUS_12, susgpio); - susgpio = new GpioCallback("Chip select SUS 13", gpio::OUT, 1, + susgpio = new GpioCallback("Chip select SUS 13", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); gpioCookieSus->addGpio(gpioIds::CS_SUS_13, susgpio); diff --git a/bsp_q7s/gpio/gpioCallbacks.cpp b/bsp_q7s/gpio/gpioCallbacks.cpp index 3787c829..8280b1e9 100644 --- a/bsp_q7s/gpio/gpioCallbacks.cpp +++ b/bsp_q7s/gpio/gpioCallbacks.cpp @@ -53,7 +53,7 @@ void initSpiCsDecoder(GpioIF* gpioComIF) { } } -void spiCsDecoderCallback(gpioId_t gpioId, gpio::GpioOperation gpioOp, int value, +void spiCsDecoderCallback(gpioId_t gpioId, gpio::GpioOperation gpioOp, gpio::Levels value, void* args) { if (gpioComInterface == nullptr) { @@ -67,10 +67,10 @@ void spiCsDecoderCallback(gpioId_t gpioId, gpio::GpioOperation gpioOp, int value return; } - if (value == 1) { + if (value == gpio::HIGH) { disableAllDecoder(); } - else if (value == 0) { + else if (value == gpio::LOW) { switch (gpioId) { case(gpioIds::RTD_IC3): { enableDecoderTcsIc1(); diff --git a/bsp_q7s/gpio/gpioCallbacks.h b/bsp_q7s/gpio/gpioCallbacks.h index eaf9a701..13a51df2 100644 --- a/bsp_q7s/gpio/gpioCallbacks.h +++ b/bsp_q7s/gpio/gpioCallbacks.h @@ -17,7 +17,8 @@ namespace gpioCallbacks { * @brief This function implements the decoding to multiply gpios by using the decoder * chips SN74LVC138APWR on the TCS board and the interface board. */ - void spiCsDecoderCallback(gpioId_t gpioId, gpio::GpioOperation gpioOp, int value, void* args); + void spiCsDecoderCallback(gpioId_t gpioId, gpio::GpioOperation gpioOp, + gpio::Levels value, void* args); /** * @brief This function sets mux bits 1-3 to a state which will only enable the decoder diff --git a/fsfw b/fsfw index e227b5de..a84c770d 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit e227b5dead43c292918fb9f140a1c7c4073c8081 +Subproject commit a84c770dfb8447325c263da42d5cecd99b38d1f0