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

ACS Subsystem Init #228

Merged
muellerr merged 83 commits from mueller/acs-ss-init into develop 2022-11-02 10:34:40 +01:00
Conversation 1 Commits 83 Files Changed 56 +2119 -4823
164 changed files with 2119 additions and 4823 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 57d37f14f3 - Show all commits

5
bsp_q7s/core/ObjectFactory.cpp
View File

@ -474,7 +474,6 @@ void ObjectFactory::createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, UartComI
objects::GYRO_2_ADIS_HANDLER, objects::GYRO_3_L3G_HANDLER, objects::GPS_CONTROLLER); objects::GYRO_2_ADIS_HANDLER, objects::GYRO_3_L3G_HANDLER, objects::GPS_CONTROLLER);
auto acsAss = auto acsAss =
new AcsBoardAssembly(objects::ACS_BOARD_ASS, pwrSwitcher, acsBoardHelper, gpioComIF); new AcsBoardAssembly(objects::ACS_BOARD_ASS, pwrSwitcher, acsBoardHelper, gpioComIF);
acsAss->connectModeTreeParent(satsystem::ACS_SUBSYSTEM);
static_cast<void>(acsAss); static_cast<void>(acsAss);
for (auto& assChild : assemblyChildren) { for (auto& assChild : assemblyChildren) {
ReturnValue_t result = assChild.get().connectModeTreeParent(*acsAss); ReturnValue_t result = assChild.get().connectModeTreeParent(*acsAss);
@ -483,6 +482,8 @@ void ObjectFactory::createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, UartComI
assChild.get().getObjectId() << " failed" << std::endl; assChild.get().getObjectId() << " failed" << std::endl;
} }
} }
gpsCtrl->connectModeTreeParent(*acsAss);
acsAss->connectModeTreeParent(satsystem::ACS_SUBSYSTEM);
#endif /* OBSW_ADD_ACS_HANDLERS == 1 */ #endif /* OBSW_ADD_ACS_HANDLERS == 1 */
} }
@ -692,7 +693,7 @@ void ObjectFactory::createReactionWheelComponents(LinuxLibgpioIF* gpioComIF,
} }
RwHelper rwHelper(rwIds); RwHelper rwHelper(rwIds);
auto* rwAss = new RwAssembly(objects::RW_ASS, objects::NO_OBJECT, pwrSwitcher, auto* rwAss = new RwAssembly(objects::RW_ASS, pwrSwitcher,
pcdu::Switches::PDU2_CH2_RW_5V, rwHelper); pcdu::Switches::PDU2_CH2_RW_5V, rwHelper);
for (uint8_t idx = 0; idx < rws.size(); idx++) { for (uint8_t idx = 0; idx < rws.size(); idx++) {
ReturnValue_t result = rws[idx]->connectModeTreeParent(*rwAss); ReturnValue_t result = rws[idx]->connectModeTreeParent(*rwAss);

2
fsfw

Submodule fsfw updated: 10dd855244...acab5f6bce

2
linux/devices/GPSHyperionLinuxController.cpp
View File

@ -18,7 +18,7 @@
GPSHyperionLinuxController::GPSHyperionLinuxController(object_id_t objectId, object_id_t parentId, GPSHyperionLinuxController::GPSHyperionLinuxController(object_id_t objectId, object_id_t parentId,
bool debugHyperionGps) bool debugHyperionGps)
: ExtendedControllerBase(objectId, objects::NO_OBJECT), : ExtendedControllerBase(objectId),
gpsSet(this), gpsSet(this),
debugHyperionGps(debugHyperionGps) { debugHyperionGps(debugHyperionGps) {
timeUpdateCd.resetTimer(); timeUpdateCd.resetTimer();

4
mission/system/objects/RwAssembly.cpp
View File

@ -1,8 +1,8 @@
#include "RwAssembly.h" #include "RwAssembly.h"
RwAssembly::RwAssembly(object_id_t objectId, object_id_t parentId, PowerSwitchIF* pwrSwitcher, RwAssembly::RwAssembly(object_id_t objectId, PowerSwitchIF* pwrSwitcher,
power::Switch_t switcher, RwHelper helper) power::Switch_t switcher, RwHelper helper)
: AssemblyBase(objectId, parentId), helper(helper), switcher(pwrSwitcher, switcher) { : AssemblyBase(objectId), helper(helper), switcher(pwrSwitcher, switcher) {
ModeListEntry entry; ModeListEntry entry;
for (uint8_t idx = 0; idx < NUMBER_RWS; idx++) { for (uint8_t idx = 0; idx < NUMBER_RWS; idx++) {
entry.setObject(helper.rwIds[idx]); entry.setObject(helper.rwIds[idx]);

2
mission/system/objects/RwAssembly.h
View File

@ -12,7 +12,7 @@ struct RwHelper {
class RwAssembly : public AssemblyBase { class RwAssembly : public AssemblyBase {
public: public:
RwAssembly(object_id_t objectId, object_id_t parentId, PowerSwitchIF* pwrSwitcher, RwAssembly(object_id_t objectId, PowerSwitchIF* pwrSwitcher,
power::Switch_t switcher, RwHelper helper); power::Switch_t switcher, RwHelper helper);
private: private:

10
mission/system/objects/TcsBoardAssembly.cpp
View File

@ -90,15 +90,7 @@ ReturnValue_t TcsBoardAssembly::isModeCombinationValid(Mode_t mode, Submode_t su
} }
ReturnValue_t TcsBoardAssembly::initialize() { ReturnValue_t TcsBoardAssembly::initialize() {
ReturnValue_t result = returnvalue::OK; return AssemblyBase::initialize();
// TODO: Fix this
// for (const auto& obj : helper.rtdInfos) {
// result = registerChild(obj.first);
// if (result != returnvalue::OK) {
// return result;
// }
// }
return SubsystemBase::initialize();
} }
void TcsBoardAssembly::startTransition(Mode_t mode, Submode_t submode) { void TcsBoardAssembly::startTransition(Mode_t mode, Submode_t submode) {

2
tmtc

Submodule tmtc updated: c8eaf180dc...8c48255eb3