v1.6.0 #78

Merged
muellerr merged 147 commits from develop into main 2021-08-09 16:08:26 +02:00
3 changed files with 3 additions and 3 deletions
Showing only changes of commit 9fd0009c7b - Show all commits

View File

@ -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;

View File

@ -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_ */

2
tmtc

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