eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 2 Releases 120 Wiki Activity

GPS Refactoring #123

Merged
meierj merged 22 commits from mueller/gps-tests into develop 2022-01-17 15:42:05 +01:00
Conversation 3 Commits 22 Files Changed 20 +7 -11
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d8ec051e13 - Show all commits

8
bsp_q7s/core/ObjectFactory.cpp
View File

@ -570,12 +570,8 @@ void ObjectFactory::createAcsBoardComponents(LinuxLibgpioIF *gpioComIF, UartComI
resetArgsGnss0.gnss1 = false; resetArgsGnss0.gnss1 = false;
resetArgsGnss0.gpioComIF = gpioComIF; resetArgsGnss0.gpioComIF = gpioComIF;
resetArgsGnss0.waitPeriodMs = 100; resetArgsGnss0.waitPeriodMs = 100;
auto uartCookieGps0 = new UartCookie(objects::GPS0_HANDLER, q7s::UART_GNSS_DEV, auto gpsHandler0 = new GPSHyperionHandler(objects::GPS0_HANDLER, objects::NO_OBJECT,
UartModes::CANONICAL, uart::GNSS_BAUD, uart::HYPERION_GPS_REPLY_MAX_BUFFER); debugGps);
uartCookieGps0->setToFlushInput(true);
uartCookieGps0->setReadCycles(6);
auto gpsHandler0 = new GPSHyperionHandler(objects::GPS0_HANDLER, objects::UART_COM_IF,
uartCookieGps0, debugGps);
gpsHandler0->setResetPinTriggerFunction(gps::triggerGpioResetPin, &resetArgsGnss0); gpsHandler0->setResetPinTriggerFunction(gps::triggerGpioResetPin, &resetArgsGnss0);
} }

2
linux/fsfwconfig/OBSWConfig.h.in
View File

@ -109,7 +109,7 @@ debugging. */
#define OBSW_DEBUG_STARTRACKER 0 #define OBSW_DEBUG_STARTRACKER 0
#define OBSW_DEBUG_PLOC_MPSOC 0 #define OBSW_DEBUG_PLOC_MPSOC 0
#define OBSW_DEBUG_PLOC_SUPERVISOR 0 #define OBSW_DEBUG_PLOC_SUPERVISOR 0
#define OBSW_DEBUG_PDEC_HANDLER 1 #define OBSW_DEBUG_PDEC_HANDLER 0
/*******************************************************************/ /*******************************************************************/
/** Hardcoded */ /** Hardcoded */

4
mission/devices/GPSHyperionHandler.cpp
View File

@ -9,8 +9,8 @@
#include <fstream> #include <fstream>
#endif #endif
GPSHyperionHandler::GPSHyperionHandler(object_id_t objectId, object_id_t deviceCommunication, GPSHyperionHandler::GPSHyperionHandler(object_id_t objectId, object_id_t parentId,
CookieIF *comCookie, bool debugHyperionGps): bool debugHyperionGps):
ExtendedControllerBase(objectId, objects::NO_OBJECT), gpsSet(this), ExtendedControllerBase(objectId, objects::NO_OBJECT), gpsSet(this),
debugHyperionGps(debugHyperionGps) { debugHyperionGps(debugHyperionGps) {
} }

4
mission/devices/GPSHyperionHandler.h
View File

@ -16,8 +16,8 @@
class GPSHyperionHandler: public ExtendedControllerBase { class GPSHyperionHandler: public ExtendedControllerBase {
public: public:
GPSHyperionHandler(object_id_t objectId, object_id_t deviceCommunication, GPSHyperionHandler(object_id_t objectId, object_id_t parentId,
CookieIF* comCookie, bool debugHyperionGps = false); bool debugHyperionGps = false);
virtual ~GPSHyperionHandler(); virtual ~GPSHyperionHandler();
using gpioResetFunction_t = ReturnValue_t (*) (void* args); using gpioResetFunction_t = ReturnValue_t (*) (void* args);