From f8d5546a03bd02c37fa31be543a5484403fd9143 Mon Sep 17 00:00:00 2001 From: Markus Koller Date: Thu, 14 Oct 2021 15:50:50 +0200 Subject: [PATCH 1/4] rw spi callback removed wrong continue --- bsp_q7s/callbacks/rwSpiCallback.cpp | 1 - bsp_q7s/core/ObjectFactory.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/bsp_q7s/callbacks/rwSpiCallback.cpp b/bsp_q7s/callbacks/rwSpiCallback.cpp index 73516fb4..ca214f77 100644 --- a/bsp_q7s/callbacks/rwSpiCallback.cpp +++ b/bsp_q7s/callbacks/rwSpiCallback.cpp @@ -188,7 +188,6 @@ ReturnValue_t spiCallback(SpiComIF* comIf, SpiCookie *cookie, const uint8_t *sen else { *(rxBuf + decodedFrameLen) = byteRead; decodedFrameLen++; - continue; } /** diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp index 66357373..a86f072b 100644 --- a/bsp_q7s/core/ObjectFactory.cpp +++ b/bsp_q7s/core/ObjectFactory.cpp @@ -856,7 +856,6 @@ void ObjectFactory::createReactionWheelComponents(LinuxLibgpioIF* gpioComIF) { rwHandler1->setStartUpImmediately(); #endif rw1SpiCookie->setCallbackArgs(rwHandler1); - rwHandler1->setStartUpImmediately(); auto rwHandler2 = new RwHandler(objects::RW2, objects::SPI_COM_IF, rw2SpiCookie, gpioComIF, gpioIds::EN_RW2); -- 2.43.0 From a9824b71b7c6019694ebfc3ed7e213c6a1f5be9f Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Fri, 14 Jan 2022 10:14:45 +0100 Subject: [PATCH 2/4] tmtc update --- tmtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmtc b/tmtc index 734dc5ae..dfed6b7a 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 734dc5aef88d9fef4ad59817b6ea315db954205c +Subproject commit dfed6b7adf957ba46ff04e0885a5948ea080d59d -- 2.43.0 From e1ddd19e31521c96a83d3820ec1d38930d1fc0d0 Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Fri, 14 Jan 2022 10:16:03 +0100 Subject: [PATCH 3/4] crc fixes in syrlinks register write commands --- mission/devices/SyrlinksHkHandler.h | 6 +++--- mission/devices/devicedefinitions/SyrlinksDefinitions.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mission/devices/SyrlinksHkHandler.h b/mission/devices/SyrlinksHkHandler.h index c194fd18..bf8a489a 100644 --- a/mission/devices/SyrlinksHkHandler.h +++ b/mission/devices/SyrlinksHkHandler.h @@ -61,10 +61,10 @@ private: std::string resetCommand = ""; std::string readRxStatusRegCommand = ""; - std::string setTxModeStandby = ""; + std::string setTxModeStandby = ""; /** W - write, 04 - 4 bytes in data field, 01 - value, 40 register to write value */ - std::string setTxModeModulation = ""; - std::string setTxModeCw = ""; + std::string setTxModeModulation = ""; + std::string setTxModeCw = ""; std::string readTxStatus = ""; std::string readTxWaveform = ""; std::string readTxAgcValueHighByte = ""; diff --git a/mission/devices/devicedefinitions/SyrlinksDefinitions.h b/mission/devices/devicedefinitions/SyrlinksDefinitions.h index 7aa75b99..43ce16f2 100644 --- a/mission/devices/devicedefinitions/SyrlinksDefinitions.h +++ b/mission/devices/devicedefinitions/SyrlinksDefinitions.h @@ -21,7 +21,7 @@ namespace SYRLINKS { static const DeviceCommandId_t READ_TX_AGC_VALUE_LOW_BYTE = 0x0A; /** Size of a simple transmission success response */ - static const uint8_t ACK_SIZE = 11; + static const uint8_t ACK_SIZE = 12; static const uint8_t SIZE_CRC_AND_TERMINATION = 5; /** The size of the header with the message identifier and the payload size field */ static const uint8_t MESSAGE_HEADER_SIZE = 5; -- 2.43.0 From 3421c6fcbf51adec4b407239e38735ec4a910c76 Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Fri, 14 Jan 2022 10:20:21 +0100 Subject: [PATCH 4/4] adapted to develop --- bsp_q7s/callbacks/rwSpiCallback.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/bsp_q7s/callbacks/rwSpiCallback.cpp b/bsp_q7s/callbacks/rwSpiCallback.cpp index 701fc8dc..1e60e3c0 100644 --- a/bsp_q7s/callbacks/rwSpiCallback.cpp +++ b/bsp_q7s/callbacks/rwSpiCallback.cpp @@ -194,6 +194,7 @@ ReturnValue_t spiCallback(SpiComIF* comIf, SpiCookie *cookie, const uint8_t *sen else { *(rxBuf + decodedFrameLen) = byteRead; decodedFrameLen++; + continue; } /** -- 2.43.0