yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-22 01:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

ver:Print vMM.mm.pp format

Browse Source
This commit is contained in:
David Sidrane
2017-05-02 17:36:28 -10:00
committed by Lorenz Meier
parent bf570dee2f
commit f66f024e3a
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/version/version.c
View File

@@ -83,13 +83,17 @@ static uint32_t version_tag_to_number(const char *tag)
if (tag[i] >= '0' && tag[i] <= '9') {
if (mag < 32) {
unsigned number = tag[i] - '0';
char number = tag[i] - '0';
ver += (number << mag);
mag += 8;
mag += 4;
}
} else if (tag[i] == '.') {
if (mag % 8) {
mag += 4;
}
continue;
} else if (i > 3 && type == -1) {

8
src/systemcmds/ver/ver.c
View File

@@ -128,10 +128,10 @@ int ver_main(int argc, char *argv[])
unsigned type = (fwver >> (8 * 0)) & 0xFF;
if (type == 255) {
printf("FW version: Release %u.%u.%u (%u)\n", major, minor, patch, fwver);
printf("FW version: Release %x.%x.%x (%u)\n", major, minor, patch, fwver);
} else {
printf("FW version: %u.%u.%u %u (%u)\n", major, minor, patch, type, fwver);
printf("FW version: %x.%x.%x %x (%u)\n", major, minor, patch, type, fwver);
}
@@ -143,10 +143,10 @@ int ver_main(int argc, char *argv[])
printf("OS: %s\n", px4_os_name());
if (type == 255) {
printf("OS version: Release %u.%u.%u (%u)\n", major, minor, patch, fwver);
printf("OS version: Release %x.%x.%x (%u)\n", major, minor, patch, fwver);
} else {
printf("OS version: %u.%u.%u %u (%u)\n", major, minor, patch, type, fwver);
printf("OS version: %x.%x.%x %x (%u)\n", major, minor, patch, type, fwver);
}
const char *os_git_hash = px4_os_version_string();