projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/easymotor-v2: Increase default flight log size
[fw/altos]
/
src
/
micropeak
/
Makefile
diff --git
a/src/micropeak/Makefile
b/src/micropeak/Makefile
index f4c57076c331e588253cbc34b316ce58ddfb619b..3ec43e668570e91e1ae485147946f483e7cd8913 100644
(file)
--- a/
src/micropeak/Makefile
+++ b/
src/micropeak/Makefile
@@
-2,24
+2,23
@@
# Tiny AltOS build
#
#
# Tiny AltOS build
#
#
-vpath % ../attiny:../drivers:../kernel:../product:..
-vpath ao-make-product.5c ../util
-vpath make-altitude-pa ../util
+TOPDIR=..
+include $(TOPDIR)/attiny/Makefile.defs
-include ../avr/Makefile.defs
+PROGNAME=micropeak-v0.1
+PROG=$(PROGNAME)-$(VERSION).elf
+HEX=$(PROGNAME)-$(VERSION).ihx
-MCU=attiny85
-DUDECPUTYPE=t85
-#PROGRAMMER=stk500v2 -P usb
-LOADSLOW=-i 32 -B 32
-LOADARG=-p $(DUDECPUTYPE) -c $(PROGRAMMER) -e -U flash:w:
+SCRIPT=micropeak-load
-#LDFLAGS=-L$(LDSCRIPTS) -Tavr25.x
+PUBLISH_DIR=$(HOME)/altusmetrumllc/Binaries
+PUBLISH_HEX=$(PUBLISH_DIR)/$(HEX)
+PUBLISH_SCRIPT=$(PUBLISH_DIR)/$(SCRIPT)
ALTOS_SRC = \
ao_micropeak.c \
ao_spi_attiny.c \
ALTOS_SRC = \
ao_micropeak.c \
ao_spi_attiny.c \
- ao_led.c \
+ ao_led
_tiny
.c \
ao_clock.c \
ao_ms5607.c \
ao_exti.c \
ao_clock.c \
ao_ms5607.c \
ao_exti.c \
@@
-42,30
+41,18
@@
INC=\
ao_ms5607.h \
ao_log_micro.h \
ao_micropeak.h \
ao_ms5607.h \
ao_log_micro.h \
ao_micropeak.h \
+ ao_product.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../kernel -I.. -I../drivers -I../product
-CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -O2 -mcall-prologues -DATTINY
-
-NICKLE=nickle
-
-PROG=micropeak-v0.1
+CFLAGS = $(PRODUCT_DEF) $(ATTINY_CFLAGS)
SRC=$(ALTOS_SRC)
OBJ=$(SRC:.c=.o)
SRC=$(ALTOS_SRC)
OBJ=$(SRC:.c=.o)
-V=0
-# The user has explicitly enabled quiet compilation.
-ifeq ($(V),0)
-quiet = @printf " $1 $2 $@\n"; $($1)
-endif
-# Otherwise, print the full command line.
-quiet ?= $($1)
-
-all: $(PROG) $(PROG).hex
+all: $(PROG) $(HEX) $(SCRIPT)
CHECK=sh ../util/check-avr-mem
CHECK=sh ../util/check-avr-mem
@@
-73,36
+60,42
@@
$(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: $(HEX)
+ $(LOADCMD) $(LOADARG)$(HEX)
-load: $(PROG).hex
- $(LOADCMD) $(LOADARG)$(PROG).hex
+load-slow: $(HEX)
+ $(LOADCMD) $(LOADSLOW) $(LOADARG)$(HEX)
+
+distclean: clean
-load-slow: $(PROG).hex
- $(LOADCMD) $(LOADSLOW) $(LOADARG)$(PROG).hex
+clean:
+ rm -f *.o *.elf *.ihx *.map $(SCRIPT)
+ rm -f ao_product.h
-ao_product.h: ao-make-product.5c ../Version
- $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
+publish: $(PUBLISH_HEX) $(PUBLISH_SCRIPT)
-ao_product.o: ao_product.c ao_product.h
+$(PUBLISH_HEX): $(HEX)
+ cp -a $(HEX) $@
-
%.o : %.c $(INC
)
- $(call quiet,CC) -c $(CFLAGS) $<
+
$(PUBLISH_SCRIPT): $(SCRIPT
)
+ cp -a $(SCRIPT) $@
-distclean: clean
+load-product:
+ ./$(SCRIPT) fast
-clean:
- rm -f *.o $(PROG) $(PROG).hex
- rm -f ao_product.h
+load-product-slow:
+ ./$(SCRIPT) slow
-../altitude-pa.h: make-altitude-pa
- nickle $< > $@
+$(SCRIPT): $(SCRIPT).tmpl Makefile $(TOPDIR)/Makedefs
+ 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:
-$(OBJ):
ao_product.h
$(INC)
+$(OBJ): $(INC)