diff --git a/dummies/GpsDummy.cpp b/dummies/GpsDummy.cpp index d1f526d2..893e8464 100644 --- a/dummies/GpsDummy.cpp +++ b/dummies/GpsDummy.cpp @@ -37,8 +37,8 @@ uint32_t GpsDummy::getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) { return ReturnValue_t GpsDummy::initializeLocalDataPool(localpool::DataPool &localDataPoolMap, LocalDataPoolManager &poolManager) { - localDataPoolMap.emplace(GpsHyperion::LATITUDE, new PoolEntry({0.0})); - localDataPoolMap.emplace(GpsHyperion::LONGITUDE, new PoolEntry({0.0})); + localDataPoolMap.emplace(GpsHyperion::LATITUDE, new PoolEntry({0.0}, 1)); + localDataPoolMap.emplace(GpsHyperion::LONGITUDE, new PoolEntry({0.0}, 1)); localDataPoolMap.emplace(GpsHyperion::ALTITUDE, new PoolEntry({0.0})); localDataPoolMap.emplace(GpsHyperion::SPEED, new PoolEntry({7684.2})); localDataPoolMap.emplace(GpsHyperion::FIX_MODE, new PoolEntry({0})); diff --git a/dummies/SusDummy.cpp b/dummies/SusDummy.cpp index 706f08f0..46b2ec68 100644 --- a/dummies/SusDummy.cpp +++ b/dummies/SusDummy.cpp @@ -1,5 +1,7 @@ + #include "SusDummy.h" +#include #include #include @@ -28,7 +30,6 @@ ReturnValue_t SusDummy::initialize() { return result; } } - return returnvalue::OK; } @@ -37,29 +38,30 @@ ReturnValue_t SusDummy::handleCommandMessage(CommandMessage* message) { } void SusDummy::performControlOperation() { - iteration++; - value = sin(iteration / 80. * M_PI + 10) * 10 - 10; + // value = sin(iteration / 80. * M_PI + 10) * 10 - 10; susSet.read(); -// susSet.temperatureCelcius = value; -// if ((iteration % 100) < 20) { -// susSet.setValidity(false, true); -// } else { -// susSet.setValidity(true, true); -// } + // susSet.temperatureCelcius = value; + // if ((iteration % 100) < 20) { + // susSet.setValidity(false, true); + // } else { + // susSet.setValidity(true, true); + // } susSet.channels[0] = 3913; susSet.channels[1] = 3912; susSet.channels[2] = 3799; susSet.channels[3] = 3797; susSet.channels[4] = 4056; + susSet.setValidity(true, true); susSet.commit(); + iteration++; } ReturnValue_t SusDummy::initializeLocalDataPool(localpool::DataPool& localDataPoolMap, LocalDataPoolManager& poolManager) { localDataPoolMap.emplace(SUS::SusPoolIds::TEMPERATURE_C, new PoolEntry({0}, 1, true)); localDataPoolMap.emplace(SUS::SusPoolIds::CHANNEL_VEC, - new PoolEntry({0, 0, 0, 0, 0, 0},true)); + new PoolEntry({0, 0, 0, 0, 0, 0}, true)); return returnvalue::OK; } diff --git a/dummies/SusDummy.h b/dummies/SusDummy.h index bdabaafc..3e24f368 100644 --- a/dummies/SusDummy.h +++ b/dummies/SusDummy.h @@ -24,4 +24,4 @@ class SusDummy : public ExtendedControllerBase { int iteration = 0; float value = 0; SUS::SusDataset susSet; -}; \ No newline at end of file +};