KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

removed seconds typedef, confusing

Browse Source
This commit is contained in:
Robin Müller 2020-09-05 21:59:17 +02:00
parent c7606b7b1e
commit f698275a0b
7 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
datapoollocal/HasLocalDataPoolIF.h
View File

@ -4,6 +4,8 @@
#include "../datapool/PoolEntryIF.h" #include "../datapool/PoolEntryIF.h"
#include "../ipc/MessageQueueSenderIF.h" #include "../ipc/MessageQueueSenderIF.h"
#include "../housekeeping/HousekeepingMessage.h" #include "../housekeeping/HousekeepingMessage.h"
#include "../timemanager/Clock.h"
#include <map> #include <map>
class LocalDataPoolManager; class LocalDataPoolManager;
@ -85,7 +87,7 @@ public:
return HasReturnvaluesIF::RETURN_FAILED; return HasReturnvaluesIF::RETURN_FAILED;
}; };
virtual ReturnValue_t changeCollectionInterval(sid_t sid, virtual ReturnValue_t changeCollectionInterval(sid_t sid,
dur_seconds_t newInterval) { float newIntervalSeconds) {
return HasReturnvaluesIF::RETURN_FAILED; return HasReturnvaluesIF::RETURN_FAILED;
}; };
}; };

9
datapoollocal/LocalPoolDataSetBase.h
View File

@ -1,8 +1,9 @@
#ifndef FRAMEWORK_DATAPOOLLOCAL_LOCALPOOLDATASETBASE_H_ #ifndef FSFW_DATAPOOLLOCAL_LOCALPOOLDATASETBASE_H_
#define FRAMEWORK_DATAPOOLLOCAL_LOCALPOOLDATASETBASE_H_ #define FSFW_DATAPOOLLOCAL_LOCALPOOLDATASETBASE_H_
#include "HasLocalDataPoolIF.h"
#include "../datapool/DataSetIF.h" #include "../datapool/DataSetIF.h"
#include "../datapool/PoolDataSetBase.h" #include "../datapool/PoolDataSetBase.h"
#include "../datapoollocal/HasLocalDataPoolIF.h"
#include "../serialize/SerializeIF.h" #include "../serialize/SerializeIF.h"
#include <vector> #include <vector>
@ -130,4 +131,4 @@ private:
}; };
#endif /* FRAMEWORK_DATAPOOLLOCAL_LOCALPOOLDATASETBASE_H_ */ #endif /* FSFW_DATAPOOLLOCAL_LOCALPOOLDATASETBASE_H_ */

9
datapoollocal/SharedLocalDataSet.h
View File

@ -1,7 +1,8 @@
#ifndef FRAMEWORK_DATAPOOLLOCAL_SHAREDLOCALDATASET_H_ #ifndef FSFW_DATAPOOLLOCAL_SHAREDLOCALDATASET_H_
#define FRAMEWORK_DATAPOOLLOCAL_SHAREDLOCALDATASET_H_ #define FSFW_DATAPOOLLOCAL_SHAREDLOCALDATASET_H_
#include "LocalPoolDataSetBase.h"
#include "../datapool/SharedDataSetIF.h" #include "../datapool/SharedDataSetIF.h"
#include "../datapoollocal/LocalPoolDataSetBase.h"
#include "../objectmanager/SystemObject.h" #include "../objectmanager/SystemObject.h"
#include <vector> #include <vector>
@ -28,4 +29,4 @@ private:
#endif /* FRAMEWORK_DATAPOOLLOCAL_SHAREDLOCALDATASET_H_ */ #endif /* FSFW_DATAPOOLLOCAL_SHAREDLOCALDATASET_H_ */

12
datapoollocal/StaticLocalDataSet.h
View File

@ -1,5 +1,6 @@
#ifndef FRAMEWORK_DATAPOOLLOCAL_STATICLOCALDATASET_H_ #ifndef FSFW_DATAPOOLLOCAL_STATICLOCALDATASET_H_
#define FRAMEWORK_DATAPOOLLOCAL_STATICLOCALDATASET_H_ #define FSFW_DATAPOOLLOCAL_STATICLOCALDATASET_H_
#include "LocalPoolDataSetBase.h" #include "LocalPoolDataSetBase.h"
#include "../objectmanager/SystemObjectIF.h" #include "../objectmanager/SystemObjectIF.h"
#include <array> #include <array>
@ -16,12 +17,13 @@
template <uint8_t NUM_VARIABLES> template <uint8_t NUM_VARIABLES>
class StaticLocalDataSet: public LocalPoolDataSetBase { class StaticLocalDataSet: public LocalPoolDataSetBase {
public: public:
StaticLocalDataSet(sid_t sid): StaticLocalDataSet(sid_t sid): LocalPoolDataSetBase(sid, nullptr,
LocalPoolDataSetBase(sid, poolVarList.data(), NUM_VARIABLES) { NUM_VARIABLES) {
this->setContainer(poolVarList.data());
} }
private: private:
std::array<PoolVariableIF*, NUM_VARIABLES> poolVarList; std::array<PoolVariableIF*, NUM_VARIABLES> poolVarList;
}; };
#endif /* FRAMEWORK_DATAPOOLLOCAL_STATICLOCALDATASET_H_ */ #endif /* FSFW_DATAPOOLLOCAL_STATICLOCALDATASET_H_ */

1
timemanager/Clock.h
View File

@ -10,7 +10,6 @@
//! Don't use these for time points, type is not large enough for UNIX epoch. //! Don't use these for time points, type is not large enough for UNIX epoch.
using dur_millis_t = uint32_t; using dur_millis_t = uint32_t;
using dur_seconds_t = double;
class Clock { class Clock {
public: public:

2
timemanager/Stopwatch.cpp
View File

@ -18,7 +18,7 @@ dur_millis_t Stopwatch::stop() {
return elapsedTime.tv_sec * 1000 + elapsedTime.tv_usec / 1000; return elapsedTime.tv_sec * 1000 + elapsedTime.tv_usec / 1000;
} }
dur_seconds_t Stopwatch::stopSeconds() { double Stopwatch::stopSeconds() {
stopInternal(); stopInternal();
return timevalOperations::toDouble(elapsedTime); return timevalOperations::toDouble(elapsedTime);
} }

2
timemanager/Stopwatch.h
View File

@ -45,7 +45,7 @@ public:
* Calculates the elapsed time since start and returns it * Calculates the elapsed time since start and returns it
* @return elapsed time in seconds (double precision) * @return elapsed time in seconds (double precision)
*/ */
dur_seconds_t stopSeconds(); double stopSeconds();
/** /**
* Displays the elapsed times on the osstream, depending on internal display * Displays the elapsed times on the osstream, depending on internal display