From 9caa9451e1df7b52d5ad58e776c8c8b03b472fb5 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sat, 24 Jul 2021 13:47:09 +0200 Subject: [PATCH] printing FSFW version now --- bsp_q7s/core/obsw.cpp | 8 ++++++-- fsfw | 2 +- misc/eclipse/.cproject | 8 ++++---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/bsp_q7s/core/obsw.cpp b/bsp_q7s/core/obsw.cpp index 2b55429b..41c6c5b9 100644 --- a/bsp_q7s/core/obsw.cpp +++ b/bsp_q7s/core/obsw.cpp @@ -2,6 +2,9 @@ #include "OBSWVersion.h" #include "InitMission.h" #include "fsfw/tasks/TaskFactory.h" + +#include "fsfw/FSFWVersion.h" + #include int obsw::obsw() { @@ -11,8 +14,9 @@ int obsw::obsw() { #else std::cout << "-- Compiled for Linux (TE0720) --" << std::endl; #endif - std::cout << "-- Software version " << SW_NAME << " v" << SW_VERSION << "." - << SW_SUBVERSION << "." << SW_SUBSUBVERSION << " -- " << std::endl; + std::cout << "-- OBSW " << SW_NAME << " v" << SW_VERSION << "." << SW_SUBVERSION << + "." << SW_SUBSUBVERSION << ", FSFW v" << FSFW_VERSION << "." << FSFW_SUBVERSION << + FSFW_REVISION << "--" << std::endl; std::cout << "-- " << __DATE__ << " " << __TIME__ << " --" << std::endl; initmission::initMission(); diff --git a/fsfw b/fsfw index b8325959..3e422f51 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit b83259592a1f0ae5af20b00d1aef813fa26cd350 +Subproject commit 3e422f51bd1b5f934a138f5e496675b398e27827 diff --git a/misc/eclipse/.cproject b/misc/eclipse/.cproject index 155e08b2..84814acc 100644 --- a/misc/eclipse/.cproject +++ b/misc/eclipse/.cproject @@ -566,7 +566,7 @@ - + @@ -658,7 +658,7 @@ - +