X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftelemetrum-v2.0%2FMakefile;h=9b66c5180407eb08a921d4a4f06b5d8750222699;hb=b00a155bef319984ec2cf11898355edf94348a4a;hp=a5370224cb172d0b48e722a4fb09171a919153c4;hpb=9c53ad6f8222878a26efecebd3bb1d1fe054a4b6;p=fw%2Faltos

diff --git a/src/telemetrum-v2.0/Makefile b/src/telemetrum-v2.0/Makefile
index a5370224..9b66c518 100644
--- a/src/telemetrum-v2.0/Makefile
+++ b/src/telemetrum-v2.0/Makefile
@@ -9,6 +9,7 @@ INC = \
 	ao.h \
 	ao_arch.h \
 	ao_arch_funcs.h \
+	ao_boot.h \
 	ao_companion.h \
 	ao_data.h \
 	ao_sample.h \
@@ -45,7 +46,7 @@ ALTOS_SRC = \
 	ao_cmd.c \
 	ao_config.c \
 	ao_task.c \
-	ao_led.c \
+	ao_led_stm.c \
 	ao_stdio.c \
 	ao_panic.c \
 	ao_timer.c \
@@ -73,6 +74,7 @@ ALTOS_SRC = \
 	ao_eeprom_stm.c \
 	ao_report.c \
 	ao_convert_pa.c \
+	ao_convert_volt.c \
 	ao_log.c \
 	ao_log_metrum.c \
 	ao_sample.c \
@@ -91,31 +93,26 @@ PRODUCT=TeleMetrum-v2.0
 PRODUCT_DEF=-DTELEMETRUM_V_2_0
 IDPRODUCT=0x000b
 
-CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) -Os -g
+CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF)
 
 PROGNAME=telemetrum-v2.0
 PROG=$(PROGNAME)-$(VERSION).elf
+HEX=$(PROGNAME)-$(VERSION).ihx
 
 SRC=$(ALTOS_SRC) ao_telemetrum.c
 OBJ=$(SRC:.c=.o)
 
-all: $(PROG)
+all: $(PROG) $(HEX)
 
 $(PROG): Makefile $(OBJ) altos.ld
-	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
-
-../altitude-pa.h: make-altitude-pa
-	nickle $< > $@
+	$(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) -Wl,-Map=$(PROGNAME)-$(VERSION).map
 
 $(OBJ): $(INC)
 
-ao_product.h: ao-make-product.5c ../Version
-	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
-
 distclean:	clean
 
 clean:
-	rm -f *.o $(PROGNAME)-*.elf
+	rm -f *.o $(PROGNAME)-*.elf $(PROGNAME)-*.ihx
 	rm -f ao_product.h
 
 install: