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

v1.13.0 #285

Merged
muellerr merged 30 commits from develop into main 2022-08-24 16:36:50 +02:00
Conversation 0 Commits 30 Files Changed 30 +8 -3
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 676b94b139 - Show all commits

2
common/config/commonObjects.h
View File

@ -18,7 +18,7 @@ enum commonObjects : uint32_t {
/* 0x43 ('C') for Controllers */ /* 0x43 ('C') for Controllers */
THERMAL_CONTROLLER = 0x43400001, THERMAL_CONTROLLER = 0x43400001,
ACS_CONTROLLER = 0x43100002, ACS_CONTROLLER = 0x43000002,
CORE_CONTROLLER = 0x43000003, CORE_CONTROLLER = 0x43000003,
/* 0x44 ('D') for device handlers */ /* 0x44 ('D') for device handlers */

7
mission/controller/AcsController.cpp
View File

@ -48,7 +48,12 @@ ReturnValue_t AcsController::initializeLocalDataPool(localpool::DataPool &localD
return HasReturnvaluesIF::RETURN_OK; return HasReturnvaluesIF::RETURN_OK;
} }
LocalPoolDataSetBase *AcsController::getDataSetHandle(sid_t sid) { return nullptr; } LocalPoolDataSetBase *AcsController::getDataSetHandle(sid_t sid) {
if (sid == mgmData.getSid()) {
return &mgmData;
}
return nullptr;
}
ReturnValue_t AcsController::checkModeCommand(Mode_t mode, Submode_t submode, ReturnValue_t AcsController::checkModeCommand(Mode_t mode, Submode_t submode,
uint32_t *msToReachTheMode) { uint32_t *msToReachTheMode) {

2
tmtc

@ -1 +1 @@
Subproject commit 2165f376fbb8624a44e87b4395d544de663a2d04 Subproject commit 9de4cabcd9db8ddb9e88203b4ad9c5eaf612a112