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 |