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

Heater Handling #325

Merged
muellerr merged 78 commits from heater_handling into develop 2023-02-08 21:35:05 +01:00
Conversation 0 Commits 78 Files Changed 49 +7 -13
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2b3fe93906 - Show all commits

3
dummies/CMakeLists.txt
View File

@ -22,5 +22,4 @@ target_sources(
CoreControllerDummy.cpp
helpers.cpp
MgmRm3100Dummy.cpp
Tmp1075Dummy.cpp
DummyHeaterHandler.cpp)
Tmp1075Dummy.cpp)

8
dummies/TemperatureSensorInserter.cpp
View File

@ -6,11 +6,9 @@
#include <cstdlib>
TemperatureSensorInserter::TemperatureSensorInserter(
object_id_t objectId, std::map<object_id_t, Max31865Dummy> tempSensorDummies_,
std::map<object_id_t, Tmp1075Dummy> tempTmpSensorDummies_)
: SystemObject(objects::THERMAL_TEMP_INSERTER),
tempSensorDummies(tempSensorDummies_),
tempTmpSensorDummies(tempTmpSensorDummies_) {}
object_id_t objectId, const std::map<object_id_t, Max31865Dummy>& tempSensorDummies_,
const std::map<object_id_t, Tmp1075Dummy>& tempTmpSensorDummies_)
: SystemObject(objects::THERMAL_TEMP_INSERTER) {}
ReturnValue_t TemperatureSensorInserter::initialize() {
if (performTest) {

9
dummies/TemperatureSensorInserter.h
View File

@ -8,9 +8,9 @@
class TemperatureSensorInserter : public ExecutableObjectIF, public SystemObject {
public:
explicit TemperatureSensorInserter(object_id_t objectId,
std::map<object_id_t, Max31865Dummy> tempSensorDummies_,
std::map<object_id_t, Tmp1075Dummy> tempTmpSensorDummies_);
explicit TemperatureSensorInserter(
object_id_t objectId, const std::map<object_id_t, Max31865Dummy>& tempSensorDummies_,
const std::map<object_id_t, Tmp1075Dummy>& tempTmpSensorDummies_);
ReturnValue_t initialize() override;
@ -24,8 +24,5 @@ class TemperatureSensorInserter : public ExecutableObjectIF, public SystemObject
float value = 0;
TestCase testCase;
std::map<object_id_t, Max31865Dummy> tempSensorDummies;
std::map<object_id_t, Tmp1075Dummy> tempTmpSensorDummies;
// void noise();
};