X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Ftelemini-v2.0%2FMakefile;h=ca69dc415eaf2f1a78ef2e5d4db4b98199b36f21;hp=adb1256c221070086eceb6b856548bde4621e540;hb=36002fc724702d34302f3cc0df593019ca8db4e0;hpb=2c2bbfd9a1a4b9de42cf566f21f179ff5ede0419

diff --git a/src/telemini-v2.0/Makefile b/src/telemini-v2.0/Makefile
index adb1256c..ca69dc41 100644
--- a/src/telemini-v2.0/Makefile
+++ b/src/telemini-v2.0/Makefile
@@ -5,8 +5,8 @@
 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
@@ -23,12 +23,13 @@ INC = \
 	ao_ms5607_convert_8051.c \
 	ao_product.h \
 	ao_int64.h \
-	ao_sample.h
+	ao_sample.h \
+	ao_exti.h \
+	ao_task.h
 
 CORE_SRC = \
 	ao_cmd.c \
 	ao_config.c \
-	ao_convert.c \
 	ao_flight.c \
 	ao_kalman.c \
 	ao_log.c \
@@ -57,7 +58,7 @@ CC1111_SRC = \
 	ao_spi.c \
 	ao_usb.c \
 	ao_convert_pa.c \
-	ao_data.c \
+	ao_convert_volt.c \
 	ao_beep.c \
 	ao_timer.c \
 	ao_exti.c \
@@ -80,7 +81,7 @@ PROGNAME = telemini-v$(TELEMINI_VER)
 PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleMini-v$(TELEMINI_VER)
 PRODUCT_DEF=-DTELEMINI_V_$(TELEMINI_DEF)
-IDPRODUCT=0x000a
+IDPRODUCT=0x0027
 
 include ../cc1111/Makefile.cc1111
 
@@ -95,10 +96,10 @@ endif
 # 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