Skip to content

Commit

Permalink
Merge pull request #203 from shawnchain/stm32f1
Browse files Browse the repository at this point in the history
add STM32F10X_Lib for stm32f105 support
  • Loading branch information
g4klx committed May 14, 2019
2 parents ff7a9fd + 2a6db2a commit 7c86367
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Expand Up @@ -4,3 +4,6 @@
[submodule "STM32F7XX_Lib"]
path = STM32F7XX_Lib
url = https://github.com/juribeparada/STM32F7XX_Lib.git
[submodule "STM32F10X_Lib"]
path = STM32F10X_Lib
url = https://github.com/shawnchain/STM32F10X_Lib.git
8 changes: 5 additions & 3 deletions Config.h
Expand Up @@ -44,11 +44,13 @@
// For the original Arduino Due pin layout
// #define ARDUINO_DUE_PAPA

#if defined(STM32F1)
// For the SQ6POG board
#define STM32F1_POG
#else
// For the ZUM V1.0 and V1.0.1 boards pin layout
#define ARDUINO_DUE_ZUM_V10

// For the SQ6POG board
// #define STM32F1_POG
#endif

// For the SP8NTH board
// #define ARDUINO_DUE_NTH
Expand Down
4 changes: 2 additions & 2 deletions Makefile.CMSIS
Expand Up @@ -25,7 +25,7 @@ STARTUP:=$(SYSDIR)/startup_stm32f105xc.S
STARTUP_DEFS=

# Include directory for CMSIS
CMSISDIR:=/opt/STM32Cube_FW_F1_V1.4.0/Drivers/CMSIS
CMSISDIR:=STM32F10X_Lib/CMSIS

# Libraries
LIBDIR:=
Expand Down Expand Up @@ -65,7 +65,7 @@ COMMON_FLAGS =-mthumb -mlittle-endian -mcpu=$(MCPU)
COMMON_FLAGS+= -Wall
COMMON_FLAGS+= -I. -I$(CMSISDIR)/Include -I$(CMSISDIR)/Device/ST/STM32F1xx/Include -I$(SYSDIR)
COMMON_FLAGS+= $(addprefix -I,$(INCDIR))
COMMON_FLAGS+= -D$(MCU) -DMADEBYMAKEFILE
COMMON_FLAGS+= -D$(MCU) -DMADEBYMAKEFILE -DSTM32F1
COMMON_FLAGS+= -Os -flto -ffunction-sections -fdata-sections
COMMON_FLAGS+= -g
# Assembler flags
Expand Down
1 change: 1 addition & 0 deletions STM32F10X_Lib
Submodule STM32F10X_Lib added at 417e0c

0 comments on commit 7c86367

Please sign in to comment.