altos: Fix nanopeak compile

[fw/altos] / src / micropeak / Makefile

diff --git a/src/micropeak/Makefile b/src/micropeak/Makefile
index ff0a4499ea0ca9db0fafa6ec969b5ea9c730571f..6ae3d0be2acb08611b2119bfe611d3b7d659f02d 100644 (file)
--- a/src/micropeak/Makefile
+++ b/src/micropeak/Makefile
@@ -2,23 +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
+#LDFLAGS=-L$(LDSCRIPTS) -Tavr25.x
 
 ALTOS_SRC = \
        ao_micropeak.c \
@@ -28,12 +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 \
        ao_log_micro.c \
-       ao_async.c
+       ao_async.c \
+       ao_microflight.c \
+       ao_microkalman.c
 
 INC=\
        ao.h \
@@ -49,7 +50,7 @@ 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
@@ -100,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 $< > $@