interfisch
/
hoverboard-firmware-hack-foc-serial-esc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

travis fix

This commit is contained in:
kai 2020-01-05 19:10:02 +01:00
parent c49bbdeacd
commit b22094adf7
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -8,7 +8,7 @@ jobs:
include: include:
- name: make (gcc-arm-none-eabi-7) - name: make (gcc-arm-none-eabi-7)
script: make script: make -e VARIANT=VARIANT_ADC
language: c language: c
addons: addons:
apt: apt:
@ -26,7 +26,7 @@ jobs:
before_script: arm-none-eabi-gcc --version before_script: arm-none-eabi-gcc --version
- name: make (gcc-arm-none-eabi-5) - name: make (gcc-arm-none-eabi-5)
script: make -e VARIANT_ADC script: make -e VARIANT=VARIANT_ADC
language: c language: c
addons: addons:
apt: apt:

11
Makefile
View File

@ -55,8 +55,8 @@ startup_stm32f103xe.s
####################################### #######################################
# binaries # binaries
####################################### #######################################
PREFIX = arm-none-eabi- #PREFIX = arm-none-eabi-
#PREFIX = gcc-arm-none-eabi-7/bin/arm-none-eabi- PREFIX = gcc-arm-none-eabi-7/bin/arm-none-eabi-
CC = $(PREFIX)gcc CC = $(PREFIX)gcc
AS = $(PREFIX)gcc -x assembler-with-cpp AS = $(PREFIX)gcc -x assembler-with-cpp
CP = $(PREFIX)objcopy CP = $(PREFIX)objcopy
@ -111,11 +111,16 @@ ifeq ($(DEBUG), 1)
CFLAGS += -g -gdwarf-2 CFLAGS += -g -gdwarf-2
endif endif
# Choose variant from env var
# make -e VARIANT=VARIANT_ADC
ifneq ($(VARIANT), )
CFLAGS += -D $(VARIANT)
endif
# Generate dependency information # Generate dependency information
CFLAGS += -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" CFLAGS += -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)"
####################################### #######################################
# LDFLAGS # LDFLAGS
####################################### #######################################