From 93f2cf077fa199da2b00d3655e75b865b339fc72 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Tue, 24 Jan 2017 15:47:06 -1000 Subject: [PATCH] posix derrived targes use BOARD_OVERRIDE_UUID --- src/drivers/boards/sim/board_config.h | 2 +- src/platforms/posix/include/system_config.h | 13 ++++++++++++- src/platforms/qurt/include/board_config.h | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/drivers/boards/sim/board_config.h b/src/drivers/boards/sim/board_config.h index 98134c2d62..1cc71755b1 100644 --- a/src/drivers/boards/sim/board_config.h +++ b/src/drivers/boards/sim/board_config.h @@ -8,6 +8,6 @@ #define PX4_I2C_OBDEV_LED 0x55 -#define STM32_SYSMEM_UID "SIMULATIONID" +#define BOARD_OVERRIDE_UUID "SIMULATIONID" #define BOARD_HAS_NO_RESET #define BOARD_HAS_NO_BOOTLOADER diff --git a/src/platforms/posix/include/system_config.h b/src/platforms/posix/include/system_config.h index b357b9de68..0c79972dc8 100644 --- a/src/platforms/posix/include/system_config.h +++ b/src/platforms/posix/include/system_config.h @@ -9,7 +9,18 @@ #define PX4_I2C_OBDEV_LED 0x55 -#define STM32_SYSMEM_UID "SIMULATIONID" +#define BOARD_OVERRIDE_UUID "SIMULATIONID" +#define SIM_FORMATED_UUID "000000010000000200000003" +#define PX4_CPU_UUID_BYTE_LENGTH 12 +#define PX4_CPU_UUID_WORD32_LENGTH 3 +#define PX4_CPU_UUID_WORD32_LEGACY_FORMAT_SIZE (PX4_CPU_UUID_WORD32_LENGTH-1+(2*PX4_CPU_UUID_BYTE_LENGTH)) + +typedef unsigned char raw_uuid_byte_t[PX4_CPU_UUID_BYTE_LENGTH]; +typedef unsigned int raw_uuid_uint32_t[PX4_CPU_UUID_WORD32_LENGTH]; + +#define board_get_uuid_raw32(id, null) do {id[0]=0;id[1]=1;id[2]=2;} while(0) +#define board_get_uuid_formated32(format_buffer, size, format, seperator, optional_reorder) do { strcpy(format_buffer, SIM_FORMATED_UUID); } while(0) + #define CONFIG_NFILE_STREAMS 1 #define CONFIG_SCHED_WORKQUEUE 1 diff --git a/src/platforms/qurt/include/board_config.h b/src/platforms/qurt/include/board_config.h index ab1a9ea10b..480cb6ddd4 100644 --- a/src/platforms/qurt/include/board_config.h +++ b/src/platforms/qurt/include/board_config.h @@ -8,4 +8,4 @@ #define PX4_I2C_OBDEV_LED 0x55 -#define STM32_SYSMEM_UID "SYSMEMID" +#define BOARD_OVERRIDE_UUID "SYSMEMID"