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

SoC Calculator #754

Merged
muellerr merged 74 commits from soc-calculator into main 2023-10-11 10:50:48 +02:00
Conversation 1 Commits 74 Files Changed 52 +10 -2
6 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1dd38acee4 - Show all commits

1
bsp_q7s/em/emObjectFactory.cpp
View File

@ -155,5 +155,6 @@ void ObjectFactory::produce(void* args) {
HeaterHandler* heaterHandler; HeaterHandler* heaterHandler;
createHeaterComponents(gpioComIF, pwrSwitcher, healthTable, heaterHandler); createHeaterComponents(gpioComIF, pwrSwitcher, healthTable, heaterHandler);
createThermalController(*heaterHandler); createThermalController(*heaterHandler);
createPowerController(enableHkSets);
satsystem::init(); satsystem::init();
} }

1
bsp_q7s/fmObjectFactory.cpp
View File

@ -113,5 +113,6 @@ void ObjectFactory::produce(void* args) {
createMiscComponents(); createMiscComponents();
createThermalController(*heaterHandler); createThermalController(*heaterHandler);
createAcsController(true, enableHkSets); createAcsController(true, enableHkSets);
createPowerC
satsystem::init(); satsystem::init();
} }

2
linux/ObjectFactory.h
View File

@ -16,6 +16,7 @@ class GpioIF;
class SpiComIF; class SpiComIF;
class PowerSwitchIF; class PowerSwitchIF;
class AcsController; class AcsController;
class PowerController;
namespace ObjectFactory { namespace ObjectFactory {
@ -31,5 +32,6 @@ void createScexComponents(std::string uartDev, PowerSwitchIF* pwrSwitcher,
void gpioChecker(ReturnValue_t result, std::string output); void gpioChecker(ReturnValue_t result, std::string output);
AcsController* createAcsController(bool connectSubsystem, bool enableHkSets); AcsController* createAcsController(bool connectSubsystem, bool enableHkSets);
PowerController* createPowerController(bool enableHkSets);
} // namespace ObjectFactory } // namespace ObjectFactory

3
mission/controller/CMakeLists.txt
View File

@ -1,6 +1,7 @@
if(TGT_BSP MATCHES "arm/q7s" OR TGT_BSP MATCHES "") if(TGT_BSP MATCHES "arm/q7s" OR TGT_BSP MATCHES "")
target_sources(${LIB_EIVE_MISSION} PRIVATE ThermalController.cpp target_sources(${LIB_EIVE_MISSION} PRIVATE ThermalController.cpp
AcsController.cpp) AcsController.cpp
PowerController.cpp)
endif() endif()
add_subdirectory(acs) add_subdirectory(acs)

3
mission/controller/PowerController.cpp
View File

@ -2,13 +2,14 @@
#include <mission/controller/PowerController.h> #include <mission/controller/PowerController.h>
PowerController::PowerController(object_id_t objectId, bool enableHkSets) PowerController::PowerController(object_id_t objectId, bool enableHkSets)
: ExtendedControllerBase(objectId), enableHkSets(enableHkSets) {} : ExtendedControllerBase(objectId), enableHkSets(enableHkSets), parameterHelper(this) {}
ReturnValue_t PowerController::initialize() { ReturnValue_t PowerController::initialize() {
ReturnValue_t result = parameterHelper.initialize(); ReturnValue_t result = parameterHelper.initialize();
if (result != returnvalue::OK) { if (result != returnvalue::OK) {
return result; return result;
} }
sif::debug << "fuck you" << std::endl;
return ExtendedControllerBase::initialize(); return ExtendedControllerBase::initialize();
} }

2
mission/controller/PowerController.h
View File

@ -32,6 +32,8 @@ class PowerController : public ExtendedControllerBase, public ReceivesParameterM
ReturnValue_t initializeLocalDataPool(localpool::DataPool& localDataPoolMap, ReturnValue_t initializeLocalDataPool(localpool::DataPool& localDataPoolMap,
LocalDataPoolManager& poolManager) override; LocalDataPoolManager& poolManager) override;
LocalPoolDataSetBase* getDataSetHandle(sid_t sid) override; LocalPoolDataSetBase* getDataSetHandle(sid_t sid) override;
ReturnValue_t checkModeCommand(Mode_t mode, Submode_t submode,
uint32_t* msToReachTheMode) override;
void performControlOperation() override; void performControlOperation() override;
}; };