projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Fix nanopeak compile
[fw/altos]
/
src
/
micropeak
/
Makefile
diff --git
a/src/micropeak/Makefile
b/src/micropeak/Makefile
index 0c48ed66477a3db5b652c05d5da1ceaa8060dcfb..6ae3d0be2acb08611b2119bfe611d3b7d659f02d 100644
(file)
--- a/
src/micropeak/Makefile
+++ b/
src/micropeak/Makefile
@@
-2,30
+2,22
@@
# Tiny AltOS build
#
#
# Tiny AltOS build
#
#
-vpath % ../attiny:../drivers:../
core
:..
+vpath % ../attiny:../drivers:../
kernel:../product
:..
vpath ao-make-product.5c ../util
vpath make-altitude-pa ../util
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
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:
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 \
ALTOS_SRC = \
ao_micropeak.c \
@@
-35,11
+27,14
@@
ALTOS_SRC = \
ao_ms5607.c \
ao_exti.c \
ao_convert_pa.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_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 \
INC=\
ao.h \
@@
-48,13
+43,15
@@
INC=\
ao_arch_funcs.h \
ao_exti.h \
ao_ms5607.h \
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
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 -O
3
-mcall-prologues -DATTINY
+CFLAGS = $(PRODUCT_DEF) -I. -I../attiny -I../
kernel -I.. -I../drivers -I../product
+CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -O
2
-mcall-prologues -DATTINY
NICKLE=nickle
NICKLE=nickle
@@
-104,6
+101,16
@@
clean:
rm -f *.o $(PROG) $(PROG).hex
rm -f ao_product.h
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 $< > $@
../altitude-pa.h: make-altitude-pa
nickle $< > $@