altos: Fix nanopeak compile

[fw/altos] / src / micropeak / Makefile

diff --git a/src/micropeak/Makefile b/src/micropeak/Makefile
index e51b2847d1fbf74eb9e4c639d2cfd570f9a7784f..6ae3d0be2acb08611b2119bfe611d3b7d659f02d 100644 (file)
--- a/src/micropeak/Makefile
+++ b/src/micropeak/Makefile
@@ -2,25 +2,22 @@
 # Tiny AltOS build
 #
 #
-vpath % ../attiny:../drivers:../core:../product:..
+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
 
-LDFLAGS=-L/usr/lib/ldscripts -Tavr25.x
-
-ifndef VERSION
-include ../Version
-endif
+#LDFLAGS=-L$(LDSCRIPTS) -Tavr25.x
 
 ALTOS_SRC = \
        ao_micropeak.c \
@@ -53,7 +50,7 @@ INC=\
 IDPRODUCT=0
 PRODUCT=MicroPeak-v0.1
 PRODUCT_DEF=-DMICROPEAK
-CFLAGS = $(PRODUCT_DEF) -I. -I../attiny -I../core -I.. -I../drivers -I../product
+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
@@ -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 $< > $@