From d1a25bfa65766b39e7e143605e43017ed2aa1525 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 22 Aug 2021 20:25:05 +0200 Subject: [PATCH] bugfixes hyperion handler --- fsfw | 2 +- linux/fsfwconfig/OBSWConfig.h.in | 3 ++- mission/devices/GPSHyperionHandler.cpp | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fsfw b/fsfw index 7d037784..afd375a7 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 7d0377845bd1bde75fcb81a8bf5fb4234718576a +Subproject commit afd375a7f86730dd865aebac257f40c58fc690df diff --git a/linux/fsfwconfig/OBSWConfig.h.in b/linux/fsfwconfig/OBSWConfig.h.in index ed04f664..79340e26 100644 --- a/linux/fsfwconfig/OBSWConfig.h.in +++ b/linux/fsfwconfig/OBSWConfig.h.in @@ -32,12 +32,13 @@ debugging. */ //! Timers can mess up the code when debugging //! All of this should be enabled for mission code! #define OBSW_ENABLE_TIMERS 1 -#define OBSW_ADD_GPS 0 #define OBSW_ADD_STAR_TRACKER 0 #define OBSW_ADD_PLOC_SUPERVISOR 0 #define OBSW_ADD_PLOC_MPSOC 0 #define OBSW_ADD_SUN_SENSORS 0 #define OBSW_ADD_ACS_BOARD 0 +#define OBSW_ADD_GPS_0 0 +#define OBSW_ADD_GPS_1 0 /*******************************************************************/ /** All of the following flags should be disabled for mission code */ diff --git a/mission/devices/GPSHyperionHandler.cpp b/mission/devices/GPSHyperionHandler.cpp index 0abf10c2..22e1d948 100644 --- a/mission/devices/GPSHyperionHandler.cpp +++ b/mission/devices/GPSHyperionHandler.cpp @@ -37,11 +37,11 @@ void GPSHyperionHandler::doShutDown() { } ReturnValue_t GPSHyperionHandler::buildTransitionDeviceCommand(DeviceCommandId_t *id) { - return HasReturnvaluesIF::RETURN_OK; + return NOTHING_TO_SEND; } ReturnValue_t GPSHyperionHandler::buildNormalDeviceCommand(DeviceCommandId_t *id) { - return HasReturnvaluesIF::RETURN_OK; + return NOTHING_TO_SEND; } ReturnValue_t GPSHyperionHandler::buildCommandFromCommand(