Pull v2 pieces up to build with the merge

This commit is contained in:
px4dev
2013-07-07 17:53:55 -07:00
parent 43f1843cc7
commit b4029dd824
60 changed files with 1167 additions and 227 deletions
+2 -2
View File
@@ -15,10 +15,10 @@ SRCS = adc.c \
../systemlib/mixer/mixer_multirotor.cpp \
../systemlib/mixer/mixer_simple.cpp \
ifeq ($(BOARD),px4io)
ifeq ($(BOARD),px4io-v1)
SRCS += i2c.c
endif
ifeq ($(BOARD),px4iov2)
ifeq ($(BOARD),px4io-v2)
SRCS += serial.c \
../systemlib/hx_stream.c
endif