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

Merge branch 'develop' into eggert/acs

Browse Source 
# Conflicts:
#	dummies/CMakeLists.txt
#	mission/controller/AcsController.cpp
#	mission/controller/AcsController.h
This commit is contained in:
Marius Eggert
2022-11-04 14:19:43 +01:00
parent a4735defaa 10611d0415
commit 895d03a35c
234 changed files with 6948 additions and 3311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mission/controller/AcsController.cpp
View File

@ -2,8 +2,10 @@
#include <fsfw/datapool/PoolReadGuard.h>
#include "mission/devices/torquer.h"
AcsController::AcsController(object_id_t objectId)
: ExtendedControllerBase(objectId, objects::NO_OBJECT),
: ExtendedControllerBase(objectId),
sensorProcessing(&acsParameters),
navigation(&acsParameters),
actuatorCmd(&acsParameters),
@ -417,6 +419,7 @@ LocalPoolDataSetBase *AcsController::getDataSetHandle(sid_t sid) {
default:
return nullptr;
}
return nullptr;
}
ReturnValue_t AcsController::checkModeCommand(Mode_t mode, Submode_t submode,