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

First Version of ACS Controller #329

Merged
muellerr merged 106 commits from acs-ctrl-v1 into develop 2022-12-02 16:21:58 +01:00
Conversation 0 Commits 106 Files Changed 50 +15 -13
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ca9ef28199 - Show all commits

4
dummies/GpsDummy.cpp
View File

@ -37,8 +37,8 @@ uint32_t GpsDummy::getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) { return
ReturnValue_t GpsDummy::initializeLocalDataPool(localpool::DataPool &localDataPoolMap, ReturnValue_t GpsDummy::initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
LocalDataPoolManager &poolManager) { LocalDataPoolManager &poolManager) {
localDataPoolMap.emplace(GpsHyperion::LATITUDE, new PoolEntry<double>({0.0})); localDataPoolMap.emplace(GpsHyperion::LATITUDE, new PoolEntry<double>({0.0}, 1));
localDataPoolMap.emplace(GpsHyperion::LONGITUDE, new PoolEntry<double>({0.0})); localDataPoolMap.emplace(GpsHyperion::LONGITUDE, new PoolEntry<double>({0.0}, 1));
localDataPoolMap.emplace(GpsHyperion::ALTITUDE, new PoolEntry<double>({0.0})); localDataPoolMap.emplace(GpsHyperion::ALTITUDE, new PoolEntry<double>({0.0}));
localDataPoolMap.emplace(GpsHyperion::SPEED, new PoolEntry<double>({7684.2})); localDataPoolMap.emplace(GpsHyperion::SPEED, new PoolEntry<double>({7684.2}));
localDataPoolMap.emplace(GpsHyperion::FIX_MODE, new PoolEntry<uint8_t>({0})); localDataPoolMap.emplace(GpsHyperion::FIX_MODE, new PoolEntry<uint8_t>({0}));

8
dummies/SusDummy.cpp
View File

@ -1,5 +1,7 @@
#include "SusDummy.h" #include "SusDummy.h"
#include <fsfw/datapool/PoolReadGuard.h>
#include <objects/systemObjectList.h> #include <objects/systemObjectList.h>
#include <cmath> #include <cmath>
@ -28,7 +30,6 @@ ReturnValue_t SusDummy::initialize() {
return result; return result;
} }
} }
return returnvalue::OK; return returnvalue::OK;
} }
@ -37,8 +38,7 @@ ReturnValue_t SusDummy::handleCommandMessage(CommandMessage* message) {
} }
void SusDummy::performControlOperation() { 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.read();
// susSet.temperatureCelcius = value; // susSet.temperatureCelcius = value;
@ -52,7 +52,9 @@ void SusDummy::performControlOperation() {
susSet.channels[2] = 3799; susSet.channels[2] = 3799;
susSet.channels[3] = 3797; susSet.channels[3] = 3797;
susSet.channels[4] = 4056; susSet.channels[4] = 4056;
susSet.setValidity(true, true);
susSet.commit(); susSet.commit();
iteration++;
} }
ReturnValue_t SusDummy::initializeLocalDataPool(localpool::DataPool& localDataPoolMap, ReturnValue_t SusDummy::initializeLocalDataPool(localpool::DataPool& localDataPoolMap,