From 8fe7307a5869424d31100fb9ee82dca01c4f4598 Mon Sep 17 00:00:00 2001 From: meggert Date: Fri, 1 Mar 2024 10:59:37 +0100 Subject: [PATCH] remove whatever this is --- linux/acs/GpsHyperionLinuxController.cpp | 20 ++++++-------------- linux/acs/GpsHyperionLinuxController.h | 1 - 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/linux/acs/GpsHyperionLinuxController.cpp b/linux/acs/GpsHyperionLinuxController.cpp index 1822fc2e..d4f04720 100644 --- a/linux/acs/GpsHyperionLinuxController.cpp +++ b/linux/acs/GpsHyperionLinuxController.cpp @@ -44,17 +44,13 @@ LocalPoolDataSetBase *GpsHyperionLinuxController::getDataSetHandle(sid_t sid) { ReturnValue_t GpsHyperionLinuxController::checkModeCommand(Mode_t mode, Submode_t submode, uint32_t *msToReachTheMode) { - if (not modeCommanded) { - if (mode == MODE_ON or mode == MODE_OFF) { - // 5h time to reach fix - *msToReachTheMode = MAX_SECONDS_TO_REACH_FIX; - maxTimeToReachFix.resetTimer(); - modeCommanded = true; - } else if (mode == MODE_NORMAL) { - return HasModesIF::INVALID_MODE; - } + if (mode == MODE_ON) { + maxTimeToReachFix.resetTimer(); + } else if (mode == MODE_NORMAL) { + return HasModesIF::INVALID_MODE; } if (mode == MODE_OFF) { + maxTimeToReachFix.timeOut(); PoolReadGuard pg(&gpsSet); gpsSet.setValidity(false, true); // There can't be a fix with a device that is off. @@ -62,7 +58,6 @@ ReturnValue_t GpsHyperionLinuxController::checkModeCommand(Mode_t mode, Submode_ handleFixChangedEvent(GpsHyperion::FixMode::NOT_SEEN); gpsSet.fixMode.value = GpsHyperion::FixMode::NOT_SEEN; oneShotSwitches.reset(); - modeCommanded = false; } return returnvalue::OK; } @@ -261,10 +256,7 @@ ReturnValue_t GpsHyperionLinuxController::handleCoreTelemetry(bool modeIsSet) { if (newFix == GpsHyperion::FixMode::NOT_SEEN or newFix == GpsHyperion::FixMode::NO_FIX) { if (modeCommanded and maxTimeToReachFix.hasTimedOut()) { // We are supposed to be on and functioning, but no fix was found - if (mode == MODE_ON or mode == MODE_NORMAL) { - mode = MODE_OFF; - } - modeCommanded = false; + // ToDo:: maybe pull reset pins here } } } diff --git a/linux/acs/GpsHyperionLinuxController.h b/linux/acs/GpsHyperionLinuxController.h index 9f63bac5..f9039bbd 100644 --- a/linux/acs/GpsHyperionLinuxController.h +++ b/linux/acs/GpsHyperionLinuxController.h @@ -66,7 +66,6 @@ class GpsHyperionLinuxController : public ExtendedControllerBase { Countdown maxTimeToReachFix = Countdown(MAX_SECONDS_TO_REACH_FIX * 1000); Countdown gainedNewFix = Countdown(60 * 2 * 1000); uint32_t fixChangeCounter = 0; - bool modeCommanded = false; bool timeInit = false; uint8_t satNotSetCounter = 0;