From 4dc8e6161244890f06b088b02ceee39d14c7db47 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Tue, 24 Jan 2017 15:44:47 -1000 Subject: [PATCH] uavcan uses common board api to interface with systemlib/board_serial --- src/modules/uavcan/uavcan_main.cpp | 2 +- src/modules/uavcanesc/uavcanesc_main.cpp | 2 +- src/modules/uavcannode/uavcannode_main.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/uavcan/uavcan_main.cpp b/src/modules/uavcan/uavcan_main.cpp index 2655328598..f2fef20ab4 100644 --- a/src/modules/uavcan/uavcan_main.cpp +++ b/src/modules/uavcan/uavcan_main.cpp @@ -191,7 +191,7 @@ int UavcanNode::getHardwareVersion(uavcan::protocol::HardwareVersion &hwver) ; // All other values of px4_board_name() resolve to zero } - uint8_t udid[12] = {}; // Someone seems to love magic numbers + raw_uuid_byte_t udid = {}; get_board_serial(udid); uavcan::copy(udid, udid + sizeof(udid), hwver.unique_id.begin()); rv = 0; diff --git a/src/modules/uavcanesc/uavcanesc_main.cpp b/src/modules/uavcanesc/uavcanesc_main.cpp index 93c57e44e2..7e93747ed2 100644 --- a/src/modules/uavcanesc/uavcanesc_main.cpp +++ b/src/modules/uavcanesc/uavcanesc_main.cpp @@ -231,7 +231,7 @@ void UavcanEsc::fill_node_info() hwver.major = HW_VERSION_MAJOR; hwver.minor = HW_VERSION_MINOR; - uint8_t udid[12] = {}; // Someone seems to love magic numbers + raw_uuid_byte_t udid = {}; get_board_serial(udid); uavcan::copy(udid, udid + sizeof(udid), hwver.unique_id.begin()); diff --git a/src/modules/uavcannode/uavcannode_main.cpp b/src/modules/uavcannode/uavcannode_main.cpp index 79864a1a19..51aaebbda7 100644 --- a/src/modules/uavcannode/uavcannode_main.cpp +++ b/src/modules/uavcannode/uavcannode_main.cpp @@ -258,7 +258,7 @@ void UavcanNode::fill_node_info() hwver.major = HW_VERSION_MAJOR; hwver.minor = HW_VERSION_MINOR; - uint8_t udid[12] = {}; // Someone seems to love magic numbers + raw_uuid_byte_t udid = {}; get_board_serial(udid); uavcan::copy(udid, udid + sizeof(udid), hwver.unique_id.begin());