X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Feasymini-v1.0%2FMakefile;h=755de1f06ea72779a7f140ad88c654b2d10746e4;hp=8042874fd2bd5a04faab44f919bc1a7be0fab8a4;hb=HEAD;hpb=52b19511222980138faddb2047707baceff0a596

diff --git a/src/easymini-v1.0/Makefile b/src/easymini-v1.0/Makefile
index 8042874f..755de1f0 100644
--- a/src/easymini-v1.0/Makefile
+++ b/src/easymini-v1.0/Makefile
@@ -32,6 +32,7 @@ ALTOS_SRC = \
 	ao_sample.c \
 	ao_data.c \
 	ao_convert_pa.c \
+	ao_convert_volt.c \
 	ao_task.c \
 	ao_log.c \
 	ao_log_mini.c \
@@ -50,22 +51,29 @@ PRODUCT=EasyMini-v1.0
 PRODUCT_DEF=-DEASYMINI_V_1_0
 IDPRODUCT=0x0026
 
-CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS) -g -Os
+CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS)
 
 PROGNAME=easymini-v1.0
 PROG=$(PROGNAME)-$(VERSION).elf
 HEX=$(PROGNAME)-$(VERSION).ihx
+FLASH_PROG=flash-loader/$(PROGNAME)-altos-flash-$(VERSION).elf
+BOTH_HEX=$(PROGNAME)-combined-$(VERSION).ihx
 
 SRC=$(ALTOS_SRC) ao_easymini.c
 OBJ=$(SRC:.c=.o)
 
-all: $(PROG) $(HEX)
+all: $(PROG) $(HEX) $(BOTH_HEX)
 
 $(PROG): Makefile $(OBJ) altos.ld
-	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
+	$(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
-ao_product.h: ao-make-product.5c ../Version
-	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
+$(BOTH_HEX): $(PROG) $(FLASH_PROG)
+	../../ao-tools/ao-elftohex/ao-elftohex -n --output=$@ $(FLASH_PROG) $(PROG)
+
+$(FLASH_PROG): FRC
+	+cd flash-loader && make
+
+FRC:
 
 $(OBJ): $(INC)
 
@@ -75,7 +83,7 @@ load: $(PROG)
 distclean:	clean
 
 clean:
-	rm -f *.o $(PROGNAME)-*.elf
+	rm -f *.o $(PROGNAME)-*.elf $(PROGNAME)-*.ihx $(PROGNAME)-*.map
 	rm -f ao_product.h
 
 install: