fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-30 23:34:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

ver:The recent changes to version.c return values in base10

Browse Source 
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.
This commit is contained in:
David Sidrane 2017-07-12 16:56:44 -10:00 committed by Beat Küng
parent de97ff163b
commit b5275ecd52
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 %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();