diff --git a/bsp_hosted/fsfwconfig/FSFWConfig.h b/bsp_hosted/fsfwconfig/FSFWConfig.h
index 261e3d6d..e3def8fe 100644
--- a/bsp_hosted/fsfwconfig/FSFWConfig.h
+++ b/bsp_hosted/fsfwconfig/FSFWConfig.h
@@ -7,19 +7,18 @@
//! Used to determine whether C++ ostreams are used which can increase
//! the binary size significantly. If this is disabled,
//! the C stdio functions can be used alternatively
-#define FSFW_CPP_OSTREAM_ENABLED 1
+#define FSFW_CPP_OSTREAM_ENABLED 1
-//! More FSFW related printouts.
-//! Be careful, this also turns off most diagnostic prinouts!
-#define FSFW_ENHANCED_PRINTOUT 0
+//! More FSFW related printouts depending on level. Useful for development.
+#define FSFW_VERBOSE_LEVEL 1
//! Can be used to completely disable printouts, even the C stdio ones.
-#if FSFW_CPP_OSTREAM_ENABLED == 0 && FSFW_ENHANCED_PRINTOUT == 0
- #define FSFW_DISABLE_PRINTOUT 0
+#if FSFW_CPP_OSTREAM_ENABLED == 0 && FSFW_VERBOSE_LEVEL == 0
+ #define FSFW_DISABLE_PRINTOUT 0
#endif
-//! Can be used to enable additional debugging printouts for developing the FSFW
-#define FSFW_PRINT_VERBOSITY_LEVEL 0
+//! Can be used to disable the ANSI color sequences for C stdio.
+#define FSFW_COLORED_OUTPUT 1
//! Can be used to disable the ANSI color sequences for C stdio.
#define FSFW_COLORED_OUTPUT 1
diff --git a/fsfwconfig/FSFWConfig.h b/fsfwconfig/FSFWConfig.h
index 261e3d6d..e3def8fe 100644
--- a/fsfwconfig/FSFWConfig.h
+++ b/fsfwconfig/FSFWConfig.h
@@ -7,19 +7,18 @@
//! Used to determine whether C++ ostreams are used which can increase
//! the binary size significantly. If this is disabled,
//! the C stdio functions can be used alternatively
-#define FSFW_CPP_OSTREAM_ENABLED 1
+#define FSFW_CPP_OSTREAM_ENABLED 1
-//! More FSFW related printouts.
-//! Be careful, this also turns off most diagnostic prinouts!
-#define FSFW_ENHANCED_PRINTOUT 0
+//! More FSFW related printouts depending on level. Useful for development.
+#define FSFW_VERBOSE_LEVEL 1
//! Can be used to completely disable printouts, even the C stdio ones.
-#if FSFW_CPP_OSTREAM_ENABLED == 0 && FSFW_ENHANCED_PRINTOUT == 0
- #define FSFW_DISABLE_PRINTOUT 0
+#if FSFW_CPP_OSTREAM_ENABLED == 0 && FSFW_VERBOSE_LEVEL == 0
+ #define FSFW_DISABLE_PRINTOUT 0
#endif
-//! Can be used to enable additional debugging printouts for developing the FSFW
-#define FSFW_PRINT_VERBOSITY_LEVEL 0
+//! Can be used to disable the ANSI color sequences for C stdio.
+#define FSFW_COLORED_OUTPUT 1
//! Can be used to disable the ANSI color sequences for C stdio.
#define FSFW_COLORED_OUTPUT 1
diff --git a/misc/eclipse/.cproject b/misc/eclipse/.cproject
index e0ac2c75..7d08be5e 100644
--- a/misc/eclipse/.cproject
+++ b/misc/eclipse/.cproject
@@ -795,69 +795,51 @@
-
+
-
-
+
-
-
-
-
-
-
-
+
+
+
+ make
+ -j16
+ clean
+ true
+ true
+ true
+
+
+ make
+ -j16
+ hardclean
+ true
+ true
+ true
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/mission/devices/GPSHandler.cpp b/mission/devices/GPSHandler.cpp
index fb549eb7..e53ce347 100644
--- a/mission/devices/GPSHandler.cpp
+++ b/mission/devices/GPSHandler.cpp
@@ -44,7 +44,7 @@ uint32_t GPSHandler::getTransitionDelayMs(Mode_t from, Mode_t to) {
}
ReturnValue_t GPSHandler::initializeLocalDataPool(
- LocalDataPool &localDataPoolMap, LocalDataPoolManager &poolManager) {
+ localpool::DataPool &localDataPoolMap, LocalDataPoolManager &poolManager) {
return HasReturnvaluesIF::RETURN_OK;
}
diff --git a/mission/devices/GPSHandler.h b/mission/devices/GPSHandler.h
index 52ac25be..01a13591 100644
--- a/mission/devices/GPSHandler.h
+++ b/mission/devices/GPSHandler.h
@@ -29,7 +29,7 @@ protected:
void fillCommandAndReplyMap() override;
void modeChanged() override;
uint32_t getTransitionDelayMs(Mode_t from, Mode_t to) override;
- ReturnValue_t initializeLocalDataPool(LocalDataPool &localDataPoolMap,
+ ReturnValue_t initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
LocalDataPoolManager &poolManager) override;
private:
diff --git a/mission/devices/GyroL3GD20Handler.cpp b/mission/devices/GyroL3GD20Handler.cpp
index 38016531..28cbdbed 100644
--- a/mission/devices/GyroL3GD20Handler.cpp
+++ b/mission/devices/GyroL3GD20Handler.cpp
@@ -1,4 +1,5 @@
#include
+#include
GyroHandler::GyroHandler(object_id_t objectId, object_id_t deviceCommunication,
CookieIF *comCookie):
@@ -171,14 +172,13 @@ ReturnValue_t GyroHandler::interpretDeviceReply(DeviceCommandId_t id,
int8_t temperaturOffset = (-1) * packet[L3GD20H::TEMPERATURE_IDX];
float temperature = 25.0 + temperaturOffset;
- result = dataset.read();
- if(result == HasReturnvaluesIF::RETURN_OK) {
+ PoolReadHelper readSet(&dataset);
+ if(readSet.getReadResult() == HasReturnvaluesIF::RETURN_OK) {
dataset.angVelocX = angVelocX;
dataset.angVelocY = angVelocY;
dataset.angVelocZ = angVelocZ;
dataset.temperature = temperature;
dataset.setValidity(true, true);
- result = dataset.commit();
}
break;
}
@@ -194,7 +194,7 @@ uint32_t GyroHandler::getTransitionDelayMs(Mode_t from, Mode_t to) {
}
ReturnValue_t GyroHandler::initializeLocalDataPool(
- LocalDataPool &localDataPoolMap, LocalDataPoolManager &poolManager) {
+ localpool::DataPool &localDataPoolMap, LocalDataPoolManager &poolManager) {
localDataPoolMap.emplace(L3GD20H::ANG_VELOC_X,
new PoolEntry({0.0}));
localDataPoolMap.emplace(L3GD20H::ANG_VELOC_Y,
diff --git a/mission/devices/GyroL3GD20Handler.h b/mission/devices/GyroL3GD20Handler.h
index 5905b26a..20396315 100644
--- a/mission/devices/GyroL3GD20Handler.h
+++ b/mission/devices/GyroL3GD20Handler.h
@@ -37,7 +37,7 @@ protected:
void fillCommandAndReplyMap() override;
void modeChanged() override;
uint32_t getTransitionDelayMs(Mode_t from, Mode_t to) override;
- ReturnValue_t initializeLocalDataPool(LocalDataPool &localDataPoolMap,
+ ReturnValue_t initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
LocalDataPoolManager &poolManager) override;
private:
diff --git a/mission/devices/MGMHandlerLIS3MDL.cpp b/mission/devices/MGMHandlerLIS3MDL.cpp
index 58740d7d..2445620d 100644
--- a/mission/devices/MGMHandlerLIS3MDL.cpp
+++ b/mission/devices/MGMHandlerLIS3MDL.cpp
@@ -423,7 +423,7 @@ void MGMHandlerLIS3MDL::modeChanged(void) {
}
ReturnValue_t MGMHandlerLIS3MDL::initializeLocalDataPool(
- LocalDataPool &localDataPoolMap, LocalDataPoolManager &poolManager) {
+ localpool::DataPool &localDataPoolMap, LocalDataPoolManager &poolManager) {
localDataPoolMap.emplace(MGMLIS3MDL::FIELD_STRENGTH_X,
new PoolEntry({0.0}));
localDataPoolMap.emplace(MGMLIS3MDL::FIELD_STRENGTH_Y,
diff --git a/mission/devices/MGMHandlerLIS3MDL.h b/mission/devices/MGMHandlerLIS3MDL.h
index 414731db..4a62ba31 100644
--- a/mission/devices/MGMHandlerLIS3MDL.h
+++ b/mission/devices/MGMHandlerLIS3MDL.h
@@ -52,7 +52,7 @@ protected:
const uint8_t *packet) override;
void fillCommandAndReplyMap() override;
void modeChanged(void) override;
- ReturnValue_t initializeLocalDataPool(LocalDataPool &localDataPoolMap,
+ ReturnValue_t initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
LocalDataPoolManager &poolManager) override;
private:
diff --git a/mission/devices/MGMHandlerRM3100.cpp b/mission/devices/MGMHandlerRM3100.cpp
index 0fda5fba..62db06a7 100644
--- a/mission/devices/MGMHandlerRM3100.cpp
+++ b/mission/devices/MGMHandlerRM3100.cpp
@@ -304,7 +304,7 @@ void MGMHandlerRM3100::modeChanged(void) {
}
ReturnValue_t MGMHandlerRM3100::initializeLocalDataPool(
- LocalDataPool &localDataPoolMap, LocalDataPoolManager &poolManager) {
+ localpool::DataPool &localDataPoolMap, LocalDataPoolManager &poolManager) {
localDataPoolMap.emplace(RM3100::FIELD_STRENGTH_X,
new PoolEntry({0.0}));
localDataPoolMap.emplace(RM3100::FIELD_STRENGTH_Y,
diff --git a/mission/devices/MGMHandlerRM3100.h b/mission/devices/MGMHandlerRM3100.h
index d735ca45..4af6b627 100644
--- a/mission/devices/MGMHandlerRM3100.h
+++ b/mission/devices/MGMHandlerRM3100.h
@@ -55,7 +55,7 @@ protected:
void fillCommandAndReplyMap() override;
void modeChanged(void) override;
uint32_t getTransitionDelayMs(Mode_t from, Mode_t to) override;
- ReturnValue_t initializeLocalDataPool(LocalDataPool &localDataPoolMap,
+ ReturnValue_t initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
LocalDataPoolManager &poolManager) override;
private: