From 55c5df0519b5ce6ac2ba1cd09e918f03e537fe50 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 26 Jul 2023 13:07:14 +0200 Subject: [PATCH 1/4] ensure downwards compatibilitiy for enum --- mission/acs/defs.h | 18 ++++++++++++------ tmtc | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/mission/acs/defs.h b/mission/acs/defs.h index c02b692c..a1118ebc 100644 --- a/mission/acs/defs.h +++ b/mission/acs/defs.h @@ -26,12 +26,18 @@ enum SafeModeStrategy : uint8_t { SAFECTRL_OFF = 0, SAFECTRL_NO_MAG_FIELD_FOR_CONTROL = 1, SAFECTRL_NO_SENSORS_FOR_CONTROL = 2, - SAFECTRL_MEKF = 10, - SAFECTRL_GYR = 11, - SAFECTRL_SUSMGM = 12, - SAFECTRL_ECLIPSE_DAMPING_GYR = 13, - SAFECTRL_ECLIPSE_DAMPING_SUSMGM = 14, - SAFECTRL_ECLIPSE_IDELING = 15, + // OBSW version <= v6.1.0 + LEGACY_ACTIVE_MEKF = 10, + LEGACY_SAFECTRL_WITHOUT_MEKF = 11, + LEGACY_SAFECTRL_ECLIPSE_DAMPING = 12, + LEGACY_SAFECTRL_ECLIPSE_IDELING = 13, + // Added in v6.2.0 + SAFECTRL_MEKF = 14, + SAFECTRL_GYR = 15, + SAFECTRL_SUSMGM = 16, + SAFECTRL_ECLIPSE_DAMPING_GYR = 17, + SAFECTRL_ECLIPSE_DAMPING_SUSMGM = 18, + SAFECTRL_ECLIPSE_IDELING = 19, SAFECTRL_DETUMBLE_FULL = 20, SAFECTRL_DETUMBLE_DETERIORATED = 21, }; diff --git a/tmtc b/tmtc index 15716c98..39d6ec73 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 15716c988b6d26ae7f00e44b919d5ae7505d81ad +Subproject commit 39d6ec73c2e842530e810e854dc9a4cd1568de66 -- 2.43.0 From 91208c28080bf9d1775335e9a3674751d72291ca Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 26 Jul 2023 13:17:54 +0200 Subject: [PATCH 2/4] 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 -- 2.43.0 From 3ebb83b4c029be786357e8bca11d9b29cf8b251c Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 26 Jul 2023 13:18:36 +0200 Subject: [PATCH 3/4] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62b446d7..01c4e65b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ will consitute of a breaking change warranting a new major release: # [v6.2.0] 2023-07-26 -- `eive-tmtc`: v5.3.0 +- `eive-tmtc`: v5.3.1 ## Changed -- 2.43.0 From f7dccdc4c65eb216a7d0f7210b3dbca118b983c9 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 26 Jul 2023 13:20:32 +0200 Subject: [PATCH 4/4] bump tmtc again --- tmtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmtc b/tmtc index a55aa4a6..cbcc06ed 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit a55aa4a6679eb0b7a7731063722b9549b8eaf358 +Subproject commit cbcc06ede704d36e1558aae922092470fee5ff66 -- 2.43.0