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

Update version handling #371

Merged
muellerr merged 6 commits from update_version_handling into develop 2023-02-08 11:57:50 +01:00
Conversation 0 Commits 6 Files Changed 16 +5 -2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 02f0349525 - Show all commits

5
bsp_q7s/core/CoreController.cpp
View File

@ -185,8 +185,11 @@ ReturnValue_t CoreController::executeAction(ActionId_t actionId, MessageQueueId_
uint32_t p2 = 0;
if (strcmp("", common::OBSW_VERSION_CST_GIT_SHA1) != 0) {
p1 |= 1;
auto shaAsStr = std::string(common::OBSW_VERSION_CST_GIT_SHA1);
size_t posDash = shaAsStr.find("-");
auto gitHash = shaAsStr.substr(posDash + 2, 4);
// Only copy first 4 letters of git hash
memcpy(&p2, common::OBSW_VERSION_CST_GIT_SHA1 + 3, 4);
memcpy(&p2, gitHash.c_str(), 4);
}
triggerEvent(VERSION_INFO, p1, p2);

2
tmtc

@ -1 +1 @@
Subproject commit dedfe1c977fbe47a2d6a50e56e01eed9fe48b869
Subproject commit 4086e7947b4458bcbbd47c78e67c23d3a47885c8