Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 00:05:17 +03:00
Code Issues Wiki Activity

getCPUUniqueId moved to STM32 common code

Browse source
This commit is contained in:
Bertrand Songis 2016-08-31 01:06:00 +02:00
parent 82b9ecc155
commit ca5c20abe3
5 changed files with 40 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
radio/src/targets/common/arm/stm32/CMakeLists.txt
View file

@ -17,6 +17,11 @@ set(STM32USB_SRC
STM32_USB_Device_Library/Core/src/usbd_ioreq.c STM32_USB_Device_Library/Core/src/usbd_ioreq.c
STM32_USB_Device_Library/Core/src/usbd_req.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 set(FIRMWARE_TARGET_SRC
${FIRMWARE_TARGET_SRC} ${FIRMWARE_TARGET_SRC}
../common/arm/stm32/delays.cpp ../common/arm/stm32/delays.cpp

35
radio/src/targets/common/arm/stm32/cpu_id.cpp Normal file
View file

@ -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);
}

1
radio/src/targets/horus/CMakeLists.txt
View file

@ -56,7 +56,6 @@ set(TARGET_SRC
led_driver.cpp led_driver.cpp
extmodule_driver.cpp extmodule_driver.cpp
gps_driver.cpp gps_driver.cpp
../common/arm/stm32/rtc_driver.cpp
) )
set(FIRMWARE_TARGET_SRC set(FIRMWARE_TARGET_SRC
${FIRMWARE_TARGET_SRC} ${FIRMWARE_TARGET_SRC}

1
radio/src/targets/taranis/CMakeLists.txt
View file

@ -96,7 +96,6 @@ set(TARGET_SRC
${LED_DRIVER} ${LED_DRIVER}
backlight_driver.cpp backlight_driver.cpp
extmodule_driver.cpp extmodule_driver.cpp
../common/arm/stm32/rtc_driver.cpp
) )
set(FIRMWARE_SRC set(FIRMWARE_SRC

14
radio/src/targets/taranis/board.cpp
View file

@ -39,20 +39,6 @@ void watchdogInit(unsigned int duration)
IWDG->KR = 0xCCCC; // start 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 // Starts TIMER at 2MHz
void init2MhzTimer() void init2MhzTimer()
{ {