From f5f8df61ae2990f8a00e56e8066dcbf6deadeef3 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 9 Aug 2021 11:27:08 +0200 Subject: [PATCH 1/2] bumped subversion --- bsp_q7s/core/obsw.cpp | 2 +- common/config/OBSWVersion.h | 2 +- fsfw | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bsp_q7s/core/obsw.cpp b/bsp_q7s/core/obsw.cpp index 47b7b9d2..e55d5652 100644 --- a/bsp_q7s/core/obsw.cpp +++ b/bsp_q7s/core/obsw.cpp @@ -19,7 +19,7 @@ int obsw::obsw() { #else std::cout << "-- Compiled for Linux (TE0720) --" << std::endl; #endif - std::cout << "-- OBSW " << SW_NAME << " v" << SW_VERSION << "." << SW_SUBVERSION << + std::cout << "-- OBSW v" << SW_VERSION << "." << SW_SUBVERSION << "." << SW_REVISION << ", FSFW v" << FSFW_VERSION << "." << FSFW_SUBVERSION << "." << FSFW_REVISION << "--" << std::endl; std::cout << "-- " << __DATE__ << " " << __TIME__ << " --" << std::endl; diff --git a/common/config/OBSWVersion.h b/common/config/OBSWVersion.h index 0274b91f..db7cfeb5 100644 --- a/common/config/OBSWVersion.h +++ b/common/config/OBSWVersion.h @@ -4,7 +4,7 @@ const char* const SW_NAME = "eive"; #define SW_VERSION 1 -#define SW_SUBVERSION 5 +#define SW_SUBVERSION 6 #define SW_REVISION 0 #endif /* COMMON_CONFIG_OBSWVERSION_H_ */ diff --git a/fsfw b/fsfw index 3704d2b8..22e29144 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 3704d2b8295152652a4c7836b595223d8fa3767d +Subproject commit 22e29144b6783a824b310204c76fa413eb94f331 -- 2.43.0 From 74dbfae2256d656b6cd46f07c6b9ada68bbab985 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 9 Aug 2021 14:30:14 +0200 Subject: [PATCH 2/2] tmtc update --- tmtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmtc b/tmtc index 3e8626bf..3305e1d4 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 3e8626bfafa561510323bf8fe3963bc2860950ed +Subproject commit 3305e1d489c7d3ce401945712a4f374e068175ff -- 2.43.0