From 91208c28080bf9d1775335e9a3674751d72291ca Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 26 Jul 2023 13:17:54 +0200 Subject: [PATCH] bump tmtc, small tweak for definitions --- mission/acs/defs.h | 2 +- tmtc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mission/acs/defs.h b/mission/acs/defs.h index a1118ebc..677ce37a 100644 --- a/mission/acs/defs.h +++ b/mission/acs/defs.h @@ -27,7 +27,7 @@ enum SafeModeStrategy : uint8_t { SAFECTRL_NO_MAG_FIELD_FOR_CONTROL = 1, SAFECTRL_NO_SENSORS_FOR_CONTROL = 2, // OBSW version <= v6.1.0 - LEGACY_ACTIVE_MEKF = 10, + LEGACY_SAFECTRL_ACTIVE_MEKF = 10, LEGACY_SAFECTRL_WITHOUT_MEKF = 11, LEGACY_SAFECTRL_ECLIPSE_DAMPING = 12, LEGACY_SAFECTRL_ECLIPSE_IDELING = 13, diff --git a/tmtc b/tmtc index 39d6ec73..a55aa4a6 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 39d6ec73c2e842530e810e854dc9a4cd1568de66 +Subproject commit a55aa4a6679eb0b7a7731063722b9549b8eaf358