From 50a62b924338a774311dd8bbf9944066f9d730a8 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 15 Mar 2023 15:13:53 +0100 Subject: [PATCH] sth broke.. --- mission/controller/ThermalController.cpp | 16 ++++++++-------- mission/controller/ThermalController.h | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mission/controller/ThermalController.cpp b/mission/controller/ThermalController.cpp index 9e698c74..43798fd8 100644 --- a/mission/controller/ThermalController.cpp +++ b/mission/controller/ThermalController.cpp @@ -26,9 +26,9 @@ ThermalController::ThermalController(object_id_t objectId, HeaterHandler& heater deviceTemperatures(this), heaterInfo(this), imtqThermalSet(objects::IMTQ_HANDLER, ThermalStateCfg()), - maxSet1PlocHspd(objects::RTD_0_IC3_PLOC_HEATSPREADER, + maxSet0PlocHspd(objects::RTD_0_IC3_PLOC_HEATSPREADER, EiveMax31855::RtdCommands::EXCHANGE_SET_ID), - maxSet0PlocMissionBrd(objects::RTD_1_IC4_PLOC_MISSIONBOARD, + maxSet1PlocMissionBrd(objects::RTD_1_IC4_PLOC_MISSIONBOARD, EiveMax31855::RtdCommands::EXCHANGE_SET_ID), maxSet2PlCam(objects::RTD_2_IC5_4K_CAMERA, EiveMax31855::RtdCommands::EXCHANGE_SET_ID), maxSet3DacHspd(objects::RTD_3_IC6_DAC_HEATSPREADER, @@ -250,10 +250,10 @@ ReturnValue_t ThermalController::checkModeCommand(Mode_t mode, Submode_t submode void ThermalController::copySensors() { { - PoolReadGuard pg0(&maxSet1PlocHspd, MutexIF::TimeoutType::WAITING, MUTEX_TIMEOUT); + PoolReadGuard pg0(&maxSet0PlocHspd, MutexIF::TimeoutType::WAITING, MUTEX_TIMEOUT); if (pg0.getReadResult() == returnvalue::OK) { - sensorTemperatures.plocHeatspreader.value = maxSet1PlocHspd.temperatureCelcius.value; - sensorTemperatures.plocHeatspreader.setValid(maxSet1PlocHspd.temperatureCelcius.isValid()); + sensorTemperatures.plocHeatspreader.value = maxSet0PlocHspd.temperatureCelcius.value; + sensorTemperatures.plocHeatspreader.setValid(maxSet0PlocHspd.temperatureCelcius.isValid()); if (not sensorTemperatures.plocHeatspreader.isValid()) { sensorTemperatures.plocHeatspreader.value = INVALID_TEMPERATURE; } @@ -261,11 +261,11 @@ void ThermalController::copySensors() { } { - PoolReadGuard pg1(&maxSet0PlocMissionBrd, MutexIF::TimeoutType::WAITING, MUTEX_TIMEOUT); + PoolReadGuard pg1(&maxSet1PlocMissionBrd, MutexIF::TimeoutType::WAITING, MUTEX_TIMEOUT); if (pg1.getReadResult() == returnvalue::OK) { - sensorTemperatures.plocMissionboard.value = maxSet0PlocMissionBrd.temperatureCelcius.value; + sensorTemperatures.plocMissionboard.value = maxSet1PlocMissionBrd.temperatureCelcius.value; sensorTemperatures.plocMissionboard.setValid( - maxSet0PlocMissionBrd.temperatureCelcius.isValid()); + maxSet1PlocMissionBrd.temperatureCelcius.isValid()); if (not sensorTemperatures.plocMissionboard.isValid()) { sensorTemperatures.plocMissionboard.value = INVALID_TEMPERATURE; } diff --git a/mission/controller/ThermalController.h b/mission/controller/ThermalController.h index aed89cde..c844091b 100644 --- a/mission/controller/ThermalController.h +++ b/mission/controller/ThermalController.h @@ -117,8 +117,8 @@ class ThermalController : public ExtendedControllerBase { DeviceHandlerThermalSet imtqThermalSet; // Temperature Sensors - MAX31865::PrimarySet maxSet1PlocHspd; - MAX31865::PrimarySet maxSet0PlocMissionBrd; + MAX31865::PrimarySet maxSet0PlocHspd; + MAX31865::PrimarySet maxSet1PlocMissionBrd; MAX31865::PrimarySet maxSet2PlCam; MAX31865::PrimarySet maxSet3DacHspd; MAX31865::PrimarySet maxSet4Str;