projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master'
[fw/altos]
/
src
/
micropeak
/
Makefile
diff --git
a/src/micropeak/Makefile
b/src/micropeak/Makefile
index dcc328749af927de6f31484054a6d88ef177b5f4..ac00f635e77d5d23a581b520a207a0ef4b024a4d 100644
(file)
--- a/
src/micropeak/Makefile
+++ b/
src/micropeak/Makefile
@@
-2,12
+2,22
@@
# Tiny AltOS build
#
#
# 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
vpath ao-make-product.5c ../util
vpath make-altitude-pa ../util
include ../avr/Makefile.defs
+PROGNAME=micropeak-v0.1
+PROG=$(PROGNAME)-$(VERSION).elf
+HEX=$(PROGNAME)-$(VERSION).ihx
+
+SCRIPT=micropeak-load
+
+PUBLISH_DIR=$(HOME)/altusmetrumllc/Binaries
+PUBLISH_HEX=$(PUBLISH_DIR)/$(HEX)
+PUBLISH_SCRIPT=$(PUBLISH_DIR)/$(SCRIPT)
+
MCU=attiny85
DUDECPUTYPE=t85
#PROGRAMMER=stk500v2 -P usb
MCU=attiny85
DUDECPUTYPE=t85
#PROGRAMMER=stk500v2 -P usb
@@
-47,13
+57,11
@@
INC=\
IDPRODUCT=0
PRODUCT=MicroPeak-v0.1
PRODUCT_DEF=-DMICROPEAK
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
CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -O2 -mcall-prologues -DATTINY
NICKLE=nickle
-PROG=micropeak-v0.1
-
SRC=$(ALTOS_SRC)
OBJ=$(SRC:.c=.o)
SRC=$(ALTOS_SRC)
OBJ=$(SRC:.c=.o)
@@
-65,7
+73,7
@@
endif
# Otherwise, print the full command line.
quiet ?= $($1)
# Otherwise, print the full command line.
quiet ?= $($1)
-all: $(PROG) $(
PROG).hex
+all: $(PROG) $(
HEX) micropeak-load
CHECK=sh ../util/check-avr-mem
CHECK=sh ../util/check-avr-mem
@@
-73,16
+81,16
@@
$(PROG): Makefile $(OBJ)
$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ)
$(call quiet,CHECK) $(PROG) || ($(RM) -f $(PROG); exit 1)
$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ)
$(call quiet,CHECK) $(PROG) || ($(RM) -f $(PROG); exit 1)
-$(
PROG).hex
: $(PROG)
+$(
HEX)
: $(PROG)
avr-size $(PROG)
$(OBJCOPY) -R .eeprom -O ihex $(PROG) $@
avr-size $(PROG)
$(OBJCOPY) -R .eeprom -O ihex $(PROG) $@
-load: $(
PROG).hex
- $(LOADCMD) $(LOADARG)$(
PROG).hex
+load: $(
HEX)
+ $(LOADCMD) $(LOADARG)$(
HEX)
-load-slow: $(
PROG).hex
- $(LOADCMD) $(LOADSLOW) $(LOADARG)$(
PROG).hex
+load-slow: $(
HEX)
+ $(LOADCMD) $(LOADSLOW) $(LOADARG)$(
HEX)
ao_product.h: ao-make-product.5c ../Version
$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
ao_product.h: ao-make-product.5c ../Version
$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
@@
-95,12
+103,30
@@
ao_product.o: ao_product.c ao_product.h
distclean: clean
clean:
distclean: clean
clean:
- rm -f *.o $(PROG) $(
PROG).hex
+ rm -f *.o $(PROG) $(
HEX) $(SCRIPT)
rm -f ao_product.h
rm -f ao_product.h
+publish: $(PUBLISH_HEX) $(PUBLISH_SCRIPT)
+
+$(PUBLISH_HEX): $(HEX)
+ cp -a $(HEX) $@
+
+$(PUBLISH_SCRIPT): $(SCRIPT)
+ cp -a $(SCRIPT) $@
+
+load-product:
+ ./$(SCRIPT) fast
+
+load-product-slow:
+ ./$(SCRIPT) slow
+
../altitude-pa.h: make-altitude-pa
nickle $< > $@
../altitude-pa.h: make-altitude-pa
nickle $< > $@
+$(SCRIPT): $(SCRIPT).tmpl Makefile ../Version
+ sed -e 's/%HEX%/$(HEX)/' -e 's/%LOADCMD%/$(LOADCMD)/' -e 's/%LOADARG%/$(LOADARG)/' -e 's/%LOADSLOW%/$(LOADSLOW)/' $(SCRIPT).tmpl > $@ || (rm $@ && exit 1)
+ chmod +x $@
+
install:
uninstall:
install:
uninstall: