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

Thermal Controller Update #399

Merged
muellerr merged 84 commits from thermal_controller into develop 2023-04-03 15:12:49 +02:00
Conversation 0 Commits 84 Files Changed 58 +1329 -753
63 changed files with 1329 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f4b47a24c0 - Show all commits

2
CMakeLists.txt
View File

@@ -113,7 +113,7 @@ set(OBSW_ADD_TCS_CTRL
1 1
CACHE STRING "Add TCS controllers") CACHE STRING "Add TCS controllers")
set(OBSW_ADD_HEATERS set(OBSW_ADD_HEATERS
${INIT_VAL} 1
CACHE STRING "Add TCS heaters") CACHE STRING "Add TCS heaters")
set(OBSW_ADD_PLOC_SUPERVISOR set(OBSW_ADD_PLOC_SUPERVISOR
${INIT_VAL} ${INIT_VAL}

4
bsp_q7s/em/emObjectFactory.cpp
View File

@@ -137,8 +137,8 @@ void ObjectFactory::produce(void* args) {
pcdu::Switches::PDU1_CH5_SOLAR_CELL_EXP_5V); pcdu::Switches::PDU1_CH5_SOLAR_CELL_EXP_5V);
#endif #endif
createAcsController(true, enableHkSets); createAcsController(true, enableHkSets);
HeaterHandler* heaterHandler = nullptr; HeaterHandler* heaterHandler;
ObjectFactory::createGenericHeaterComponents(*gpioComIF, *pwrSwitcher, heaterHandler); createHeaterComponents(gpioComIF, pwrSwitcher, healthTable, heaterHandler);
createThermalController(*heaterHandler); createThermalController(*heaterHandler);
satsystem::init(); satsystem::init();
} }