dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Enabled UART3, added JTAG make target for IO, removed potentially problematic usleep

This commit is contained in:
Lorenz Meier 2012-11-30 10:42:27 +01:00
parent 20973d603c
commit d16d66f990
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -115,9 +115,20 @@ endif
upload: $(FIRMWARE_BUNDLE) $(UPLOADER) upload: $(FIRMWARE_BUNDLE) $(UPLOADER)
@python -u $(UPLOADER) --port $(SERIAL_PORTS) $(FIRMWARE_BUNDLE) @python -u $(UPLOADER) --port $(SERIAL_PORTS) $(FIRMWARE_BUNDLE)
#
# JTAG firmware uploading with OpenOCD
#
ifeq ($(JTAGCONFIG),)
JTAGCONFIG=interface/olimex-jtag-tiny.cfg
endif
upload-jtag-px4fmu: upload-jtag-px4fmu:
@echo Attempting to flash PX4FMU board via JTAG @echo Attempting to flash PX4FMU board via JTAG
@openocd -f interface/olimex-jtag-tiny.cfg -f ../Bootloader/stm32f4x.cfg -c init -c "reset halt" -c "flash write_image erase nuttx/nuttx" -c "flash write_image erase ../Bootloader/px4fmu_bl.elf" -c "reset run" -c shutdown @openocd -f $(JTAGCONFIG) -f ../Bootloader/stm32f4x.cfg -c init -c "reset halt" -c "flash write_image erase nuttx/nuttx" -c "flash write_image erase ../Bootloader/px4fmu_bl.elf" -c "reset run" -c shutdown
upload-jtag-px4io: all
@echo Attempting to flash PX4IO board via JTAG
@openocd -f $(JTAGCONFIG) -f ../Bootloader/stm32f1x.cfg -c init -c "reset halt" -c "flash write_image erase nuttx/nuttx" -c "flash write_image erase ../Bootloader/px4io_bl.elf" -c "reset run" -c shutdown
# #
# Hacks and fixups # Hacks and fixups

1
apps/drivers/px4io/px4io.cpp
View File

@ -348,7 +348,6 @@ PX4IO::task_main()
/* this would be bad... */ /* this would be bad... */
if (ret < 0) { if (ret < 0) {
log("poll error %d", errno); log("poll error %d", errno);
usleep(1000000);
continue; continue;
} }

2
nuttx/configs/px4io/io/defconfig
View File

@ -124,7 +124,7 @@ CONFIG_STM32_TIM7=n
CONFIG_STM32_WWDG=n CONFIG_STM32_WWDG=n
CONFIG_STM32_SPI2=n CONFIG_STM32_SPI2=n
CONFIG_STM32_USART2=y CONFIG_STM32_USART2=y
CONFIG_STM32_USART3=n CONFIG_STM32_USART3=y
CONFIG_STM32_I2C1=y CONFIG_STM32_I2C1=y
CONFIG_STM32_I2C2=n CONFIG_STM32_I2C2=n
CONFIG_STM32_BKP=n CONFIG_STM32_BKP=n