From f7d542e720f83409d6bd60c1301e2e6d22053f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Mi=C5=A1i=C4=87?= Date: Mon, 20 Jun 2022 14:10:47 +0200 Subject: [PATCH] boards/sky-drones: update to extended hw_ver_rev format --- boards/sky-drones/smartap-airlink/src/board_config.h | 4 +--- boards/sky-drones/smartap-airlink/src/manifest.c | 4 ++-- boards/sky-drones/smartap-airlink/src/mtd.cpp | 4 +++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/boards/sky-drones/smartap-airlink/src/board_config.h b/boards/sky-drones/smartap-airlink/src/board_config.h index 024915c055..d2ea3823e8 100644 --- a/boards/sky-drones/smartap-airlink/src/board_config.h +++ b/boards/sky-drones/smartap-airlink/src/board_config.h @@ -173,9 +173,7 @@ #define GPIO_HW_VER_REV_DRIVE /* PG0 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTG|GPIO_PIN0) #define GPIO_HW_REV_SENSE /* PF5 */ ADC3_GPIO(15) #define GPIO_HW_VER_SENSE /* PF4 */ ADC3_GPIO(14) -#define HW_INFO_INIT {'V','5','X','x', 'x',0} -#define HW_INFO_INIT_VER 3 /* Offset in above string of the VER */ -#define HW_INFO_INIT_REV 4 /* Offset in above string of the REV */ +#define HW_INFO_INIT "V5X%04x%04x" /* HEATER * PWM in future diff --git a/boards/sky-drones/smartap-airlink/src/manifest.c b/boards/sky-drones/smartap-airlink/src/manifest.c index 2f7deac667..90e248410a 100644 --- a/boards/sky-drones/smartap-airlink/src/manifest.c +++ b/boards/sky-drones/smartap-airlink/src/manifest.c @@ -112,7 +112,7 @@ __EXPORT px4_hw_mft_item board_query_manifest(px4_hw_mft_item_id_t id) static px4_hw_mft_list_entry boards_manifest = px4_hw_mft_list_uninitialized; if (boards_manifest == px4_hw_mft_list_uninitialized) { - uint32_t ver_rev = board_get_hw_version() << 8; + uint32_t ver_rev = board_get_hw_version() << 16; ver_rev |= board_get_hw_revision(); for (unsigned i = 0; i < arraySize(mft_lists); i++) { @@ -123,7 +123,7 @@ __EXPORT px4_hw_mft_item board_query_manifest(px4_hw_mft_item_id_t id) } if (boards_manifest == px4_hw_mft_list_uninitialized) { - syslog(LOG_ERR, "[boot] Board %4" PRIx32 " is not supported!\n", ver_rev); + syslog(LOG_ERR, "[boot] Board %08" PRIx32 " is not supported!\n", ver_rev); } } diff --git a/boards/sky-drones/smartap-airlink/src/mtd.cpp b/boards/sky-drones/smartap-airlink/src/mtd.cpp index 64006c84e1..f8f553b8c6 100644 --- a/boards/sky-drones/smartap-airlink/src/mtd.cpp +++ b/boards/sky-drones/smartap-airlink/src/mtd.cpp @@ -95,7 +95,9 @@ static const px4_mft_entry_s mtd_mft = { static const px4_mft_s mft = { .nmft = 1, - .mfts = &mtd_mft + .mfts = { + &mtd_mft + } }; const px4_mft_s *board_get_manifest(void)