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