eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

Merge branch 'mueller/system-subsystems' into mueller/master

Browse Source
This commit is contained in:
Robin Müller
2022-03-11 14:34:10 +01:00
parent 62348bb37d dd37f90b47
commit 47beaad58c
26 changed files with 247 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bsp_q7s/core/CoreController.cpp
View File

@ -625,9 +625,9 @@ ReturnValue_t CoreController::initVersionFile() {
std::string fullObswVersionString = "OBSW: v" + std::to_string(SW_VERSION) + "." +
std::to_string(SW_SUBVERSION) + "." +
std::to_string(SW_REVISION);
std::string fullFsfwVersionString = "FSFW: v" + std::to_string(FSFW_VERSION.major) + "." +
std::to_string(FSFW_VERSION.minor) + "." +
std::to_string(FSFW_VERSION.revision);
char versionString[16] = {};
fsfw::FSFW_VERSION.getVersion(versionString, sizeof(versionString));
std::string fullFsfwVersionString = "FSFW: v" + std::string(versionString);
std::string systemString = "System: " + unameLine;
std::string mountPrefix = SdCardManager::instance()->getCurrentMountPrefix();
std::string versionFilePath = mountPrefix + VERSION_FILE;