Merge pull request #117 from juribeparada/master

Fix some comments for STM32F4XX & STM32F7XX
This commit is contained in:
Jonathan Naylor 2017-10-02 16:33:22 +01:00 committed by GitHub
commit d86b10fc1d
2 changed files with 6 additions and 7 deletions

View File

@ -75,7 +75,6 @@ NM=arm-none-eabi-nm
SIZE=arm-none-eabi-size SIZE=arm-none-eabi-size
A2L=arm-none-eabi-addr2line A2L=arm-none-eabi-addr2line
# Find source files
# "SystemRoot" is only defined in Windows # "SystemRoot" is only defined in Windows
ifdef SYSTEMROOT ifdef SYSTEMROOT
CLEANCMD=del /S *.o *.hex *.bin *.elf GitVersion.h CLEANCMD=del /S *.o *.hex *.bin *.elf GitVersion.h
@ -119,7 +118,7 @@ DEFS_DIS=-DUSE_STDPERIPH_DRIVER -DSTM32F4XX -DSTM32F40_41xxx -DSTM32F4_DISCOVERY
DEFS_PI=-DUSE_STDPERIPH_DRIVER -DSTM32F4XX -DSTM32F446xx -DSTM32F4_PI -DHSE_VALUE=$(OSC) -DMADEBYMAKEFILE DEFS_PI=-DUSE_STDPERIPH_DRIVER -DSTM32F4XX -DSTM32F446xx -DSTM32F4_PI -DHSE_VALUE=$(OSC) -DMADEBYMAKEFILE
# STM32F4 Nucleo-64 F446RE board: # STM32F4 Nucleo-64 F446RE board:
DEFS_NUCLEO=-DUSE_STDPERIPH_DRIVER -DSTM32F4XX -DSTM32F446xx -DSTM32F4_NUCLEO -DHSE_VALUE=$(OSC) -DMADEBYMAKEFILE DEFS_NUCLEO=-DUSE_STDPERIPH_DRIVER -DSTM32F4XX -DSTM32F446xx -DSTM32F4_NUCLEO -DHSE_VALUE=$(OSC) -DMADEBYMAKEFILE
# STM32F7 Nucleo-144-F767ZI board: # STM32F7 Nucleo-144 F767ZI board:
DEFS_NUCLEO_F767=-DUSE_HAL_DRIVER -DSTM32F767xx -DSTM32F7XX -DSTM32F7_NUCLEO -DHSE_VALUE=$(OSC) -DMADEBYMAKEFILE DEFS_NUCLEO_F767=-DUSE_HAL_DRIVER -DSTM32F767xx -DSTM32F7XX -DSTM32F7_NUCLEO -DHSE_VALUE=$(OSC) -DMADEBYMAKEFILE
# Build compiler flags # Build compiler flags
@ -140,7 +139,7 @@ LDFLAGS=-Os --specs=nano.specs
# Build Rules # Build Rules
.PHONY: all release dis pi nucleo f767 clean .PHONY: all release dis pi nucleo f767 clean
# Default target: STM32F4 Nucleo F446RE board # Default target: Nucleo-64 F446RE board
all: nucleo all: nucleo
pi: GitVersion.h pi: GitVersion.h

View File

@ -27,14 +27,14 @@
Pin definitions: Pin definitions:
- Host communication: - Host communication:
USART1 - TXD PA9 - RXD PA10 (Pi board) USART1 - TXD PA9 - RXD PA10 (MMDVM-Pi board)
USART2 - TXD PA2 - RXD PA3 (Nucleo board) USART2 - TXD PA2 - RXD PA3 (Nucleo64 F446RE board)
USART3 - TXD PC10 - RXD PC11 (Discovery board) USART3 - TXD PC10 - RXD PC11 (Discovery board)
USART3 - TXD PD8 - RXD PD9 (Nucleo144 F767ZI board)
- Serial repeater: - Serial repeater:
USART1 - TXD PA9 - RXD PA10 (Nucleo with Arduino header) USART1 - TXD PA9 - RXD PA10 (Nucleo with Arduino header)
UART5 - TXD PC12 - RXD PD2 (Discovery, Pi and Nucleo with Morpho header) UART5 - TXD PC12 - RXD PD2 (Discovery, MMDVM-Pi, Nucleo64 with Morpho header and Nucleo144 F767ZI)
*/ */
#if defined(STM32F4XX) || defined(STM32F7XX) #if defined(STM32F4XX) || defined(STM32F7XX)