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

v1.11.0 #243

Merged
muellerr merged 159 commits from develop into main 2022-05-04 17:19:57 +02:00
Conversation 0 Commits 159 Files Changed 144 +7 -7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 51bcdafe33 - Show all commits

12
bsp_q7s/boardtest/Q7STestTask.cpp
View File

@ -273,12 +273,12 @@ void Q7STestTask::testGpsDaemonShm() {
} }
void Q7STestTask::testGpsDaemonSocket() { void Q7STestTask::testGpsDaemonSocket() {
if(gpsmmPtr == nullptr) { if(gpsmmShmPtr == nullptr) {
gpsmmPtr = new gpsmm("localhost", DEFAULT_GPSD_PORT); gpsmmShmPtr = new gpsmm("localhost", DEFAULT_GPSD_PORT);
} }
// The data from the device will generally be read all at once. Therefore, we // The data from the device will generally be read all at once. Therefore, we
// can set all field here // can set all field here
if (not gpsmmPtr->is_open()) { if (not gpsmmShmPtr->is_open()) {
if (gpsNotOpenSwitch) { if (gpsNotOpenSwitch) {
// Opening failed // Opening failed
#if FSFW_VERBOSE_LEVEL >= 1 #if FSFW_VERBOSE_LEVEL >= 1
@ -292,11 +292,11 @@ void Q7STestTask::testGpsDaemonSocket() {
} }
// Stopwatch watch; // Stopwatch watch;
gps_data_t *gps = nullptr; gps_data_t *gps = nullptr;
gpsmmPtr->stream(WATCH_ENABLE | WATCH_JSON); gpsmmShmPtr->stream(WATCH_ENABLE | WATCH_JSON);
if(not gpsmmPtr->waiting(50000000)) { if(not gpsmmShmPtr->waiting(50000000)) {
return; return;
} }
gps = gpsmmPtr->read(); gps = gpsmmShmPtr->read();
if (gps == nullptr) { if (gps == nullptr) {
if (gpsReadFailedSwitch) { if (gpsReadFailedSwitch) {
gpsReadFailedSwitch = false; gpsReadFailedSwitch = false;

2
bsp_q7s/boardtest/Q7STestTask.h
View File

@ -23,7 +23,7 @@ class Q7STestTask : public TestTask {
bool gpsNotOpenSwitch = false; bool gpsNotOpenSwitch = false;
bool gpsReadFailedSwitch = false; bool gpsReadFailedSwitch = false;
int32_t noModeSetCntr = 0; int32_t noModeSetCntr = 0;
gpsmm* gpsmmPtr = nullptr; gpsmm* gpsmmShmPtr = nullptr;
CoreController* coreController = nullptr; CoreController* coreController = nullptr;
ReturnValue_t performOneShotAction() override; ReturnValue_t performOneShotAction() override;