From 9efeb0d848fe85a47f180d5341e372f655c0ec04 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Tue, 24 Jan 2017 14:37:12 -1000 Subject: [PATCH] s2740vc-v1 bootloader uses common board api for UUID --- src/drivers/boards/s2740vc-v1/bootloader/CMakeLists.txt | 1 + src/drivers/boards/s2740vc-v1/bootloader/boot.c | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/drivers/boards/s2740vc-v1/bootloader/CMakeLists.txt b/src/drivers/boards/s2740vc-v1/bootloader/CMakeLists.txt index 1d564bc15a..725a3a989a 100644 --- a/src/drivers/boards/s2740vc-v1/bootloader/CMakeLists.txt +++ b/src/drivers/boards/s2740vc-v1/bootloader/CMakeLists.txt @@ -48,6 +48,7 @@ px4_add_module( -Os SRCS boot.c + ../../common/stm32/board_identity.c ${px4_bootloader_base}src/uavcan/main.c ${px4_bootloader_base}src/common/boot_app_shared.c ${px4_bootloader_base}src/sched/timer.c diff --git a/src/drivers/boards/s2740vc-v1/bootloader/boot.c b/src/drivers/boards/s2740vc-v1/bootloader/boot.c index 16a3f0c0bd..2267ece542 100644 --- a/src/drivers/boards/s2740vc-v1/bootloader/boot.c +++ b/src/drivers/boards/s2740vc-v1/bootloader/boot.c @@ -165,14 +165,13 @@ uint8_t board_get_product_name(uint8_t *product_name, size_t maxlen) size_t board_get_hardware_version(uavcan_HardwareVersion_t *hw_version) { - size_t length = 12; memset(hw_version, 0 , sizeof(uavcan_HardwareVersion_t)); hw_version->major = HW_VERSION_MAJOR; hw_version->minor = HW_VERSION_MINOR; - memcpy(hw_version->unique_id, (void *) STM32_SYSMEM_UID, length); - return length; + board_get_uuid_raw((raw_uuid_byte_t *) hw_version->unique_id); + return PX4_CPU_UUID_BYTE_LENGTH; } /****************************************************************************