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

v1.15.0 #311

Merged
muellerr merged 107 commits from develop into main 2022-10-27 11:28:49 +02:00
Conversation 0 Commits 107 Files Changed 81 +19 -25
3 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a2e1ed56c9 - Show all commits

2
bsp_q7s/core/ObjectFactory.cpp
View File

@ -560,7 +560,7 @@ void ObjectFactory::createSolarArrayDeploymentComponents(PowerSwitchIF& pwrSwitc
new SolarArrayDeploymentHandler(objects::SOLAR_ARRAY_DEPL_HANDLER, gpioIF, pwrSwitcher, new SolarArrayDeploymentHandler(objects::SOLAR_ARRAY_DEPL_HANDLER, gpioIF, pwrSwitcher,
pcdu::Switches::PDU2_CH5_DEPLOYMENT_MECHANISM_8V, pcdu::Switches::PDU2_CH5_DEPLOYMENT_MECHANISM_8V,
gpioIds::DEPLSA1, gpioIds::DEPLSA2); gpioIds::DEPLSA1, gpioIds::DEPLSA2, *SdCardManager::instance());
} }
void ObjectFactory::createSyrlinksComponents(PowerSwitchIF* pwrSwitcher) { void ObjectFactory::createSyrlinksComponents(PowerSwitchIF* pwrSwitcher) {

16
mission/devices/SolarArrayDeploymentHandler.cpp
View File

@ -9,7 +9,8 @@ SolarArrayDeploymentHandler::SolarArrayDeploymentHandler(object_id_t setObjectId
GpioIF& gpioInterface, GpioIF& gpioInterface,
PowerSwitchIF& mainLineSwitcher_, PowerSwitchIF& mainLineSwitcher_,
pcdu::Switches mainLineSwitch_, pcdu::Switches mainLineSwitch_,
gpioId_t deplSA1, gpioId_t deplSA2) gpioId_t deplSA1, gpioId_t deplSA2,
SdCardMountedIF& sdcMountedIF)
: SystemObject(setObjectId_), : SystemObject(setObjectId_),
gpioInterface(gpioInterface), gpioInterface(gpioInterface),
deplSA1(deplSA1), deplSA1(deplSA1),
@ -25,25 +26,16 @@ SolarArrayDeploymentHandler::SolarArrayDeploymentHandler(object_id_t setObjectId
SolarArrayDeploymentHandler::~SolarArrayDeploymentHandler() {} SolarArrayDeploymentHandler::~SolarArrayDeploymentHandler() {}
ReturnValue_t SolarArrayDeploymentHandler::performOperation(uint8_t operationCode) { ReturnValue_t SolarArrayDeploymentHandler::performOperation(uint8_t operationCode) {
if (operationCode == DeviceHandlerIF::PERFORM_OPERATION) {
handleStateMachine(); handleStateMachine();
return returnvalue::OK; return returnvalue::OK;
} }
return returnvalue::OK;
}
ReturnValue_t SolarArrayDeploymentHandler::initialize() { ReturnValue_t SolarArrayDeploymentHandler::initialize() {
ReturnValue_t result = SystemObject::initialize(); ReturnValue_t result = actionHelper.initialize(commandQueue);
if (result != returnvalue::OK) { if (result != returnvalue::OK) {
return ObjectManagerIF::CHILD_INIT_FAILED; return ObjectManagerIF::CHILD_INIT_FAILED;
} }
return SystemObject::initialize();
result = actionHelper.initialize(commandQueue);
if (result != returnvalue::OK) {
return ObjectManagerIF::CHILD_INIT_FAILED;
}
return returnvalue::OK;
} }
void SolarArrayDeploymentHandler::handleStateMachine() { void SolarArrayDeploymentHandler::handleStateMachine() {

24
mission/devices/SolarArrayDeploymentHandler.h
View File

@ -1,16 +1,17 @@
#ifndef MISSION_DEVICES_SOLARARRAYDEPLOYMENT_H_ #ifndef MISSION_DEVICES_SOLARARRAYDEPLOYMENT_H_
#define MISSION_DEVICES_SOLARARRAYDEPLOYMENT_H_ #define MISSION_DEVICES_SOLARARRAYDEPLOYMENT_H_
#include <devices/powerSwitcherList.h> #include "devices/powerSwitcherList.h"
#include <fsfw/action/HasActionsIF.h> #include "fsfw/action/HasActionsIF.h"
#include <fsfw/devicehandlers/CookieIF.h> #include "fsfw/devicehandlers/CookieIF.h"
#include <fsfw/devicehandlers/DeviceHandlerIF.h> #include "fsfw/devicehandlers/DeviceHandlerIF.h"
#include <fsfw/objectmanager/SystemObject.h> #include "fsfw/objectmanager/SystemObject.h"
#include <fsfw/power/PowerSwitchIF.h> #include "fsfw/power/PowerSwitchIF.h"
#include <fsfw/returnvalues/returnvalue.h> #include "fsfw/returnvalues/returnvalue.h"
#include <fsfw/tasks/ExecutableObjectIF.h> #include "fsfw/tasks/ExecutableObjectIF.h"
#include <fsfw/timemanager/Countdown.h> #include "fsfw/timemanager/Countdown.h"
#include <fsfw_hal/common/gpio/GpioIF.h> #include "fsfw_hal/common/gpio/GpioIF.h"
#include "mission/memory/SdCardMountedIF.h"
#include <unordered_map> #include <unordered_map>
@ -45,7 +46,8 @@ class SolarArrayDeploymentHandler : public ExecutableObjectIF,
*/ */
SolarArrayDeploymentHandler(object_id_t setObjectId, GpioIF& gpio, SolarArrayDeploymentHandler(object_id_t setObjectId, GpioIF& gpio,
PowerSwitchIF& mainLineSwitcher, pcdu::Switches mainLineSwitch, PowerSwitchIF& mainLineSwitcher, pcdu::Switches mainLineSwitch,
gpioId_t deplSA1, gpioId_t deplSA2); gpioId_t deplSA1, gpioId_t deplSA2,
SdCardMountedIF& sdcMountedIF);
virtual ~SolarArrayDeploymentHandler(); virtual ~SolarArrayDeploymentHandler();