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

Update to v1.1.0 #29

Merged
muellerr merged 427 commits from develop into master 2021-04-25 12:43:23 +02:00
Conversation 0 Commits 427 Files Changed 381 +29725 -1330
365 changed files with 29725 additions and 1330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 93aafb4344 - Show all commits

4
fsfwconfig/OBSWVersion.h
View File

@@ -4,8 +4,8 @@
//! TODO: Think of a cool name for the software releases. //! TODO: Think of a cool name for the software releases.
const char* const SW_NAME = "eive"; const char* const SW_NAME = "eive";
#define SW_VERSION 0 #define SW_VERSION 1
#define SW_SUBVERSION 2 #define SW_SUBVERSION 0
#define SW_SUBSUBVERSION 0 #define SW_SUBSUBVERSION 0

6
mission/devices/MGMHandlerLIS3MDL.cpp
View File

@@ -1,3 +1,4 @@
#include <fsfw/datapool/PoolReadHelper.h>
#include "MGMHandlerLIS3MDL.h" #include "MGMHandlerLIS3MDL.h"
@@ -257,13 +258,12 @@ ReturnValue_t MGMHandlerLIS3MDL::interpretDeviceReply(DeviceCommandId_t id,
sif::info << "Z: " << mgmZ << " \xC2\xB5T" << std::endl; sif::info << "Z: " << mgmZ << " \xC2\xB5T" << std::endl;
} }
#endif #endif
ReturnValue_t result = dataset.read(); PoolReadHelper readHelper(&dataset);
if(result == HasReturnvaluesIF::RETURN_OK) { if(readHelper.getReadResult() == HasReturnvaluesIF::RETURN_OK) {
dataset.fieldStrengthX = mgmX; dataset.fieldStrengthX = mgmX;
dataset.fieldStrengthY = mgmY; dataset.fieldStrengthY = mgmY;
dataset.fieldStrengthZ = mgmZ; dataset.fieldStrengthZ = mgmZ;
dataset.setValidity(true, true); dataset.setValidity(true, true);
dataset.commit();
} }
break; break;
} }