From 5779f511cf56c6c5b6cd7cc607a8f954355074dd Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 8 Sep 2021 16:03:20 +0200 Subject: [PATCH] some tweaks for reset pin command --- fsfw | 2 +- generators/.gitignore | 1 + mission/devices/GPSHyperionHandler.cpp | 3 +++ tmtc | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 generators/.gitignore diff --git a/fsfw b/fsfw index 924c150a..73eb11f4 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 924c150af27484f9eb4439ec80c048b46c226890 +Subproject commit 73eb11f4f1e7cc80f61d04ad7722fe53608f8051 diff --git a/generators/.gitignore b/generators/.gitignore new file mode 100644 index 00000000..181d655f --- /dev/null +++ b/generators/.gitignore @@ -0,0 +1 @@ +.~lock* diff --git a/mission/devices/GPSHyperionHandler.cpp b/mission/devices/GPSHyperionHandler.cpp index e1e512e3..a757c8a6 100644 --- a/mission/devices/GPSHyperionHandler.cpp +++ b/mission/devices/GPSHyperionHandler.cpp @@ -52,6 +52,8 @@ ReturnValue_t GPSHyperionHandler::buildNormalDeviceCommand(DeviceCommandId_t *id ReturnValue_t GPSHyperionHandler::buildCommandFromCommand( DeviceCommandId_t deviceCommand, const uint8_t *commandData, size_t commandDataLen) { + // By default, send nothing + rawPacketLen = 0; switch(deviceCommand) { case(GpsHyperion::TRIGGER_RESET_PIN): { if(resetCallback != nullptr) { @@ -181,6 +183,7 @@ ReturnValue_t GPSHyperionHandler::initializeLocalDataPool( void GPSHyperionHandler::fillCommandAndReplyMap() { // Reply length does not matter, packets should always arrive periodically insertInReplyMap(GpsHyperion::GPS_REPLY, 4, &gpsSet, 0, true); + insertInCommandMap(GpsHyperion::TRIGGER_RESET_PIN); } void GPSHyperionHandler::modeChanged() { diff --git a/tmtc b/tmtc index d84c6a7e..cce04cc1 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit d84c6a7e70e68f28dcfb21ccfdaae6a0300eab40 +Subproject commit cce04cc163c769136b7d6e3effa381a72d6f4c16