From 52d94f44d452cea3b6f0516d95f9a9be0d6f25ae Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Wed, 1 Jun 2022 10:48:18 +0200 Subject: [PATCH] device temeprature set --- bsp_q7s/core/ObjectFactory.cpp | 1 - mission/controller/ThermalController.cpp | 423 +++++++++++++++++- .../ThermalControllerDefinitions.h | 63 ++- tmtc | 2 +- 4 files changed, 476 insertions(+), 13 deletions(-) diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp index dbef1841..fffc19dc 100644 --- a/bsp_q7s/core/ObjectFactory.cpp +++ b/bsp_q7s/core/ObjectFactory.cpp @@ -6,7 +6,6 @@ #include "bsp_q7s/callbacks/pcduSwitchCb.h" #include "bsp_q7s/callbacks/q7sGpioCallbacks.h" #include "bsp_q7s/callbacks/rwSpiCallback.h" -#include "bsp_q7s/core/CoreController.h" #include "bsp_q7s/memory/FileSystemHandler.h" #include "busConf.h" #include "ccsdsConfig.h" diff --git a/mission/controller/ThermalController.cpp b/mission/controller/ThermalController.cpp index 0f693a9f..ab0c28b4 100644 --- a/mission/controller/ThermalController.cpp +++ b/mission/controller/ThermalController.cpp @@ -2,6 +2,17 @@ #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include ThermalController::ThermalController(object_id_t objectId, object_id_t parentId) : ExtendedControllerBase(objectId, parentId), @@ -136,8 +147,51 @@ ReturnValue_t ThermalController::initializeLocalDataPool(localpool::DataPool& lo localDataPoolMap.emplace(thermalControllerDefinitions::COMPONENT_RW, new PoolEntry({0.0})); + localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_Q7S, new PoolEntry({0.0})); + localDataPoolMap.emplace(thermalControllerDefinitions::BATTERY_TEMP_1, + new PoolEntry({0.0})); + localDataPoolMap.emplace(thermalControllerDefinitions::BATTERY_TEMP_2, + new PoolEntry({0.0})); + localDataPoolMap.emplace(thermalControllerDefinitions::BATTERY_TEMP_3, + new PoolEntry({0.0})); + localDataPoolMap.emplace(thermalControllerDefinitions::BATTERY_TEMP_4, + new PoolEntry({0.0})); + localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_RW1, new PoolEntry({0})); + localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_RW2, new PoolEntry({0})); + localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_RW3, new PoolEntry({0})); + localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_RW4, new PoolEntry({0})); + localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_STAR_TRACKER, + new PoolEntry({0.0})); + localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_SYRLINKS_POWER_AMPLIFIER, + new PoolEntry({0.0})); + localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_SYRLINKS_BASEBAND_BOARD, + new PoolEntry({0.0})); + localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_MGT, new PoolEntry({0})); + localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_ACU, new PoolEntry({0})); + localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_PDU1, new PoolEntry({0})); + localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_PDU2, new PoolEntry({0})); + localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_1_P60DOCK, + new PoolEntry({0})); + localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_2_P60DOCK, + new PoolEntry({0})); + localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_GYRO_0_SIDE_A, + new PoolEntry({0.0})); + localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_GYRO_1_SIDE_A, + new PoolEntry({0.0})); + localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_GYRO_2_SIDE_B, + new PoolEntry({0.0})); + localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_GYRO_3_SIDE_B, + new PoolEntry({0.0})); + localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_MGM_0_SIDE_A, + new PoolEntry({0.0})); + localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_MGM_2_SIDE_B, + new PoolEntry({0.0})); + localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_ADC_PAYLOAD_PCDU, + new PoolEntry({0.0})); + poolManager.subscribeForPeriodicPacket(sensorTemperatures.getSid(), true, 1.0, false); poolManager.subscribeForPeriodicPacket(susTemperatures.getSid(), true, 1.0, false); + poolManager.subscribeForPeriodicPacket(deviceTemperatures.getSid(), true, 1.0, false); return RETURN_OK; } @@ -437,4 +491,371 @@ void ThermalController::copySus() { } } -void ThermalController::copyDevices() {} +void ThermalController::copyDevices() { + lp_var_t tempQ7s = lp_var_t(objects::CORE_CONTROLLER, core::PoolIds::TEMPERATURE); + ReturnValue_t result = tempQ7s.read(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to read Q7S temperature" << std::endl; + deviceTemperatures.q7s.setValid(false); + } + else { + deviceTemperatures.q7s = tempQ7s; + deviceTemperatures.q7s.setValid(tempQ7s.isValid()); + } + result = tempQ7s.commit(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to commit" << std::endl; + } + lp_var_t battTemp1 = lp_var_t(objects::BPX_BATT_HANDLER, BpxBattery::BATT_TEMP_1); + result = battTemp1.read(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to read battery temperature 1" << std::endl; + deviceTemperatures.batteryTemp1.setValid(false); + } + else { + deviceTemperatures.batteryTemp1 = battTemp1; + deviceTemperatures.batteryTemp1.setValid(battTemp1.isValid()); + } + result = battTemp1.commit(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to commit" << std::endl; + } + lp_var_t battTemp2 = lp_var_t(objects::BPX_BATT_HANDLER, BpxBattery::BATT_TEMP_2); + result = battTemp2.read(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to read battery temperature 2" << std::endl; + deviceTemperatures.batteryTemp2.setValid(false); + } + else { + deviceTemperatures.batteryTemp2 = battTemp2; + deviceTemperatures.batteryTemp2.setValid(battTemp2.isValid()); + } + result = battTemp2.commit(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to commit" << std::endl; + } + lp_var_t battTemp3 = lp_var_t(objects::BPX_BATT_HANDLER, BpxBattery::BATT_TEMP_3); + result = battTemp3.read(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to read battery temperature 3" << std::endl; + deviceTemperatures.batteryTemp3.setValid(false); + } + else { + deviceTemperatures.batteryTemp3 = battTemp3; + deviceTemperatures.batteryTemp3.setValid(battTemp3.isValid()); + } + result = battTemp3.commit(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to commit" << std::endl; + } + lp_var_t battTemp4 = lp_var_t(objects::BPX_BATT_HANDLER, BpxBattery::BATT_TEMP_4); + result = battTemp4.read(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to read battery temperature 4" << std::endl; + deviceTemperatures.batteryTemp4.setValid(false); + } + else { + deviceTemperatures.batteryTemp4 = battTemp4; + deviceTemperatures.batteryTemp4.setValid(battTemp4.isValid()); + } + result = battTemp4.commit(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to commit" << std::endl; + } + lp_var_t tempRw1 = lp_var_t(objects::RW1, RwDefinitions::TEMPERATURE_C); + result = tempRw1.read(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to read reaction wheel 1 temperature" << std::endl; + deviceTemperatures.rw1.setValid(false); + } + else { + deviceTemperatures.rw1.setValid(tempRw1.isValid()); + deviceTemperatures.rw1 = tempRw1; + } + result = tempRw1.commit(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to commit" << std::endl; + } + lp_var_t tempRw2 = lp_var_t(objects::RW2, RwDefinitions::TEMPERATURE_C); + result = tempRw2.read(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to read reaction wheel 2 temperature" << std::endl; + deviceTemperatures.rw2.setValid(false); + } + else { + deviceTemperatures.rw2.setValid(tempRw2.isValid()); + deviceTemperatures.rw2 = tempRw2; + } + result = tempRw2.commit(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to commit" << std::endl; + } + lp_var_t tempRw3 = lp_var_t(objects::RW3, RwDefinitions::TEMPERATURE_C); + result = tempRw3.read(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to read reaction wheel 3 temperature" << std::endl; + deviceTemperatures.rw3.setValid(false); + } + else { + deviceTemperatures.rw3.setValid(tempRw3.isValid()); + deviceTemperatures.rw3 = tempRw3; + } + result = tempRw3.commit(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to commit" << std::endl; + } + lp_var_t tempRw4 = lp_var_t(objects::RW4, RwDefinitions::TEMPERATURE_C); + result = tempRw4.read(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to read reaction wheel 4 temperature" << std::endl; + deviceTemperatures.rw4.setValid(false); + } + else { + deviceTemperatures.rw4.setValid(tempRw4.isValid()); + deviceTemperatures.rw4 = tempRw4; + } + result = tempRw4.commit(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to commit" << std::endl; + } + lp_var_t tempStartracker = + lp_var_t(objects::STAR_TRACKER, startracker::MCU_TEMPERATURE); + result = tempStartracker.read(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to read startracker temperature" << std::endl; + deviceTemperatures.startracker.setValid(false); + } + else { + deviceTemperatures.startracker.setValid(tempStartracker.isValid()); + deviceTemperatures.startracker = tempStartracker; + } + result = tempStartracker.commit(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to commit" << std::endl; + } + lp_var_t tempSyrlinksPowerAmplifier = + lp_var_t(objects::SYRLINKS_HK_HANDLER, syrlinks::TEMP_POWER_AMPLIFIER); + result = tempSyrlinksPowerAmplifier.read(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to read syrlinks power amplifier temperature" << std::endl; + deviceTemperatures.syrlinksPowerAmplifier.setValid(false); + } + else { + deviceTemperatures.syrlinksPowerAmplifier.setValid(tempSyrlinksPowerAmplifier.isValid()); + deviceTemperatures.syrlinksPowerAmplifier = tempSyrlinksPowerAmplifier; + } + result = tempSyrlinksPowerAmplifier.commit(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to commit" << std::endl; + } + lp_var_t tempSyrlinksBasebandBoard = + lp_var_t(objects::SYRLINKS_HK_HANDLER, syrlinks::TEMP_BASEBAND_BOARD); + result = tempSyrlinksBasebandBoard.read(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to read syrlinks baseband board temperature" << std::endl; + deviceTemperatures.syrlinksBasebandBoard.setValid(false); + } + else { + deviceTemperatures.syrlinksBasebandBoard.setValid(tempSyrlinksBasebandBoard.isValid()); + deviceTemperatures.syrlinksBasebandBoard = tempSyrlinksBasebandBoard; + } + result = tempSyrlinksBasebandBoard.commit(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to commit" << std::endl; + } + lp_var_t tempMgt = + lp_var_t(objects::IMTQ_HANDLER, IMTQ::MCU_TEMPERATURE); + result = tempMgt.read(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to read MGT temperature" << std::endl; + deviceTemperatures.mgt.setValid(false); + } + else { + deviceTemperatures.mgt.setValid(tempMgt.isValid()); + deviceTemperatures.mgt = tempMgt; + } + result = tempMgt.commit(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to commit" << std::endl; + } + lp_vec_t tempAcu = + lp_vec_t(objects::ACU_HANDLER, P60System::pool::ACU_TEMPERATURES); + result = tempAcu.read(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to read ACU temperatures" << std::endl; + deviceTemperatures.acu.setValid(false); + } + else { + deviceTemperatures.acu.setValid(tempAcu.isValid()); + deviceTemperatures.acu = tempAcu; + } + result = tempAcu.commit(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to commit" << std::endl; + } + lp_var_t tempPdu1 = + lp_var_t(objects::PDU1_HANDLER, P60System::pool::PDU_TEMPERATURE); + result = tempPdu1.read(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to read PDU1 temperature" << std::endl; + deviceTemperatures.pdu1.setValid(false); + } + else { + deviceTemperatures.pdu1.setValid(tempPdu1.isValid()); + deviceTemperatures.pdu1 = tempPdu1; + } + result = tempPdu1.commit(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to commit" << std::endl; + } + lp_var_t tempPdu2 = + lp_var_t(objects::PDU2_HANDLER, P60System::pool::PDU_TEMPERATURE); + result = tempPdu2.read(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to read PDU2 temperature" << std::endl; + deviceTemperatures.pdu2.setValid(false); + } + else { + deviceTemperatures.pdu2.setValid(tempPdu1.isValid()); + deviceTemperatures.pdu2 = tempPdu1; + } + result = tempPdu2.commit(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to commit" << std::endl; + } + lp_var_t temp1P60dock = + lp_var_t(objects::P60DOCK_HANDLER, P60System::pool::P60DOCK_TEMPERATURE_1); + result = temp1P60dock.read(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to read P60 dock temperature 1" << std::endl; + deviceTemperatures.temp1P60dock.setValid(false); + } + else { + deviceTemperatures.temp1P60dock.setValid(temp1P60dock.isValid()); + deviceTemperatures.temp1P60dock = temp1P60dock; + } + result = temp1P60dock.commit(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to commit" << std::endl; + } + lp_var_t temp2P60dock = + lp_var_t(objects::P60DOCK_HANDLER, P60System::pool::P60DOCK_TEMPERATURE_2); + result = temp2P60dock.read(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to read P60 dock temperature 2" << std::endl; + deviceTemperatures.temp2P60dock.setValid(false); + } + else { + deviceTemperatures.temp2P60dock.setValid(temp2P60dock.isValid()); + deviceTemperatures.temp2P60dock = temp2P60dock; + } + result = temp2P60dock.commit(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to commit" << std::endl; + } + lp_var_t tempGyro0 = + lp_var_t(objects::GYRO_0_ADIS_HANDLER, ADIS1650X::TEMPERATURE); + result = tempGyro0.read(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to read gyro 0 temperature" << std::endl; + deviceTemperatures.gyro0SideA.setValid(false); + } + else { + deviceTemperatures.gyro0SideA.setValid(tempGyro0.isValid()); + deviceTemperatures.gyro0SideA = tempGyro0; + } + result = tempGyro0.commit(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to commit" << std::endl; + } + lp_var_t tempGyro1 = + lp_var_t(objects::GYRO_1_L3G_HANDLER, L3GD20H::TEMPERATURE); + result = tempGyro1.read(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to read gyro 1 temperature" << std::endl; + deviceTemperatures.gyro1SideA.setValid(false); + } + else { + deviceTemperatures.gyro1SideA.setValid(tempGyro1.isValid()); + deviceTemperatures.gyro1SideA = tempGyro1; + } + result = tempGyro1.commit(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to commit" << std::endl; + } + lp_var_t tempGyro2 = + lp_var_t(objects::GYRO_2_ADIS_HANDLER, ADIS1650X::TEMPERATURE); + result = tempGyro2.read(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to read gyro 2 temperature" << std::endl; + deviceTemperatures.gyro2SideB.setValid(false); + } + else { + deviceTemperatures.gyro2SideB.setValid(tempGyro2.isValid()); + deviceTemperatures.gyro2SideB = tempGyro2; + } + result = tempGyro2.commit(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to commit" << std::endl; + } + lp_var_t tempGyro3 = + lp_var_t(objects::GYRO_3_L3G_HANDLER, L3GD20H::TEMPERATURE); + result = tempGyro3.read(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to read gyro 3 temperature" << std::endl; + deviceTemperatures.gyro3SideB.setValid(false); + } + else { + deviceTemperatures.gyro3SideB.setValid(tempGyro3.isValid()); + deviceTemperatures.gyro3SideB = tempGyro3; + } + result = tempGyro3.commit(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to commit" << std::endl; + } + lp_var_t tempMgm0 = + lp_var_t(objects::MGM_0_LIS3_HANDLER, MGMLIS3MDL::TEMPERATURE_CELCIUS); + result = tempMgm0.read(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to read MGM 0 temperature" << std::endl; + deviceTemperatures.mgm0SideA.setValid(false); + } + else { + deviceTemperatures.mgm0SideA.setValid(tempMgm0.isValid()); + deviceTemperatures.mgm0SideA = tempMgm0; + } + result = tempMgm0.commit(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to commit" << std::endl; + } + lp_var_t tempMgm2 = + lp_var_t(objects::MGM_2_LIS3_HANDLER, MGMLIS3MDL::TEMPERATURE_CELCIUS); + result = tempMgm2.read(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to read MGM 2 temperature" << std::endl; + deviceTemperatures.mgm2SideB.setValid(false); + } + else { + deviceTemperatures.mgm2SideB.setValid(tempMgm2.isValid()); + deviceTemperatures.mgm2SideB = tempMgm2; + } + result = tempMgm2.commit(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to commit" << std::endl; + } + lp_var_t tempAdcPayloadPcdu = + lp_var_t(objects::PLPCDU_HANDLER, plpcdu::TEMP); + result = tempAdcPayloadPcdu.read(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to read payload PCDU ADC temperature" << std::endl; + deviceTemperatures.adcPayloadPcdu.setValid(false); + } + else { + deviceTemperatures.adcPayloadPcdu.setValid(tempAdcPayloadPcdu.isValid()); + deviceTemperatures.adcPayloadPcdu = tempAdcPayloadPcdu; + } + result = tempAdcPayloadPcdu.commit(); + if (result != RETURN_OK) { + sif::warning << "ThermalController: Failed to commit" << std::endl; + } +} diff --git a/mission/controller/controllerdefinitions/ThermalControllerDefinitions.h b/mission/controller/controllerdefinitions/ThermalControllerDefinitions.h index 065621d4..1c39b0ac 100644 --- a/mission/controller/controllerdefinitions/ThermalControllerDefinitions.h +++ b/mission/controller/controllerdefinitions/ThermalControllerDefinitions.h @@ -49,22 +49,39 @@ enum PoolIds : lp_id_t { COMPONENT_RW, TEMP_Q7S, - TEMP_BATTERY, - TEMP_RW0, + BATTERY_TEMP_1, + BATTERY_TEMP_2, + BATTERY_TEMP_3, + BATTERY_TEMP_4, TEMP_RW1, TEMP_RW2, TEMP_RW3, + TEMP_RW4, TEMP_STAR_TRACKER, TEMP_SYRLINKS_POWER_AMPLIFIER, TEMP_SYRLINKS_BASEBAND_BOARD, TEMP_MGT, - + TEMP_ACU, + TEMP_PDU1, + TEMP_PDU2, + TEMP_1_P60DOCK, + TEMP_2_P60DOCK, + TEMP_GYRO_0_SIDE_A, + TEMP_GYRO_1_SIDE_A, + TEMP_GYRO_2_SIDE_B, + TEMP_GYRO_3_SIDE_B, + TEMP_MGM_0_SIDE_A, + TEMP_MGM_2_SIDE_B, + TEMP_ADC_PAYLOAD_PCDU }; +static const uint8_t ENTRIES_SENSOR_TEMPERATURE_SET = 18; +static const uint8_t ENTRIES_DEVICE_TEMPERATURE_SET = 25; + /** * @brief This dataset can be used to store the collected temperatures of all temperature sensors */ -class SensorTemperatures : public StaticLocalDataSet<18> { +class SensorTemperatures : public StaticLocalDataSet { public: SensorTemperatures(HasLocalDataPoolIF* owner) : StaticLocalDataSet(owner, SENSOR_TEMPERATURES) {} @@ -99,17 +116,43 @@ class SensorTemperatures : public StaticLocalDataSet<18> { /** * @brief This dataset can be used to store the collected temperatures of all device temperature - * sensors + * sensors */ -class DeviceTemperatures : public StaticLocalDataSet<1> { +class DeviceTemperatures : public StaticLocalDataSet { public: - DeviceTemperatures(HasLocalDataPoolIF* owner) : StaticLocalDataSet(owner, SENSOR_TEMPERATURES) {} + DeviceTemperatures(HasLocalDataPoolIF* owner) : StaticLocalDataSet(owner, DEVICE_TEMPERATURES) {} DeviceTemperatures(object_id_t objectId) : StaticLocalDataSet(sid_t(objectId, DEVICE_TEMPERATURES)) {} - lp_var_t q7s = - lp_var_t(sid.objectId, PoolIds::SUS_0_N_LOC_XFYFZM_PT_XF, this); + lp_var_t q7s = lp_var_t(sid.objectId, PoolIds::TEMP_Q7S, this); + lp_var_t batteryTemp1 = lp_var_t(sid.objectId, PoolIds::BATTERY_TEMP_1, this); + lp_var_t batteryTemp2 = lp_var_t(sid.objectId, PoolIds::BATTERY_TEMP_2, this); + lp_var_t batteryTemp3 = lp_var_t(sid.objectId, PoolIds::BATTERY_TEMP_3, this); + lp_var_t batteryTemp4 = lp_var_t(sid.objectId, PoolIds::BATTERY_TEMP_4, this); + lp_var_t rw1 = lp_var_t(sid.objectId, PoolIds::TEMP_RW1, this); + lp_var_t rw2 = lp_var_t(sid.objectId, PoolIds::TEMP_RW2, this); + lp_var_t rw3 = lp_var_t(sid.objectId, PoolIds::TEMP_RW3, this); + lp_var_t rw4 = lp_var_t(sid.objectId, PoolIds::TEMP_RW4, this); + lp_var_t startracker = lp_var_t(sid.objectId, PoolIds::TEMP_STAR_TRACKER, this); + lp_var_t syrlinksPowerAmplifier = + lp_var_t(sid.objectId, PoolIds::TEMP_SYRLINKS_POWER_AMPLIFIER, this); + lp_var_t syrlinksBasebandBoard = + lp_var_t(sid.objectId, PoolIds::TEMP_SYRLINKS_BASEBAND_BOARD, this); + lp_var_t mgt = lp_var_t(sid.objectId, PoolIds::TEMP_MGT, this); + lp_vec_t acu = lp_vec_t(sid.objectId, PoolIds::TEMP_ACU, this); + lp_var_t pdu1 = lp_var_t(sid.objectId, PoolIds::TEMP_PDU1, this); + lp_var_t pdu2 = lp_var_t(sid.objectId, PoolIds::TEMP_PDU2, this); + lp_var_t temp1P60dock = lp_var_t(sid.objectId, PoolIds::TEMP_1_P60DOCK, this); + lp_var_t temp2P60dock = lp_var_t(sid.objectId, PoolIds::TEMP_2_P60DOCK, this); + lp_var_t gyro0SideA = lp_var_t(sid.objectId, PoolIds::TEMP_GYRO_0_SIDE_A, this); + lp_var_t gyro1SideA = lp_var_t(sid.objectId, PoolIds::TEMP_GYRO_1_SIDE_A, this); + lp_var_t gyro2SideB = lp_var_t(sid.objectId, PoolIds::TEMP_GYRO_2_SIDE_B, this); + lp_var_t gyro3SideB = lp_var_t(sid.objectId, PoolIds::TEMP_GYRO_3_SIDE_B, this); + lp_var_t mgm0SideA = lp_var_t(sid.objectId, PoolIds::TEMP_MGM_0_SIDE_A, this); + lp_var_t mgm2SideB = lp_var_t(sid.objectId, PoolIds::TEMP_MGM_2_SIDE_B, this); + lp_var_t adcPayloadPcdu = + lp_var_t(sid.objectId, PoolIds::TEMP_ADC_PAYLOAD_PCDU, this); }; /** @@ -121,7 +164,7 @@ class SusTemperatures : public StaticLocalDataSet<12> { SusTemperatures(HasLocalDataPoolIF* owner) : StaticLocalDataSet(owner, SUS_TEMPERATURES) {} SusTemperatures(object_id_t objectId) - : StaticLocalDataSet(sid_t(objectId, DEVICE_TEMPERATURES)) {} + : StaticLocalDataSet(sid_t(objectId, SUS_TEMPERATURES)) {} lp_var_t sus_0_n_loc_xfyfzm_pt_xf = lp_var_t(sid.objectId, PoolIds::SUS_0_N_LOC_XFYFZM_PT_XF, this); diff --git a/tmtc b/tmtc index cba2055c..38b8f2a0 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit cba2055c59de43c9e9572e8549e555aaab785481 +Subproject commit 38b8f2a02f4bfe4909dfe97f37ed95c3d67648dc