Commit Graph

8 Commits

Author SHA1 Message Date
stevstrong 66df08b6bb update .gitignore 2017-07-03 20:59:56 +02:00
stevstrong bb8bbbaec7 Merge remote-tracking branch 'refs/remotes/origin/master' into Black_F4_variant
# Conflicts:
#	STM32F4/cores/maple/libmaple/HardwareSerial.cpp
#	STM32F4/cores/maple/libmaple/adc.h
#	STM32F4/cores/maple/libmaple/dmaF4.c
#	STM32F4/cores/maple/libmaple/dmaF4.h
#	STM32F4/cores/maple/libmaple/fsmc.c
#	STM32F4/cores/maple/libmaple/gpio.c
#	STM32F4/cores/maple/libmaple/rcc.c
#	STM32F4/cores/maple/libmaple/spi_f4.c
#	STM32F4/cores/maple/wirish_time.h
#	STM32F4/cores/maple/wirish_types.h
#	STM32F4/libraries/SPI/src/SPI.cpp
#	STM32F4/libraries/SPI/src/SPI.h
#	STM32F4/platform.txt
#	STM32F4/system/libmaple/Arduino.h
#	STM32F4/variants/generic_f407v/generic_f407v.h
#	STM32F4/variants/generic_f407v/ld/common.inc
#	STM32F4/variants/generic_f407v/ld/jtag.ld
#	STM32F4/variants/generic_f407v/pin_map.c
#	STM32F4/variants/generic_f407v/wirish/start.S
2017-07-03 20:42:10 +02:00
stevstrong fb823b6929 remove unused code & bugfixes
- setDataSize shall first disable the SPI before writing new value
- dmaTransfer adapted for TFT library usage
2016-12-26 15:26:51 +01:00
Roger Clark 176db5f9d0 Fix issue on OSX (and other platforms) where stm32flash only works if the serial device name starts with /dev/tty, as on OSX some serial devices start with /dev/cu. Also corrected mistake about .a file in stm32 parsers folder, and hopefully removed the .a file from source control 2015-07-08 15:14:25 +10:00
Roger Clark 1faf1d6b0d Using modified version of latest fork of stm32flash 2015-04-18 11:24:00 +10:00
Roger Clark d8634c071f fixed mistake in .gitignore for the maple-bootloader folder items 2015-01-26 16:55:05 +11:00
Roger Clark 09588d4792 Added modified version of maple_bootloader in a new folder called other 2015-01-26 09:35:26 +11:00
Roger Clark 39d28ca13d Added gitignore to prevent osx system files being included, and fixed issues in serial_upload for osx 2015-01-20 21:30:38 +11:00