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 +14 -10
6 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 173ee62d39 - Show all commits

2
bsp_q7s/em/emObjectFactory.cpp
View File

@ -178,7 +178,7 @@ void ObjectFactory::produce(void* args) {
power::Switches::PDU1_CH5_SOLAR_CELL_EXP_5V); power::Switches::PDU1_CH5_SOLAR_CELL_EXP_5V);
#endif #endif
createAcsController(true, enableHkSets); createAcsController(true, enableHkSets);
createPowerController(enableHkSets); createPowerController(true, enableHkSets);
HeaterHandler* heaterHandler; HeaterHandler* heaterHandler;
createHeaterComponents(gpioComIF, pwrSwitcher, healthTable, heaterHandler); createHeaterComponents(gpioComIF, pwrSwitcher, healthTable, heaterHandler);
createThermalController(*heaterHandler, true); createThermalController(*heaterHandler, true);

2
bsp_q7s/fmObjectFactory.cpp
View File

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

6
linux/ObjectFactory.cpp
View File

@ -28,6 +28,7 @@
#include "devices/gpioIds.h" #include "devices/gpioIds.h"
#include "eive/definitions.h" #include "eive/definitions.h"
#include "mission/system/acs/acsModeTree.h" #include "mission/system/acs/acsModeTree.h"
#include "mission/system/power/epsModeTree.h"
#include "mission/system/tcs/tcsModeTree.h" #include "mission/system/tcs/tcsModeTree.h"
#include "mission/system/tree/payloadModeTree.h" #include "mission/system/tree/payloadModeTree.h"
#include "mission/tcs/defs.h" #include "mission/tcs/defs.h"
@ -338,8 +339,11 @@ AcsController* ObjectFactory::createAcsController(bool connectSubsystem, bool en
return acsCtrl; return acsCtrl;
} }
PowerController* ObjectFactory::createPowerController(bool enableHkSets) { PowerController* ObjectFactory::createPowerController(bool connectSubsystem, bool enableHkSets) {
auto pwrCtrl = new PowerController(objects::POWER_CONTROLLER, enableHkSets); auto pwrCtrl = new PowerController(objects::POWER_CONTROLLER, enableHkSets);
if (connectSubsystem) {
pwrCtrl->connectModeTreeParent(satsystem::eps::EPS_SUBSYSTEM);
}
return pwrCtrl; return pwrCtrl;
} }

2
linux/ObjectFactory.h
View File

@ -32,6 +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); PowerController* createPowerController(bool connectSubsystem, bool enableHkSets);
} // namespace ObjectFactory } // namespace ObjectFactory

10
mission/system/power/epsModeTree.cpp
View File

@ -5,7 +5,7 @@
#include "fsfw/subsystem/Subsystem.h" #include "fsfw/subsystem/Subsystem.h"
#include "mission/system/treeUtil.h" #include "mission/system/treeUtil.h"
EpsSubsystem satsystem::eps::SUBSYSTEM(objects::EPS_SUBSYSTEM, 12, 24); EpsSubsystem satsystem::eps::EPS_SUBSYSTEM(objects::EPS_SUBSYSTEM, 12, 24);
namespace { namespace {
// Alias for checker function // Alias for checker function
@ -27,10 +27,10 @@ auto EPS_TABLE_NORMAL_TRANS_0 = std::make_pair((NML << 24) | 2, FixedArrayList<M
Subsystem& satsystem::eps::init() { Subsystem& satsystem::eps::init() {
ModeListEntry entry; ModeListEntry entry;
buildOffSequence(SUBSYSTEM, entry); buildOffSequence(EPS_SUBSYSTEM, entry);
buildNormalSequence(SUBSYSTEM, entry); buildNormalSequence(EPS_SUBSYSTEM, entry);
SUBSYSTEM.setInitialMode(NML); EPS_SUBSYSTEM.setInitialMode(NML);
return SUBSYSTEM; return EPS_SUBSYSTEM;
} }
namespace { namespace {

2
mission/system/power/epsModeTree.h
View File

@ -6,7 +6,7 @@
namespace satsystem { namespace satsystem {
namespace eps { namespace eps {
extern EpsSubsystem SUBSYSTEM; extern EpsSubsystem EPS_SUBSYSTEM;
Subsystem& init(); Subsystem& init();
} // namespace eps } // namespace eps