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

fixed some bugs
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
Details

Browse Source
This commit is contained in:
Robin Müller
2022-09-30 14:14:59 +02:00
parent dcd0a650f0
commit 57d37f14f3
7 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
#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)
: AssemblyBase(objectId, parentId), helper(helper), switcher(pwrSwitcher, switcher) {
: AssemblyBase(objectId), helper(helper), switcher(pwrSwitcher, switcher) {
ModeListEntry entry;
for (uint8_t idx = 0; idx < NUMBER_RWS; idx++) {
entry.setObject(helper.rwIds[idx]);

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

@ -12,7 +12,7 @@ struct RwHelper {
class RwAssembly : public AssemblyBase {
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);
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 result = returnvalue::OK;
// TODO: Fix this
// for (const auto& obj : helper.rtdInfos) {
// result = registerChild(obj.first);
// if (result != returnvalue::OK) {
// return result;
// }
// }
return SubsystemBase::initialize();
return AssemblyBase::initialize();
}
void TcsBoardAssembly::startTransition(Mode_t mode, Submode_t submode) {