fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-20 07:49:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

ver:Use Board identity API without ifdefs for overrides

Browse Source
This commit is contained in:
David Sidrane 2017-09-11 13:36:39 -10:00 committed by Beat Küng
parent 594da6247b
commit ea1722274d
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,13 +247,9 @@ int ver_main(int argc, char *argv[])
}
if (show_all || !strncmp(argv[1], px4_guid_str, sizeof(px4_guid_str))) {
#if defined(BOARD_OVERRIDE_PX4_GUID)
char *px4guid_fmt_buffer = BOARD_OVERRIDE_PX4_GUID;
#else
char px4guid_fmt_buffer[PX4_GUID_FORMAT_SIZE];
board_get_px4_guid_formated(px4guid_fmt_buffer, sizeof(px4guid_fmt_buffer));
#endif
printf("PX4GUID: %s\n", px4guid_fmt_buffer);
ret = 0;
}
@ -284,13 +280,8 @@ int ver_main(int argc, char *argv[])
}
if (show_all || !strncmp(argv[1], mcu_uid_str, sizeof(mcu_uid_str))) {
#if defined(BOARD_OVERRIDE_UUID)
char *uid_fmt_buffer = BOARD_OVERRIDE_UUID;
#else
char uid_fmt_buffer[PX4_CPU_UUID_WORD32_FORMAT_SIZE];
board_get_uuid32_formated(uid_fmt_buffer, sizeof(uid_fmt_buffer), CPU_UUID_FORMAT, CPU_UUID_SEPARATOR);
#endif
printf("UID: %s \n", uid_fmt_buffer);
ret = 0;
}