diff --git a/radio/src/targets/common/arm/stm32/CMakeLists.txt b/radio/src/targets/common/arm/stm32/CMakeLists.txt index 4da98b97a..75eff65f8 100644 --- a/radio/src/targets/common/arm/stm32/CMakeLists.txt +++ b/radio/src/targets/common/arm/stm32/CMakeLists.txt @@ -17,6 +17,11 @@ set(STM32USB_SRC STM32_USB_Device_Library/Core/src/usbd_ioreq.c STM32_USB_Device_Library/Core/src/usbd_req.c ) +set(TARGET_SRC + ${TARGET_SRC} + ../common/arm/stm32/rtc_driver.cpp + ../common/arm/stm32/cpu_id.cpp + ) set(FIRMWARE_TARGET_SRC ${FIRMWARE_TARGET_SRC} ../common/arm/stm32/delays.cpp diff --git a/radio/src/targets/common/arm/stm32/cpu_id.cpp b/radio/src/targets/common/arm/stm32/cpu_id.cpp new file mode 100644 index 000000000..ef8977d13 --- /dev/null +++ b/radio/src/targets/common/arm/stm32/cpu_id.cpp @@ -0,0 +1,35 @@ +/* + * 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 "opentx.h" + +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); + *tmp = ' '; + strAppendUnsigned(tmp+1, cpu_uid[2], 8, 16); +} diff --git a/radio/src/targets/horus/CMakeLists.txt b/radio/src/targets/horus/CMakeLists.txt index 54158bcd2..e4c840d8f 100644 --- a/radio/src/targets/horus/CMakeLists.txt +++ b/radio/src/targets/horus/CMakeLists.txt @@ -56,7 +56,6 @@ set(TARGET_SRC led_driver.cpp extmodule_driver.cpp gps_driver.cpp - ../common/arm/stm32/rtc_driver.cpp ) set(FIRMWARE_TARGET_SRC ${FIRMWARE_TARGET_SRC} diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt index c693517fe..0b8fe0036 100644 --- a/radio/src/targets/taranis/CMakeLists.txt +++ b/radio/src/targets/taranis/CMakeLists.txt @@ -96,7 +96,6 @@ set(TARGET_SRC ${LED_DRIVER} backlight_driver.cpp extmodule_driver.cpp - ../common/arm/stm32/rtc_driver.cpp ) set(FIRMWARE_SRC diff --git a/radio/src/targets/taranis/board.cpp b/radio/src/targets/taranis/board.cpp index 44280340e..7d3f7986f 100644 --- a/radio/src/targets/taranis/board.cpp +++ b/radio/src/targets/taranis/board.cpp @@ -39,20 +39,6 @@ void watchdogInit(unsigned int duration) IWDG->KR = 0xCCCC; // start } -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); - *tmp = ' '; - strAppendUnsigned(tmp+1, cpu_uid[2], 8, 16); -} - // Starts TIMER at 2MHz void init2MhzTimer() {