X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftelemini-v2.0%2FMakefile;h=606b4f3bee7d98d64d286460f53af2ac401256b9;hb=24167015705ae831692b95735968b04a876f935e;hp=984406a965fe85e7815eefc5f4964bf7cd608dee;hpb=56911f27376b0fe91a464e369bb8aa1531b3c7dc;p=fw%2Faltos

diff --git a/src/telemini-v2.0/Makefile b/src/telemini-v2.0/Makefile
index 984406a9..606b4f3b 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,7 +23,9 @@ 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 \
@@ -57,9 +59,9 @@ CC1111_SRC = \
 	ao_spi.c \
 	ao_usb.c \
 	ao_convert_pa.c \
-	ao_data.c \
 	ao_beep.c \
 	ao_timer.c \
+	ao_exti.c \
 	_bp.c
 
 DRIVER_SRC = \
@@ -79,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
 
@@ -94,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