noisymime
/
Arduino_STM32
mirror of https://github.com/noisymime/Arduino_STM32.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged latest changes from master

This commit is contained in:
Roger Clark 2016-07-16 09:19:51 +10:00
parent 9f6a04c416 8c6f302e9c
commit bf49c2cb09
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
STM32F4/boards.txt
View File

@ -79,7 +79,7 @@ netduino2plus.upload.dfuse_addr=0x8000000
netduino2plus.build.mcu=cortex-m4 netduino2plus.build.mcu=cortex-m4
netduino2plus.build.f_cpu=168000000L netduino2plus.build.f_cpu=168000000L
netduino2plus.build.core=maple netduino2plus.build.core=maple
netduino2plus.build.extra_flags=-DMCU_STM32F406VG -mthumb -DSTM32_HIGH_DENSITY -DSTM32F2 -DSTM32F4 -DBOARD_discovery_f4 -DSTM32F407xx netduino2plus.build.extra_flags=-DMCU_STM32F406VG -mthumb -DSTM32_HIGH_DENSITY -DSTM32F2 -DSTM32F4 -DBOARD_discovery_f4 -DARDUINO_STM32F4_NETDUINO2PLUS
netduino2plus.build.ldscript=ld/jtag.ld netduino2plus.build.ldscript=ld/jtag.ld
netduino2plus.build.variant=discovery_f407 netduino2plus.build.variant=discovery_f407
netduino2plus.build.variant_system_lib=lib_f407.a netduino2plus.build.variant_system_lib=lib_f407.a

2
STM32F4/cores/maple/boards.cpp
View File

@ -158,7 +158,6 @@ static void timerDefaultConfig(timer_dev *dev) {
regs->PSC = 1; regs->PSC = 1;
regs->SR = 0; regs->SR = 0;
regs->DIER = 0; regs->DIER = 0;
regs->EGR = TIMER_EGR_UG;
switch (dev->type) { switch (dev->type) {
case TIMER_ADVANCED: case TIMER_ADVANCED:
@ -176,5 +175,6 @@ static void timerDefaultConfig(timer_dev *dev) {
break; break;
} }
regs->EGR = TIMER_EGR_UG;
timer_resume(dev); timer_resume(dev);
} }

2
STM32F4/cores/maple/usb_serial.cpp
View File

@ -149,7 +149,7 @@ void USBSerial::enableBlockingTx(void) {
} }
void USBSerial::disableBlockingTx(void) { void USBSerial::disableBlockingTx(void) {
usbEnableBlockingTx(); usbDisableBlockingTx();
} }
USBSerial SerialUSB; USBSerial SerialUSB;

4
tools/linux/stlink_upload
View File

@ -1,4 +1,8 @@
#!/bin/bash #!/bin/bash
$(dirname $0)/stlink/st-flash write "$4" 0x8000000
exit 0
## Remove the lines 2 and 3 (above) if you want this script to wait until the Serial device has been enumerated and loaded before the script exits
# Check for leaf device. # Check for leaf device.
function leaf_status() function leaf_status()