From 8821cc107922be9633fa185ebf03f80628ef9f1e Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 8 Mar 2023 19:17:24 +0100 Subject: [PATCH 1/2] prep v1.36.0 --- CHANGELOG.md | 2 ++ CMakeLists.txt | 4 ++-- mission/system/tree/system.cpp | 2 ++ mission/system/tree/tcsModeTree.cpp | 1 - 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d348f8fa..9646ff2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ will consitute of a breaking change warranting a new major release: # [unreleased] +# [v1.36.0] 2023-03-08 + ## Added - Star Tracker Assembly diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bf2a95a..7cd09271 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,8 +10,8 @@ cmake_minimum_required(VERSION 3.13) set(OBSW_VERSION_MAJOR 1) -set(OBSW_VERSION_MINOR 35) -set(OBSW_VERSION_REVISION 1) +set(OBSW_VERSION_MINOR 36) +set(OBSW_VERSION_REVISION 0) # set(CMAKE_VERBOSE TRUE) diff --git a/mission/system/tree/system.cpp b/mission/system/tree/system.cpp index d1b127d4..215f1b02 100644 --- a/mission/system/tree/system.cpp +++ b/mission/system/tree/system.cpp @@ -83,6 +83,8 @@ void buildSafeSequence(Subsystem& ss, ModeListEntry& eh) { // Do no track ACS for now because it might jump to detumble mode and back to safe as part of // normal operations. + // UPDATE: This could be re-enabled as soon as the detumble mode is a submode of + // ACS CTRL safe mode. // iht(objects::ACS_SUBSYSTEM, acs::AcsMode::SAFE, 0, EIVE_TABLE_SAFE_TGT.second, true); iht(objects::PL_SUBSYSTEM, OFF, 0, EIVE_TABLE_SAFE_TGT.second); check(ss.addTable(TableEntry(EIVE_TABLE_SAFE_TGT.first, &EIVE_TABLE_SAFE_TGT.second)), ctxc); diff --git a/mission/system/tree/tcsModeTree.cpp b/mission/system/tree/tcsModeTree.cpp index a3bd4319..b7188b17 100644 --- a/mission/system/tree/tcsModeTree.cpp +++ b/mission/system/tree/tcsModeTree.cpp @@ -71,7 +71,6 @@ void buildOffSequence(Subsystem& ss, ModeListEntry& eh) { iht(objects::TMP1075_HANDLER_IF_BOARD, OFF, 0, TCS_TABLE_OFF_TRANS_1.second); check(ss.addTable(TableEntry(TCS_TABLE_OFF_TRANS_1.first, &TCS_TABLE_OFF_TRANS_1.second)), ctxc); - ihs(TCS_SEQUENCE_OFF.second, TCS_TABLE_OFF_TGT.first, 0, false); ihs(TCS_SEQUENCE_OFF.second, TCS_TABLE_OFF_TRANS_0.first, 0, false); ihs(TCS_SEQUENCE_OFF.second, TCS_TABLE_OFF_TRANS_1.first, 0, false); -- 2.43.0 From 2f5f47a02ced53e209e769186302dab6f407c271 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 8 Mar 2023 19:20:18 +0100 Subject: [PATCH 2/2] tmtc bump --- CHANGELOG.md | 2 ++ tmtc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9646ff2c..8ab39c23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,8 @@ will consitute of a breaking change warranting a new major release: # [v1.36.0] 2023-03-08 +eive-tmtc: v2.17.2 + ## Added - Star Tracker Assembly diff --git a/tmtc b/tmtc index d758a1f1..a3e03350 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit d758a1f11ac4d39eda08918c124d8736da104687 +Subproject commit a3e03350faf3055835e65e744bc177761448ce20 -- 2.43.0