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

bug fixed
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
Details

Browse Source
This commit is contained in:
Irini Kosmidou
2023-01-22 20:37:51 +01:00
parent 2b3fe93906
commit 6fd10e7180
5 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dummies/TemperatureSensorInserter.cpp
View File

@ -6,8 +6,8 @@
#include <cstdlib>
TemperatureSensorInserter::TemperatureSensorInserter(
object_id_t objectId, const std::map<object_id_t, Max31865Dummy>& tempSensorDummies_,
const std::map<object_id_t, Tmp1075Dummy>& 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() {

4
dummies/TemperatureSensorInserter.h
View File

@ -9,8 +9,8 @@
class TemperatureSensorInserter : public ExecutableObjectIF, public SystemObject {
public:
explicit TemperatureSensorInserter(
object_id_t objectId, const std::map<object_id_t, Max31865Dummy>& tempSensorDummies_,
const std::map<object_id_t, Tmp1075Dummy>& tempTmpSensorDummies_);
object_id_t objectId, const std::map<object_id_t, Max31865Dummy*>& tempSensorDummies_,
const std::map<object_id_t, Tmp1075Dummy*>& tempTmpSensorDummies_);
ReturnValue_t initialize() override;

4
dummies/helpers.cpp
View File

@ -82,7 +82,7 @@ void dummy::createDummies(DummyCfg cfg, PowerSwitchIF& pwrSwitch) {
}
if (cfg.addTempSensorDummies) {
std::map<object_id_t, Max31865Dummy> tempSensorDummies;
std::map<object_id_t, Max31865Dummy*> tempSensorDummies;
tempSensorDummies.emplace(objects::RTD_0_IC3_PLOC_HEATSPREADER,
new Max31865Dummy(objects::RTD_0_IC3_PLOC_HEATSPREADER,
objects::DUMMY_COM_IF, comCookieDummy));
@ -132,7 +132,7 @@ void dummy::createDummies(DummyCfg cfg, PowerSwitchIF& pwrSwitch) {
objects::RTD_15_IC18_IMTQ,
new Max31865Dummy(objects::RTD_15_IC18_IMTQ, objects::DUMMY_COM_IF, comCookieDummy));
std::map<object_id_t, Tmp1075Dummy> tempTmpSensorDummies;
std::map<object_id_t, Tmp1075Dummy*> tempTmpSensorDummies;
tempTmpSensorDummies.emplace(
objects::TMP1075_HANDLER_TCS_0,
new Tmp1075Dummy(objects::TMP1075_HANDLER_TCS_0, objects::DUMMY_COM_IF, comCookieDummy));