Merge remote-tracking branch 'origin/master' into micropeak-logging

[fw/altos] / src / micropeak / Makefile

diff --git a/src/micropeak/Makefile b/src/micropeak/Makefile
index 8cf608bbdd2567eadd89e0f672fa02ed4da25e45..ff0a4499ea0ca9db0fafa6ec969b5ea9c730571f 100644 (file)
--- a/src/micropeak/Makefile
+++ b/src/micropeak/Makefile
@@ -11,6 +11,7 @@ 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
@@ -19,13 +20,6 @@ ifndef VERSION
 include ../Version
 endif
 
-# Support for a logging EEPROM
-#
-#EEPROM_SRC=ao_async.c \
-#      ao_i2c_attiny.c \
-#      ao_at24c.c
-#
-
 ALTOS_SRC = \
        ao_micropeak.c \
        ao_spi_attiny.c \
@@ -38,7 +32,8 @@ ALTOS_SRC = \
        ao_notask.c \
        ao_eeprom_tiny.c \
        ao_panic.c \
-       $(EEPROM_SRC)
+       ao_log_micro.c \
+       ao_async.c
 
 INC=\
        ao.h \
@@ -47,13 +42,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 += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -O2 -mcall-prologues -DATTINY
 
 NICKLE=nickle
 
@@ -86,6 +83,9 @@ $(PROG).hex: $(PROG)
 load: $(PROG).hex
        $(LOADCMD) $(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) > $@