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

ACS Controller Init #275

Merged
meierj merged 12 commits from mueller/acs-ctrl into develop 2022-08-16 17:34:21 +02:00
Conversation 2 Commits 12 Files Changed 17 +223 -28
14 changed files with 223 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b8b6a14e3b - Show all commits

2
fsfw

Submodule fsfw updated: f4c4f9946c...d975958120

8
mission/controller/AcsController.cpp
View File

@@ -29,9 +29,11 @@ void AcsController::performControlOperation() {
break; break;
} }
if (mgmData.read() == RETURN_OK) { {
copyMgmData(); PoolReadGuard pg(&mgmData);
mgmData.commit(); if (pg.getReadResult() == RETURN_OK) {
copyMgmData();
}
} }
} }

2
mission/controller/AcsController.h
View File

@@ -43,7 +43,7 @@ class AcsController : public ExtendedControllerBase {
PoolEntry<float> mgm1PoolVec = PoolEntry<float>(3); PoolEntry<float> mgm1PoolVec = PoolEntry<float>(3);
PoolEntry<float> mgm2PoolVec = PoolEntry<float>(3); PoolEntry<float> mgm2PoolVec = PoolEntry<float>(3);
PoolEntry<float> mgm3PoolVec = PoolEntry<float>(3); PoolEntry<float> mgm3PoolVec = PoolEntry<float>(3);
PoolEntry<float> imtqMgmPoolVec = PoolEntry<float>(3); PoolEntry<int32_t> imtqMgmPoolVec = PoolEntry<int32_t>(3);
PoolEntry<uint8_t> imtqCalActStatus = PoolEntry<uint8_t>(); PoolEntry<uint8_t> imtqCalActStatus = PoolEntry<uint8_t>();
void copyMgmData(); void copyMgmData();

2
mission/controller/controllerdefinitions/AcsCtrlDefinitions.h
View File

@@ -21,7 +21,7 @@ enum PoolIds : lp_id_t {
}; };
static constexpr uint8_t MGM_SET_ENTRIES = 5; static constexpr uint8_t MGM_SET_ENTRIES = 10;
meierj marked this conversation as resolved
meierj commented 2022-08-16 17:29:14 +02:00
Review
Copy Link

I count only 6 entries in the MGM set. Is there a reason why this is set to 10?

I count only 6 entries in the MGM set. Is there a reason why this is set to 10?
muellerr commented 2022-08-16 17:31:18 +02:00
Review
Copy Link

Sometimes, some entries are added later, and the additional space for entries does not cost much. I actually got an error when this was set to 5 previously, so I left some room for more entries.

Sometimes, some entries are added later, and the additional space for entries does not cost much. I actually got an error when this was set to 5 previously, so I left some room for more entries.
👍 1
/** /**
* @brief This dataset can be used to store the collected temperatures of all temperature sensors * @brief This dataset can be used to store the collected temperatures of all temperature sensors