Some refactoring ...

radio/src/opentx.cpp

@@ -302,11 +302,6 @@ void generalDefault()
   theme->init();
 #endif
 
-#if defined(SIMU)
-  uint32_t cpu_uid[3] = { 0x12345678, 0x55AA55AA, 0x87654321};
-#else
-  uint32_t * cpu_uid = (uint32_t *)0x1FFF7A10;
-#endif
   memcpy(g_eeGeneral.ownerRegistrationID, &cpu_uid[1], PXX2_LEN_REGISTRATION_ID);
 
   g_eeGeneral.chkSum = 0xFFFF;

radio/src/targets/common/arm/stm32/cpu_id.cpp

@@ -20,13 +20,14 @@
 
 #include "opentx.h"
 
+#if defined(SIMU)
+const uint32_t cpu_uid[3] = { 0x12345678, 0x55AA55AA, 0x87654321};
+#else
+const uint32_t * cpu_uid = (uint32_t *)0x1FFF7A10;
+#endif
+
 void getCPUUniqueID(char * s)
 {
-#if defined(SIMU)
-  uint32_t cpu_uid[3] = { 0x12345678, 0x55AA55AA, 0x87654321};
-#else
-  uint32_t * cpu_uid = (uint32_t *)0x1FFF7A10;
-#endif
   char * tmp = strAppendUnsigned(s, cpu_uid[0], 8, 16);
   *tmp = ' ';
   tmp = strAppendUnsigned(tmp+1, cpu_uid[1], 8, 16);

radio/src/targets/common/arm/stm32/cpu_id.h

@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <inttypes.h>
+
+void getCPUUniqueID(char * s);
+
+#define LEN_CPU_UID                    (3*8+2)
+
+#if defined(SIMU)
+extern const uint32_t cpu_uid[3];
+#else
+extern const uint32_t * cpu_uid;
+#endif

radio/src/targets/horus/board.h

@@ -22,6 +22,7 @@
 #define _BOARD_HORUS_H_
 
 #include "definitions.h"
+#include "cpu_id.h"
 
 #if defined(__cplusplus) && !defined(SIMU)
 extern "C" {
@@ -138,10 +139,6 @@ void delay_ms(uint32_t ms);
   #define IS_FIRMWARE_COMPATIBLE_WITH_BOARD() (!IS_HORUS_PROD())
 #endif
 
-// CPU Unique ID
-#define LEN_CPU_UID                    (3*8+2)
-void getCPUUniqueID(char * s);
-
 // SD driver
 #define BLOCK_SIZE                     512 /* Block Size in Bytes */
 #if !defined(SIMU) || defined(SIMU_DISKIO)

radio/src/targets/taranis/board.h

@@ -22,6 +22,7 @@
 #define _BOARD_H_
 
 #include "definitions.h"
+#include "cpu_id.h"
 
 #if defined(__cplusplus) && !defined(SIMU)
 extern "C" {
@@ -123,10 +124,6 @@ void delay_ms(uint32_t ms);
 }
 #endif
 
-// CPU Unique ID
-#define LEN_CPU_UID                     (3*8+2)
-void getCPUUniqueID(char * s);
-
 // SD driver
 #define BLOCK_SIZE                      512 /* Block Size in Bytes */
 #if !defined(SIMU) || defined(SIMU_DISKIO)