added GPS and RW sensor readings. added RW1..4 dummies to acsTask
This commit is contained in:
parent
c430caadd7
commit
f3ac6d4a7e
@ -186,6 +186,10 @@ void initmission::initTasks() {
|
||||
acsCtrlTask->addComponent(objects::GYRO_3_L3G_HANDLER);
|
||||
acsCtrlTask->addComponent(objects::GPS_CONTROLLER);
|
||||
acsCtrlTask->addComponent(objects::STAR_TRACKER);
|
||||
acsCtrlTask->addComponent(objects::RW1);
|
||||
acsCtrlTask->addComponent(objects::RW2);
|
||||
acsCtrlTask->addComponent(objects::RW3);
|
||||
acsCtrlTask->addComponent(objects::RW4);
|
||||
#endif
|
||||
|
||||
PeriodicTaskIF* acsSysTask = factory->createPeriodicTask(
|
||||
|
@ -82,8 +82,11 @@ ReturnValue_t SensorValues::update() {
|
||||
ReturnValue_t susUpdate = updateSus();
|
||||
ReturnValue_t gyrUpdate = updateGyr();
|
||||
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::OK;
|
||||
|
Loading…
Reference in New Issue
Block a user