X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fmicropeak%2FMakefile;h=335a96e50df8af1268e847c5432bf1f04f86e4a4;hp=0c48ed66477a3db5b652c05d5da1ceaa8060dcfb;hb=350d941a825d0271933de0bfdea82d3af5744c21;hpb=dfff41c2bec16fe4c7b198a4720eb40d8e740ac4

diff --git a/src/micropeak/Makefile b/src/micropeak/Makefile
index 0c48ed66..335a96e5 100644
--- a/src/micropeak/Makefile
+++ b/src/micropeak/Makefile
@@ -2,30 +2,22 @@
 # 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
+
+PUBLISH_DIR=$(HOME)/altusmetrumllc/Binaries
+PUBLISH_FILE=$(PUBLISH_DIR)/$(PROG)-$(VERSION).hex
+
 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
-
-# Support for a logging EEPROM
-#
-#EEPROM_SRC=ao_async.c \
-#	ao_i2c_attiny.c \
-#	ao_at24c.c
-#
+#LDFLAGS=-L$(LDSCRIPTS) -Tavr25.x
 
 ALTOS_SRC = \
 	ao_micropeak.c \
@@ -35,11 +27,14 @@ ALTOS_SRC = \
 	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 \
-	$(EEPROM_SRC)
+	ao_log_micro.c \
+	ao_async.c \
+	ao_microflight.c \
+	ao_microkalman.c
 
 INC=\
 	ao.h \
@@ -48,13 +43,15 @@ INC=\
 	ao_arch_funcs.h \
 	ao_exti.h \
 	ao_ms5607.h \
+	ao_log_micro.h \
+	ao_micropeak.h \
 	altitude-pa.h
 
 IDPRODUCT=0
 PRODUCT=MicroPeak-v0.1
 PRODUCT_DEF=-DMICROPEAK
-CFLAGS = $(PRODUCT_DEF) -I. -I../attiny -I../core -I.. -I../drivers
-CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -O3 -mcall-prologues -DATTINY
+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
 
@@ -87,8 +84,8 @@ $(PROG).hex: $(PROG)
 load: $(PROG).hex
 	$(LOADCMD) $(LOADARG)$(PROG).hex
 
-load-slow: $(PROG).hex
-	$(LOADCMD) $(LOADSLOW) $(LOADARG)$(PROG).hex
+#load-slow: $(PROG).hex
+#	$(LOADCMD) $(LOADSLOW) $(LOADARG)$(PROG).hex
 
 ao_product.h: ao-make-product.5c ../Version
 	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
@@ -104,6 +101,16 @@ clean:
 	rm -f *.o $(PROG) $(PROG).hex
 	rm -f ao_product.h
 
+
+publish: $(PROG).hex
+	cp -a $(PROG).hex $(PUBLISH_FILE)
+
+load-product:
+	$(LOADCMD) $(LOADARG)$(PUBLISH_FILE)
+
+load-product-slow:
+	$(LOADCMD) $(LOADSLOW) $(LOADARG)$(PUBLISH_FILE)
+
 ../altitude-pa.h: make-altitude-pa
 	nickle $< > $@