projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: For telelco discovery packets, retry 5 times with shorter timeout
[fw/altos]
/
src
/
avr-demo
/
Makefile
diff --git
a/src/avr-demo/Makefile
b/src/avr-demo/Makefile
index 932951665d527caa90eb435309b6e09756c37732..e21ad0471ea85465d89838c267830ab70fc6d0f8 100644
(file)
--- a/
src/avr-demo/Makefile
+++ b/
src/avr-demo/Makefile
@@
-2,7
+2,7
@@
# AltOS build
#
#
# AltOS build
#
#
-vpath % ..:../
core
:../product:../drivers:../avr
+vpath % ..:../
kernel
:../product:../drivers:../avr
vpath make-altitude ..
vpath make-kalman ..
vpath kalman.5c ../kalman
vpath make-altitude ..
vpath make-kalman ..
vpath kalman.5c ../kalman
@@
-11,18
+11,12
@@
vpath load_csv.5c ../kalman
vpath matrix.5c ../kalman
vpath ao-make-product.5c ../util
vpath matrix.5c ../kalman
vpath ao-make-product.5c ../util
+include ../avr/Makefile.defs
+
MCU=atmega32u4
DUDECPUTYPE=m32u4
#PROGRAMMER=stk500v2 -P usb
MCU=atmega32u4
DUDECPUTYPE=m32u4
#PROGRAMMER=stk500v2 -P usb
-PROGRAMMER=usbtiny
-LOADCMD=avrdude
LOADARG=-p $(DUDECPUTYPE) -c $(PROGRAMMER) -e -U flash:w:
LOADARG=-p $(DUDECPUTYPE) -c $(PROGRAMMER) -e -U flash:w:
-CC=avr-gcc
-OBJCOPY=avr-objcopy
-
-ifndef VERSION
-include ../Version
-endif
INC = \
ao.h \
INC = \
ao.h \
@@
-52,7
+46,7
@@
PRODUCT=AvrDemo-v0.0
MCU=atmega32u4
PRODUCT_DEF=-DAVR_DEMO
IDPRODUCT=0x000a
MCU=atmega32u4
PRODUCT_DEF=-DAVR_DEMO
IDPRODUCT=0x000a
-CFLAGS = $(PRODUCT_DEF) -I. -I../avr -I../
core
-I..
+CFLAGS = $(PRODUCT_DEF) -I. -I../avr -I../
kernel
-I..
CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -Os -mcall-prologues
NICKLE=nickle
CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -Os -mcall-prologues
NICKLE=nickle