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

First Version of ACS Controller #329

Merged
muellerr merged 106 commits from acs-ctrl-v1 into develop 2022-12-02 16:21:58 +01:00
Conversation 0 Commits 106 Files Changed 50 +8 -1
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f3ac6d4a7e - Show all commits

4
bsp_q7s/core/InitMission.cpp
View File

@ -186,6 +186,10 @@ void initmission::initTasks() {
acsCtrlTask->addComponent(objects::GYRO_3_L3G_HANDLER); acsCtrlTask->addComponent(objects::GYRO_3_L3G_HANDLER);
acsCtrlTask->addComponent(objects::GPS_CONTROLLER); acsCtrlTask->addComponent(objects::GPS_CONTROLLER);
acsCtrlTask->addComponent(objects::STAR_TRACKER); acsCtrlTask->addComponent(objects::STAR_TRACKER);
acsCtrlTask->addComponent(objects::RW1);
acsCtrlTask->addComponent(objects::RW2);
acsCtrlTask->addComponent(objects::RW3);
acsCtrlTask->addComponent(objects::RW4);
#endif #endif
PeriodicTaskIF* acsSysTask = factory->createPeriodicTask( PeriodicTaskIF* acsSysTask = factory->createPeriodicTask(

5
mission/controller/acs/SensorValues.cpp
View File

@ -82,8 +82,11 @@ ReturnValue_t SensorValues::update() {
ReturnValue_t susUpdate = updateSus(); ReturnValue_t susUpdate = updateSus();
ReturnValue_t gyrUpdate = updateGyr(); ReturnValue_t gyrUpdate = updateGyr();
ReturnValue_t strUpdate = updateStr(); ReturnValue_t strUpdate = updateStr();
ReturnValue_t gpsUpdate = updateGps();
ReturnValue_t rwUpdate = updateRw();
if ((mgmUpdate && susUpdate && gyrUpdate && strUpdate) == returnvalue::FAILED) { if ((mgmUpdate && susUpdate && gyrUpdate && strUpdate && gpsUpdate && rwUpdate) ==
returnvalue::FAILED) {
return returnvalue::FAILED; return returnvalue::FAILED;
}; };
return returnvalue::OK; return returnvalue::OK;