From b9a6425078fd040f42ee58c5d8d61966ea3f68d0 Mon Sep 17 00:00:00 2001 From: Irini Kosmidou Date: Wed, 22 Feb 2023 17:50:03 +0100 Subject: [PATCH] dummy change --- bsp_hosted/scheduling.cpp | 4 ++++ dummies/TemperatureSensorInserter.cpp | 5 ++++- dummies/TemperatureSensorInserter.h | 1 + mission/controller/ThermalController.cpp | 1 + mission/devices/HeaterHandler.cpp | 2 +- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bsp_hosted/scheduling.cpp b/bsp_hosted/scheduling.cpp index 89711fa0..0434862c 100644 --- a/bsp_hosted/scheduling.cpp +++ b/bsp_hosted/scheduling.cpp @@ -158,6 +158,10 @@ void scheduling::initTasks() { if (result != returnvalue::OK) { scheduling::printAddObjectError("THERMAL_CONTROLLER", objects::THERMAL_CONTROLLER); } + result = thermalTask->addComponent(objects::HEATER_HANDLER); + if (result != returnvalue::OK) { + scheduling::printAddObjectError("HEATER_HANDLER", objects::HEATER_HANDLER); + } FixedTimeslotTaskIF* pstTask = factory->createFixedTimeslotTask( "DUMMY_PST", 75, PeriodicTaskIF::MINIMUM_STACK_SIZE * 4, 0.5, missedDeadlineFunc); diff --git a/dummies/TemperatureSensorInserter.cpp b/dummies/TemperatureSensorInserter.cpp index ac94deb7..eb9afc12 100644 --- a/dummies/TemperatureSensorInserter.cpp +++ b/dummies/TemperatureSensorInserter.cpp @@ -34,7 +34,9 @@ ReturnValue_t TemperatureSensorInserter::performOperation(uint8_t opCode) { tempsWereInitialized = true; } - + if(cycles == 10) { + max31865DummyMap[objects::RTD_14_IC17_TCS_BOARD]->setTemperature(-100, true); + } /* ReturnValue_t result = max31865PlocHeatspreaderSet.read(); if (result != returnvalue::OK) { @@ -49,6 +51,7 @@ ReturnValue_t TemperatureSensorInserter::performOperation(uint8_t opCode) { } max31865PlocHeatspreaderSet.commit(); */ + cycles++; return returnvalue::OK; } ReturnValue_t TemperatureSensorInserter::initializeAfterTaskCreation() { diff --git a/dummies/TemperatureSensorInserter.h b/dummies/TemperatureSensorInserter.h index d1ccf0a2..bb0f4ed0 100644 --- a/dummies/TemperatureSensorInserter.h +++ b/dummies/TemperatureSensorInserter.h @@ -24,6 +24,7 @@ class TemperatureSensorInserter : public ExecutableObjectIF, public SystemObject Tmp1075DummyMap tmp1075DummyMap; enum TestCase { NONE = 0, COOL_SYRLINKS = 1 }; int iteration = 0; + uint32_t cycles = 0; bool tempsWereInitialized = false; bool performTest = false; TestCase testCase = TestCase::NONE; diff --git a/mission/controller/ThermalController.cpp b/mission/controller/ThermalController.cpp index b75403bf..6ceef73d 100644 --- a/mission/controller/ThermalController.cpp +++ b/mission/controller/ThermalController.cpp @@ -1389,6 +1389,7 @@ void ThermalController::ctrlHeater(heater::Switchers switchNr, heater::Switchers if (sensorTemp < tempLimit.opLowerLimit) { heaterHandler.switchHeater(switchNr, HeaterHandler::SwitchState::ON); sif::info << "ThermalController::ctrlHeater: Heater" << switchNr << " ON" << std::endl; + //TODO: EVENT } // Heater on } else if (heaterHandler.checkSwitchState(switchNr)) { diff --git a/mission/devices/HeaterHandler.cpp b/mission/devices/HeaterHandler.cpp index 43f53bf7..4ff66f7d 100644 --- a/mission/devices/HeaterHandler.cpp +++ b/mission/devices/HeaterHandler.cpp @@ -37,7 +37,7 @@ HeaterHandler::HeaterHandler(object_id_t setObjectId_, GpioIF* gpioInterface_, H cmdQueueSize, MessageQueueMessage::MAX_MESSAGE_SIZE, &mqArgs); } -HeaterHandler::~HeaterHandler() {} +HeaterHandler::~HeaterHandler() = default; ReturnValue_t HeaterHandler::performOperation(uint8_t operationCode) { try {