Merge pull request 'bumped subversion for release' (#77) from mueller/version-bump into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good

Reviewed-on: #77
This commit is contained in:
Robin Müller 2021-08-09 14:34:39 +02:00
commit 9fd0009c7b
3 changed files with 3 additions and 3 deletions

View File

@ -19,7 +19,7 @@ int obsw::obsw() {
#else #else
std::cout << "-- Compiled for Linux (TE0720) --" << std::endl; std::cout << "-- Compiled for Linux (TE0720) --" << std::endl;
#endif #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 << "." << "." << SW_REVISION << ", FSFW v" << FSFW_VERSION << "." << FSFW_SUBVERSION << "." <<
FSFW_REVISION << "--" << std::endl; FSFW_REVISION << "--" << std::endl;
std::cout << "-- " << __DATE__ << " " << __TIME__ << " --" << std::endl; std::cout << "-- " << __DATE__ << " " << __TIME__ << " --" << std::endl;

View File

@ -4,7 +4,7 @@
const char* const SW_NAME = "eive"; const char* const SW_NAME = "eive";
#define SW_VERSION 1 #define SW_VERSION 1
#define SW_SUBVERSION 5 #define SW_SUBVERSION 6
#define SW_REVISION 0 #define SW_REVISION 0
#endif /* COMMON_CONFIG_OBSWVERSION_H_ */ #endif /* COMMON_CONFIG_OBSWVERSION_H_ */

2
tmtc

@ -1 +1 @@
Subproject commit 3e8626bfafa561510323bf8fe3963bc2860950ed Subproject commit 3305e1d489c7d3ce401945712a4f374e068175ff