From 51bcdafe33f17df412fb96a55ac5ae85ca531b4f Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 3 May 2022 11:39:49 +0200 Subject: [PATCH] renaming --- bsp_q7s/boardtest/Q7STestTask.cpp | 12 ++++++------ bsp_q7s/boardtest/Q7STestTask.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bsp_q7s/boardtest/Q7STestTask.cpp b/bsp_q7s/boardtest/Q7STestTask.cpp index a9721619..0f6734b6 100644 --- a/bsp_q7s/boardtest/Q7STestTask.cpp +++ b/bsp_q7s/boardtest/Q7STestTask.cpp @@ -273,12 +273,12 @@ void Q7STestTask::testGpsDaemonShm() { } void Q7STestTask::testGpsDaemonSocket() { - if(gpsmmPtr == nullptr) { - gpsmmPtr = new gpsmm("localhost", DEFAULT_GPSD_PORT); + if(gpsmmShmPtr == nullptr) { + gpsmmShmPtr = new gpsmm("localhost", DEFAULT_GPSD_PORT); } // The data from the device will generally be read all at once. Therefore, we // can set all field here - if (not gpsmmPtr->is_open()) { + if (not gpsmmShmPtr->is_open()) { if (gpsNotOpenSwitch) { // Opening failed #if FSFW_VERBOSE_LEVEL >= 1 @@ -292,11 +292,11 @@ void Q7STestTask::testGpsDaemonSocket() { } // Stopwatch watch; gps_data_t *gps = nullptr; - gpsmmPtr->stream(WATCH_ENABLE | WATCH_JSON); - if(not gpsmmPtr->waiting(50000000)) { + gpsmmShmPtr->stream(WATCH_ENABLE | WATCH_JSON); + if(not gpsmmShmPtr->waiting(50000000)) { return; } - gps = gpsmmPtr->read(); + gps = gpsmmShmPtr->read(); if (gps == nullptr) { if (gpsReadFailedSwitch) { gpsReadFailedSwitch = false; diff --git a/bsp_q7s/boardtest/Q7STestTask.h b/bsp_q7s/boardtest/Q7STestTask.h index f8394784..ad58889f 100644 --- a/bsp_q7s/boardtest/Q7STestTask.h +++ b/bsp_q7s/boardtest/Q7STestTask.h @@ -23,7 +23,7 @@ class Q7STestTask : public TestTask { bool gpsNotOpenSwitch = false; bool gpsReadFailedSwitch = false; int32_t noModeSetCntr = 0; - gpsmm* gpsmmPtr = nullptr; + gpsmm* gpsmmShmPtr = nullptr; CoreController* coreController = nullptr; ReturnValue_t performOneShotAction() override;