Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-15 12:25:20 +03:00
Code Issues Wiki Activity

Merge branch 'naze32pro' - work in progress

Browse source 
Conflicts:
	Makefile
This commit is contained in:
Dominic Clifton 2014-05-31 22:50:05 +01:00
commit 14448f4734
5 changed files with 51 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/drivers/system.c
View file

@ -153,7 +153,7 @@ void systemInit(bool overclock)
// Make all GPIO in by default to save power and reduce noise
gpio.mode = Mode_AIN;
gpio.pin = Pin_All;
#ifdef STM32F3DISCOVERY
#ifdef STM32F303xC
gpio.pin = Pin_All & ~(Pin_13|Pin_14|Pin_15); // Leave JTAG pins alone
gpioInit(GPIOA, &gpio);
gpio.pin = Pin_All;
@ -285,6 +285,8 @@ void systemReset(bool toBootloader)
if (toBootloader) {
// 1FFFF000 -> 20000200 -> SP
// 1FFFF004 -> 1FFFF021 -> PC
// FIXME update for STM32F30x
*((uint32_t *)0x20004FF0) = 0xDEADBEEF; // 20KB STM32F103
}