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

sth broke..
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2023-03-15 15:13:53 +01:00
parent da7c450e06
commit 50a62b9243
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mission/controller/ThermalController.cpp
View File

@ -26,9 +26,9 @@ ThermalController::ThermalController(object_id_t objectId, HeaterHandler& heater
deviceTemperatures(this), deviceTemperatures(this),
heaterInfo(this), heaterInfo(this),
imtqThermalSet(objects::IMTQ_HANDLER, ThermalStateCfg()), imtqThermalSet(objects::IMTQ_HANDLER, ThermalStateCfg()),
maxSet1PlocHspd(objects::RTD_0_IC3_PLOC_HEATSPREADER, maxSet0PlocHspd(objects::RTD_0_IC3_PLOC_HEATSPREADER,
EiveMax31855::RtdCommands::EXCHANGE_SET_ID), EiveMax31855::RtdCommands::EXCHANGE_SET_ID),
maxSet0PlocMissionBrd(objects::RTD_1_IC4_PLOC_MISSIONBOARD, maxSet1PlocMissionBrd(objects::RTD_1_IC4_PLOC_MISSIONBOARD,
EiveMax31855::RtdCommands::EXCHANGE_SET_ID), EiveMax31855::RtdCommands::EXCHANGE_SET_ID),
maxSet2PlCam(objects::RTD_2_IC5_4K_CAMERA, EiveMax31855::RtdCommands::EXCHANGE_SET_ID), maxSet2PlCam(objects::RTD_2_IC5_4K_CAMERA, EiveMax31855::RtdCommands::EXCHANGE_SET_ID),
maxSet3DacHspd(objects::RTD_3_IC6_DAC_HEATSPREADER, maxSet3DacHspd(objects::RTD_3_IC6_DAC_HEATSPREADER,
@ -250,10 +250,10 @@ ReturnValue_t ThermalController::checkModeCommand(Mode_t mode, Submode_t submode
void ThermalController::copySensors() { void ThermalController::copySensors() {
{ {
PoolReadGuard pg0(&maxSet1PlocHspd, MutexIF::TimeoutType::WAITING, MUTEX_TIMEOUT); PoolReadGuard pg0(&maxSet0PlocHspd, MutexIF::TimeoutType::WAITING, MUTEX_TIMEOUT);
if (pg0.getReadResult() == returnvalue::OK) { if (pg0.getReadResult() == returnvalue::OK) {
sensorTemperatures.plocHeatspreader.value = maxSet1PlocHspd.temperatureCelcius.value; sensorTemperatures.plocHeatspreader.value = maxSet0PlocHspd.temperatureCelcius.value;
sensorTemperatures.plocHeatspreader.setValid(maxSet1PlocHspd.temperatureCelcius.isValid()); sensorTemperatures.plocHeatspreader.setValid(maxSet0PlocHspd.temperatureCelcius.isValid());
if (not sensorTemperatures.plocHeatspreader.isValid()) { if (not sensorTemperatures.plocHeatspreader.isValid()) {
sensorTemperatures.plocHeatspreader.value = INVALID_TEMPERATURE; 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) { if (pg1.getReadResult() == returnvalue::OK) {
sensorTemperatures.plocMissionboard.value = maxSet0PlocMissionBrd.temperatureCelcius.value; sensorTemperatures.plocMissionboard.value = maxSet1PlocMissionBrd.temperatureCelcius.value;
sensorTemperatures.plocMissionboard.setValid( sensorTemperatures.plocMissionboard.setValid(
maxSet0PlocMissionBrd.temperatureCelcius.isValid()); maxSet1PlocMissionBrd.temperatureCelcius.isValid());
if (not sensorTemperatures.plocMissionboard.isValid()) { if (not sensorTemperatures.plocMissionboard.isValid()) {
sensorTemperatures.plocMissionboard.value = INVALID_TEMPERATURE; sensorTemperatures.plocMissionboard.value = INVALID_TEMPERATURE;
} }

4
mission/controller/ThermalController.h
View File

@ -117,8 +117,8 @@ class ThermalController : public ExtendedControllerBase {
DeviceHandlerThermalSet imtqThermalSet; DeviceHandlerThermalSet imtqThermalSet;
// Temperature Sensors // Temperature Sensors
MAX31865::PrimarySet maxSet1PlocHspd; MAX31865::PrimarySet maxSet0PlocHspd;
MAX31865::PrimarySet maxSet0PlocMissionBrd; MAX31865::PrimarySet maxSet1PlocMissionBrd;
MAX31865::PrimarySet maxSet2PlCam; MAX31865::PrimarySet maxSet2PlCam;
MAX31865::PrimarySet maxSet3DacHspd; MAX31865::PrimarySet maxSet3DacHspd;
MAX31865::PrimarySet maxSet4Str; MAX31865::PrimarySet maxSet4Str;