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 -6
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b8b6a14e3b - Show all commits

2
fsfw

@ -1 +1 @@
Subproject commit f4c4f9946c7fb9fd050178baa4865da654366b70 Subproject commit d975958120bd151dabdc450a104e9cc8069ff509

6
mission/controller/AcsController.cpp
View File

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

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;
/** /**
* @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