fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-18 15:53:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

board_name.c: remove the file and HW_ARCH macro, use px4_board_name() instead

Browse Source 
boards define BOARD_NAME, so board_name() is not necessary. HW_ARCH was
just a wrapper around board_name().

This patch simplifies to having only one common method px4_board_name().
This commit is contained in:
Beat Küng
2016-12-21 11:35:10 +01:00
committed by Lorenz Meier
parent 3d1f240351
commit c662113527
17 changed files with 39 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/systemcmds/ver/ver.c
+5 -4
View File
@@ -198,11 +198,12 @@ int ver_main(int argc, char *argv[])
if (!strncmp(argv[1], sz_ver_hwcmp_str, sizeof(sz_ver_hwcmp_str))) {
if (argc >= 3 && argv[2] != NULL) {
/* compare 3rd parameter with HW_ARCH string, in case of match, return 0 */
ret = strncmp(HW_ARCH, argv[2], strlen(HW_ARCH));
/* compare 3rd parameter with px4_board_name() string, in case of match, return 0 */
const char *board_name = px4_board_name();
ret = strncmp(board_name, argv[2], strlen(board_name));
if (ret == 0) {
PX4_INFO("match: %s", HW_ARCH);
PX4_INFO("match: %s", board_name);
}
return ret;
@@ -217,7 +218,7 @@ int ver_main(int argc, char *argv[])
bool show_all = !strncmp(argv[1], sz_ver_all_str, sizeof(sz_ver_all_str));
if (show_all || !strncmp(argv[1], sz_ver_hw_str, sizeof(sz_ver_hw_str))) {
printf("HW arch: %s\n", HW_ARCH);
printf("HW arch: %s\n", px4_board_name());
ret = 0;
}