projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Don't dump MS5607 eeprom in 'B' command
[fw/altos]
/
src
/
micropeak
/
Makefile
diff --git
a/src/micropeak/Makefile
b/src/micropeak/Makefile
index f80d61b0743ef297e6eb41dd69503b6fef0414f7..74769802fc055942bde95199317adc657e143bd8 100644
(file)
--- a/
src/micropeak/Makefile
+++ b/
src/micropeak/Makefile
@@
-2,11
+2,8
@@
# Tiny AltOS build
#
#
# Tiny AltOS build
#
#
-vpath % ../attiny:../drivers:../kernel:../product:..
-vpath ao-make-product.5c ../util
-vpath make-altitude-pa ../util
-
-include ../avr/Makefile.defs
+TOPDIR=..
+include $(TOPDIR)/attiny/Makefile.defs
PROGNAME=micropeak-v0.1
PROG=$(PROGNAME)-$(VERSION).elf
PROGNAME=micropeak-v0.1
PROG=$(PROGNAME)-$(VERSION).elf
@@
-18,14
+15,6
@@
PUBLISH_DIR=$(HOME)/altusmetrumllc/Binaries
PUBLISH_HEX=$(PUBLISH_DIR)/$(HEX)
PUBLISH_SCRIPT=$(PUBLISH_DIR)/$(SCRIPT)
PUBLISH_HEX=$(PUBLISH_DIR)/$(HEX)
PUBLISH_SCRIPT=$(PUBLISH_DIR)/$(SCRIPT)
-MCU=attiny85
-DUDECPUTYPE=t85
-#PROGRAMMER=stk500v2 -P usb
-LOADSLOW=-i 32 -B 32
-LOADARG=-p $(DUDECPUTYPE) -c $(PROGRAMMER) -e -U flash:w:
-
-#LDFLAGS=-L$(LDSCRIPTS) -Tavr25.x
-
ALTOS_SRC = \
ao_micropeak.c \
ao_spi_attiny.c \
ALTOS_SRC = \
ao_micropeak.c \
ao_spi_attiny.c \
@@
-52,28
+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
+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) $(HEX) micropeak-load
+all: $(PROG) $(HEX) $(SCRIPT)
CHECK=sh ../util/check-avr-mem
CHECK=sh ../util/check-avr-mem
@@
-85,21
+64,12
@@
$(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-slow: $(HEX)
$(LOADCMD) $(LOADSLOW) $(LOADARG)$(HEX)
load: $(HEX)
$(LOADCMD) $(LOADARG)$(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.o: ao_product.c ao_product.h
-
-%.o : %.c $(INC)
- $(call quiet,CC) -c $(CFLAGS) $<
-
distclean: clean
clean:
distclean: clean
clean:
@@
-120,10
+90,7
@@
load-product:
load-product-slow:
./$(SCRIPT) slow
load-product-slow:
./$(SCRIPT) slow
-../altitude-pa.h: make-altitude-pa
- nickle $< > $@
-
-$(SCRIPT): $(SCRIPT).tmpl Makefile ../Version
+$(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 $@
sed -e 's/%HEX%/$(HEX)/' -e 's/%LOADCMD%/$(LOADCMD)/' -e 's/%LOADARG%/$(LOADARG)/' -e 's/%LOADSLOW%/$(LOADSLOW)/' $(SCRIPT).tmpl > $@ || (rm $@ && exit 1)
chmod +x $@
@@
-131,4
+98,4
@@
install:
uninstall:
uninstall:
-$(OBJ):
ao_product.h
$(INC)
+$(OBJ): $(INC)