projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
micropeak: Use fast load mode by default in -load script
[fw/altos]
/
src
/
telemini-v2.0
/
Makefile
diff --git
a/src/telemini-v2.0/Makefile
b/src/telemini-v2.0/Makefile
index 40878778268af832cefd0aaa6030db6a286b6c9b..8657e9a90c82f10d30ca87094ac39ece8bcdbcfd 100644
(file)
--- a/
src/telemini-v2.0/Makefile
+++ b/
src/telemini-v2.0/Makefile
@@
-5,8
+5,8
@@
TELEMINI_VER=2.0
TELEMINI_DEF=2_0
TELEMINI_VER=2.0
TELEMINI_DEF=2_0
-vpath %.c ..:../
core
:../cc1111:../drivers:../product
-vpath %.h ..:../
core
:../cc1111:../drivers:../product
+vpath %.c ..:../
kernel
:../cc1111:../drivers:../product
+vpath %.h ..:../
kernel
:../cc1111:../drivers:../product
vpath ao-make-product.5c ../util
ifndef VERSION
vpath ao-make-product.5c ../util
ifndef VERSION
@@
-25,12
+25,12
@@
INC = \
ao_int64.h \
ao_sample.h \
ao_exti.h \
ao_int64.h \
ao_sample.h \
ao_exti.h \
- ao_task.h
+ ao_task.h \
+ altitude-pa-small.h
CORE_SRC = \
ao_cmd.c \
ao_config.c \
CORE_SRC = \
ao_cmd.c \
ao_config.c \
- ao_convert.c \
ao_flight.c \
ao_kalman.c \
ao_log.c \
ao_flight.c \
ao_kalman.c \
ao_log.c \
@@
-59,6
+59,7
@@
CC1111_SRC = \
ao_spi.c \
ao_usb.c \
ao_convert_pa.c \
ao_spi.c \
ao_usb.c \
ao_convert_pa.c \
+ ao_convert_volt.c \
ao_beep.c \
ao_timer.c \
ao_exti.c \
ao_beep.c \
ao_timer.c \
ao_exti.c \
@@
-81,7
+82,7
@@
PROGNAME = telemini-v$(TELEMINI_VER)
PROG = $(PROGNAME)-$(VERSION).ihx
PRODUCT=TeleMini-v$(TELEMINI_VER)
PRODUCT_DEF=-DTELEMINI_V_$(TELEMINI_DEF)
PROG = $(PROGNAME)-$(VERSION).ihx
PRODUCT=TeleMini-v$(TELEMINI_VER)
PRODUCT_DEF=-DTELEMINI_V_$(TELEMINI_DEF)
-IDPRODUCT=0x00
0a
+IDPRODUCT=0x00
27
include ../cc1111/Makefile.cc1111
include ../cc1111/Makefile.cc1111
@@
-96,10
+97,10
@@
endif
# Otherwise, print the full command line.
quiet ?= $($1)
# Otherwise, print the full command line.
quiet ?= $($1)
-all:
../
$(PROG)
+all: $(PROG)
-
../
$(PROG): $(REL) Makefile
- $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL)
&& cp $(PROG) $(PMAP) ..
+$(PROG): $(REL) Makefile
+ $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL)
$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
ao_product.h: ao-make-product.5c ../Version
$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
ao_product.h: ao-make-product.5c ../Version