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

start adding heater info set
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2023-01-24 15:24:39 +01:00
parent fbe0c35373
commit a0ad48d169
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mission/controller/ThermalController.cpp
View File

@ -19,6 +19,7 @@ ThermalController::ThermalController(object_id_t objectId)
sensorTemperatures(this), sensorTemperatures(this),
susTemperatures(this), susTemperatures(this),
deviceTemperatures(this), deviceTemperatures(this),
heaterInfo(this),
max31865Set0(objects::RTD_0_IC3_PLOC_HEATSPREADER, max31865Set0(objects::RTD_0_IC3_PLOC_HEATSPREADER,
EiveMax31855::RtdCommands::EXCHANGE_SET_ID), EiveMax31855::RtdCommands::EXCHANGE_SET_ID),
max31865Set1(objects::RTD_1_IC4_PLOC_MISSIONBOARD, max31865Set1(objects::RTD_1_IC4_PLOC_MISSIONBOARD,

1
mission/controller/ThermalController.h
View File

@ -37,6 +37,7 @@ class ThermalController : public ExtendedControllerBase {
thermalControllerDefinitions::SensorTemperatures sensorTemperatures; thermalControllerDefinitions::SensorTemperatures sensorTemperatures;
thermalControllerDefinitions::SusTemperatures susTemperatures; thermalControllerDefinitions::SusTemperatures susTemperatures;
thermalControllerDefinitions::DeviceTemperatures deviceTemperatures; thermalControllerDefinitions::DeviceTemperatures deviceTemperatures;
thermalControllerDefinitions::HeaterInfo heaterInfo;
// Temperature Sensors // Temperature Sensors
MAX31865::Max31865Set max31865Set0; MAX31865::Max31865Set max31865Set0;

25
mission/controller/controllerdefinitions/ThermalControllerDefinitions.h
View File

@ -3,14 +3,16 @@
#include <fsfw/datapoollocal/LocalPoolVariable.h> #include <fsfw/datapoollocal/LocalPoolVariable.h>
#include <fsfw/datapoollocal/StaticLocalDataSet.h> #include <fsfw/datapoollocal/StaticLocalDataSet.h>
#include "devices/heaterSwitcherList.h"
namespace thermalControllerDefinitions { namespace thermalControllerDefinitions {
enum SetIds : uint32_t { enum SetIds : uint32_t {
SENSOR_TEMPERATURES, SENSOR_TEMPERATURES = 0,
DEVICE_TEMPERATURES, DEVICE_TEMPERATURES = 1,
SUS_TEMPERATURES, SUS_TEMPERATURES = 2,
COMPONENT_TEMPERATURES COMPONENT_TEMPERATURES = 3,
HEATER_SET = 4,
}; };
enum PoolIds : lp_id_t { enum PoolIds : lp_id_t {
@ -75,7 +77,10 @@ enum PoolIds : lp_id_t {
TEMP_GYRO_3_SIDE_B, TEMP_GYRO_3_SIDE_B,
TEMP_MGM_0_SIDE_A, TEMP_MGM_0_SIDE_A,
TEMP_MGM_2_SIDE_B, TEMP_MGM_2_SIDE_B,
TEMP_ADC_PAYLOAD_PCDU TEMP_ADC_PAYLOAD_PCDU,
HEATER_SWITCH_LIST,
HEATER_CURRENT
}; };
static const uint8_t ENTRIES_SENSOR_TEMPERATURE_SET = 25; static const uint8_t ENTRIES_SENSOR_TEMPERATURE_SET = 25;
@ -201,6 +206,16 @@ class SusTemperatures : public StaticLocalDataSet<ENTRIES_SUS_TEMPERATURE_SET> {
lp_var_t<float>(sid.objectId, PoolIds::SUS_11_R_LOC_XBYMZB_PT_ZB, this); lp_var_t<float>(sid.objectId, PoolIds::SUS_11_R_LOC_XBYMZB_PT_ZB, this);
}; };
class HeaterInfo: public StaticLocalDataSet<12> {
public:
HeaterInfo(HasLocalDataPoolIF* owner): StaticLocalDataSet(owner, HEATER_SET) {}
HeaterInfo(object_id_t objectId): StaticLocalDataSet(sid_t(objectId, HEATER_SET)) {}
lp_vec_t<uint8_t, heater::NUMBER_OF_SWITCHES> heaterSwitchState =
lp_vec_t<uint8_t, heater::NUMBER_OF_SWITCHES>(sid.objectId, PoolIds::HEATER_SWITCH_LIST, this);
lp_var_t<int16_t> heaterCurrent = lp_var_t<int16_t>(sid.objectId, PoolIds::HEATER_CURRENT, this);
};
} // namespace thermalControllerDefinitions } // namespace thermalControllerDefinitions
#endif /* MISSION_CONTROLLER_CONTROLLERDEFINITIONS_THERMALCONTROLLERDEFINITIONS_H_ */ #endif /* MISSION_CONTROLLER_CONTROLLERDEFINITIONS_THERMALCONTROLLERDEFINITIONS_H_ */

2
tmtc

@ -1 +1 @@
Subproject commit 49f27c9923cfa13a3bafce46c37dd2631550f4af Subproject commit 5998aa12a4750584eb474b5d936fa461e9725154