projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Broke TeleMetrum GPS reporting by holding the GPS mutex too much
[fw/altos]
/
src
/
micropeak
/
Makefile
diff --git
a/src/micropeak/Makefile
b/src/micropeak/Makefile
index 315b93f6f91df9e6037c49cf0712240bb41b08a5..dcc328749af927de6f31484054a6d88ef177b5f4 100644
(file)
--- a/
src/micropeak/Makefile
+++ b/
src/micropeak/Makefile
@@
-2,23
+2,19
@@
# Tiny AltOS build
#
#
# Tiny AltOS build
#
#
-vpath % ../attiny:../drivers:../core:..
+vpath % ../attiny:../drivers:../core:..
/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
+
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
+#LDFLAGS=-L$(LDSCRIPTS) -Tavr25.x
ALTOS_SRC = \
ao_micropeak.c \
ALTOS_SRC = \
ao_micropeak.c \
@@
-28,7
+24,7
@@
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 \
@@
-51,7
+47,7
@@
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
+CFLAGS = $(PRODUCT_DEF) -I. -I../attiny -I../core -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