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

Merge branch 'develop' into acs-safe-mode-failure

Browse Source 
# Conflicts:
#	CHANGELOG.md
#	mission/controller/AcsController.cpp
#	mission/controller/AcsController.h
This commit is contained in:
Marius Eggert
2023-03-15 10:06:02 +01:00
parent f358719778 3eb5fc7f47
commit 4fdb2de510
69 changed files with 1681 additions and 1129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mission/controller/AcsController.h
View File

@ -61,7 +61,7 @@ class AcsController : public ExtendedControllerBase, public ReceivesParameterMes
uint8_t detumbleCounter = 0;
uint8_t multipleRwUnavailableCounter = 0;
bool mekfInvalidFlag = false;
uint8_t mekfInvalidCounter = 0;
uint16_t mekfInvalidCounter = 0;
bool doomFlag = false;
uint8_t doomCounter = 0;