eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues4 Pull Requests1 Releases121 Wiki Activity

Revert ACS Safe Mode Controller to FLP Design #466

Merged
muellerr merged 64 commits from acs-flp-safe into develop 2023-04-14 20:26:20 +02:00
Conversation 1 Commits 64 Files Changed 31 +513 -431
meggert commented 2023-03-13 16:48:43 +01:00
Owner
No description provided.
meggert added this to the v1.38.0 milestone 2023-03-13 16:48:43 +01:00
meggert added 163 commits 2023-03-21 13:57:33 +01:00 
* TcCamTakePic
* TcSimplexSendFile
* TcDownlinkDataModulate
Pending: Test commands with MPSoC
* overwriting of delay cycles for cam take pic command
* extended parsing of verification status codes
Reviewed-on: 
Reviewed-on: 
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
Reviewed-on: 
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
Reviewed-on: 
Reviewed-on: 
Reviewed-on: 
Reviewed-on: 
Reviewed-on: 
Reviewed-on: 
Reviewed-on: 
Reviewed-on: 
Reviewed-on: 
Reviewed-on: 
# Conflicts:
#	CHANGELOG.md
#	mission/controller/AcsController.cpp
#	mission/controller/AcsController.h
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
Reviewed-on: 
Reviewed-on: 
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
Reviewed-on: 
Reviewed-on: 
Reviewed-on: 
Reviewed-on: 
Reviewed-on: 
Reviewed-on: 
Reviewed-on: 
Reviewed-on: 
Reviewed-on: 
Reviewed-on: 
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
Reviewed-on: 
Reviewed-on: 
Reviewed-on:
meggert added 1 commit 2023-03-21 17:19:11 +01:00
muellerr modified the milestone from v1.38.0 to v1.40.0 2023-03-21 23:41:41 +01:00
meggert added 2 commits 2023-03-22 08:59:28 +01:00
meggert added 1 commit 2023-03-22 09:07:51 +01:00
meggert added 1 commit 2023-03-23 17:05:13 +01:00
meggert added 1 commit 2023-03-23 17:34:31 +01:00
meggert added 1 commit 2023-03-24 11:44:32 +01:00
meggert added 9 commits 2023-03-24 14:59:27 +01:00
meggert added 2 commits 2023-03-24 15:18:37 +01:00
meggert added 1 commit 2023-03-24 15:20:21 +01:00
muellerr modified the milestone from v1.40.0 to v1.41.0 2023-03-26 15:29:10 +02:00
muellerr modified the milestone from v1.41.0 to v1.42.0 2023-03-28 22:30:00 +02:00
muellerr modified the milestone from v1.42.0 to v1.43.0 2023-04-01 15:41:11 +02:00
muellerr modified the milestone from v1.43.0 to v1.44.0 2023-04-04 14:30:04 +02:00
meggert added 1 commit 2023-04-05 11:05:52 +02:00
meggert added 1 commit 2023-04-05 11:25:41 +02:00
meggert added 1 commit 2023-04-05 16:11:24 +02:00
meggert added 1 commit 2023-04-05 16:46:55 +02:00
meggert added 1 commit 2023-04-05 17:20:31 +02:00
meggert added 1 commit 2023-04-06 09:48:51 +02:00
meggert added 5 commits 2023-04-06 10:47:22 +02:00
meggert added 1 commit 2023-04-06 10:51:08 +02:00
meggert added 3 commits 2023-04-06 13:36:59 +02:00
muellerr modified the milestone from v1.44.0 to v1.45.0 2023-04-08 15:54:51 +02:00
meggert added 1 commit 2023-04-11 10:36:20 +02:00
meggert added 1 commit 2023-04-11 10:55:41 +02:00
meggert added 1 commit 2023-04-11 11:18:52 +02:00
meggert added 2 commits 2023-04-11 17:30:17 +02:00
meggert added 1 commit 2023-04-11 18:11:51 +02:00
meggert added 1 commit 2023-04-11 18:54:04 +02:00
meggert added 1 commit 2023-04-11 18:55:57 +02:00
meggert added 1 commit 2023-04-13 14:29:12 +02:00
meggert added 1 commit 2023-04-13 14:39:25 +02:00
meggert added 1 commit 2023-04-13 15:01:52 +02:00
meggert added 1 commit 2023-04-13 16:28:40 +02:00
meggert added 1 commit 2023-04-13 17:06:38 +02:00
meggert added 1 commit 2023-04-13 17:12:39 +02:00
meggert added 1 commit 2023-04-13 20:21:15 +02:00
meggert added 2 commits 2023-04-14 11:37:52 +02:00
meggert added 1 commit 2023-04-14 16:44:21 +02:00
meggert added 2 commits 2023-04-14 16:50:07 +02:00
meggert added 2 commits 2023-04-14 16:55:21 +02:00
meggert requested review from gaisser 2023-04-14 16:55:36 +02:00
meggert requested review from muellerr 2023-04-14 16:55:44 +02:00
meggert changed title from WIP: Revert ACS Safe Mode Controller to FLP Design to Revert ACS Safe Mode Controller to FLP Design 2023-04-14 17:39:59 +02:00
meggert added 1 commit 2023-04-14 18:55:50 +02:00
muellerr added 1 commit 2023-04-14 18:56:14 +02:00
meggert added 2 commits 2023-04-14 18:59:34 +02:00
meggert added 1 commit 2023-04-14 19:11:49 +02:00
muellerr added 1 commit 2023-04-14 20:13:33 +02:00
muellerr approved these changes 2023-04-14 20:21:38 +02:00
mission/controller/AcsController.cpp
@ -188,3 +172,1 @@
}
safeCtrlFailureCounter++;
if (safeCtrlFailureCounter > 150) {
uint8_t safeCtrlStrat = safeCtrl.safeCtrlStrategy(
muellerr commented 2023-04-14 20:14:38 +02:00
Owner

why is thiis uint8_t and not acs::SafeModeStrategy?

why is thiis uint8_t and not acs::SafeModeStrategy?
muellerr added 1 commit 2023-04-14 20:24:33 +02:00
muellerr added 1 commit 2023-04-14 20:25:54 +02:00
muellerr merged commit aa54dbbd10 into develop 2023-04-14 20:26:20 +02:00
muellerr deleted branch acs-flp-safe 2023-04-14 20:26:20 +02:00
Sign in to join this conversation.
No Reviewers
gaisser
muellerr
No Label
No Milestone v1.45.0
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: eive/eive-obsw#466
No description provided.
Delete Branch "acs-flp-safe"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?