From b5275ecd520be1e7a74d4892fda9364adbb6417d Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Wed, 12 Jul 2017 16:56:44 -1000 Subject: [PATCH] ver:The recent changes to version.c return values in base10 This is part 2 of the fix. The tool that extracts the nuttx git tag was broken by a new tag added the did not match the form nuttx-M.mm. To the value was printed as OS: NuttX OS version: 0.0.0 c0 (192) Once that issue was fixed, it was apparent that recent changes to version.c return the values as base 10, before it was hex. This fixes the formatting. --- src/systemcmds/ver/ver.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/systemcmds/ver/ver.c b/src/systemcmds/ver/ver.c index 9041d7ee24..c30bfdd843 100644 --- a/src/systemcmds/ver/ver.c +++ b/src/systemcmds/ver/ver.c @@ -128,10 +128,10 @@ int ver_main(int argc, char *argv[]) unsigned type = (fwver >> (8 * 0)) & 0xFF; if (type == 255) { - printf("FW version: Release %x.%x.%x (%u)\n", major, minor, patch, fwver); + printf("FW version: Release %u.%u.%u (%u)\n", major, minor, patch, fwver); } else { - printf("FW version: %x.%x.%x %x (%u)\n", major, minor, patch, type, fwver); + printf("FW version: %u.%u.%u %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 %x.%x.%x (%u)\n", major, minor, patch, fwver); + printf("OS version: Release %u.%u.%u (%u)\n", major, minor, patch, fwver); } else { - printf("OS version: %x.%x.%x %x (%u)\n", major, minor, patch, type, fwver); + printf("OS version: %u.%u.%u %u (%u)\n", major, minor, patch, type, fwver); } const char *os_git_hash = px4_os_version_string();