X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fmicropeak%2FMakefile;h=f80d61b0743ef297e6eb41dd69503b6fef0414f7;hp=ff0a4499ea0ca9db0fafa6ec969b5ea9c730571f;hb=0686a7b8aec524d81bda4c572549a3a068ce0eed;hpb=23dc9a63ae8bc982d9352cfb7a3f508d8a08c374

diff --git a/src/micropeak/Makefile b/src/micropeak/Makefile
index ff0a4499..f80d61b0 100644
--- a/src/micropeak/Makefile
+++ b/src/micropeak/Makefile
@@ -2,38 +2,46 @@
 # Tiny AltOS build
 #
 #
-vpath % ../attiny:../drivers:../core:..
+vpath % ../attiny:../drivers:../kernel:../product:..
 vpath ao-make-product.5c ../util
 vpath make-altitude-pa ../util
 
+include ../avr/Makefile.defs
+
+PROGNAME=micropeak-v0.1
+PROG=$(PROGNAME)-$(VERSION).elf
+HEX=$(PROGNAME)-$(VERSION).ihx
+
+SCRIPT=micropeak-load
+
+PUBLISH_DIR=$(HOME)/altusmetrumllc/Binaries
+PUBLISH_HEX=$(PUBLISH_DIR)/$(HEX)
+PUBLISH_SCRIPT=$(PUBLISH_DIR)/$(SCRIPT)
+
 MCU=attiny85
 DUDECPUTYPE=t85
 #PROGRAMMER=stk500v2 -P usb
-PROGRAMMER=usbtiny
-LOADCMD=avrdude
 LOADSLOW=-i 32 -B 32
 LOADARG=-p $(DUDECPUTYPE) -c $(PROGRAMMER) -e -U flash:w:
-CC=avr-gcc
-OBJCOPY=avr-objcopy
 
-ifndef VERSION
-include ../Version
-endif
+#LDFLAGS=-L$(LDSCRIPTS) -Tavr25.x
 
 ALTOS_SRC = \
 	ao_micropeak.c \
 	ao_spi_attiny.c \
-	ao_led.c \
+	ao_led_tiny.c \
 	ao_clock.c \
 	ao_ms5607.c \
 	ao_exti.c \
 	ao_convert_pa.c \
-	ao_report_tiny.c \
+	ao_report_micro.c \
 	ao_notask.c \
 	ao_eeprom_tiny.c \
 	ao_panic.c \
 	ao_log_micro.c \
-	ao_async.c
+	ao_async.c \
+	ao_microflight.c \
+	ao_microkalman.c
 
 INC=\
 	ao.h \
@@ -49,13 +57,11 @@ INC=\
 IDPRODUCT=0
 PRODUCT=MicroPeak-v0.1
 PRODUCT_DEF=-DMICROPEAK
-CFLAGS = $(PRODUCT_DEF) -I. -I../attiny -I../core -I.. -I../drivers
+CFLAGS = $(PRODUCT_DEF) -I. -I../attiny -I../kernel -I.. -I../drivers -I../product
 CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -O2 -mcall-prologues -DATTINY
 
 NICKLE=nickle
 
-PROG=micropeak-v0.1
-
 SRC=$(ALTOS_SRC)
 OBJ=$(SRC:.c=.o)
 
@@ -67,7 +73,7 @@ endif
 # Otherwise, print the full command line.
 quiet ?= $($1)
 
-all: $(PROG) $(PROG).hex
+all: $(PROG) $(HEX) micropeak-load
 
 CHECK=sh ../util/check-avr-mem
 
@@ -75,16 +81,16 @@ $(PROG): Makefile $(OBJ)
 	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ)
 	$(call quiet,CHECK) $(PROG) || ($(RM) -f $(PROG); exit 1)
 
-$(PROG).hex: $(PROG)
+$(HEX): $(PROG)
 	avr-size $(PROG)
 	$(OBJCOPY) -R .eeprom -O ihex $(PROG) $@
 
 
-load: $(PROG).hex
-	$(LOADCMD) $(LOADARG)$(PROG).hex
+load: $(HEX)
+	$(LOADCMD) $(LOADARG)$(HEX)
 
-load-slow: $(PROG).hex
-	$(LOADCMD) $(LOADSLOW) $(LOADARG)$(PROG).hex
+load-slow: $(HEX)
+	$(LOADCMD) $(LOADSLOW) $(LOADARG)$(HEX)
 
 ao_product.h: ao-make-product.5c ../Version
 	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
@@ -97,12 +103,30 @@ ao_product.o: ao_product.c ao_product.h
 distclean:	clean
 
 clean:
-	rm -f *.o $(PROG) $(PROG).hex
+	rm -f *.o *.elf *.ihx $(SCRIPT)
 	rm -f ao_product.h
 
+publish: $(PUBLISH_HEX) $(PUBLISH_SCRIPT)
+
+$(PUBLISH_HEX): $(HEX)
+	cp -a $(HEX) $@
+
+$(PUBLISH_SCRIPT): $(SCRIPT)
+	cp -a $(SCRIPT) $@
+
+load-product:
+	./$(SCRIPT) fast
+
+load-product-slow:
+	./$(SCRIPT) slow
+
 ../altitude-pa.h: make-altitude-pa
 	nickle $< > $@
 
+$(SCRIPT): $(SCRIPT).tmpl Makefile ../Version
+	sed -e 's/%HEX%/$(HEX)/' -e 's/%LOADCMD%/$(LOADCMD)/' -e 's/%LOADARG%/$(LOADARG)/' -e 's/%LOADSLOW%/$(LOADSLOW)/' $(SCRIPT).tmpl > $@ || (rm $@ && exit 1)
+	chmod +x $@
+
 install:
 
 uninstall: