projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Include sensor logging task only on flight boards
[fw/altos]
/
src
/
avr-demo
/
Makefile
diff --git
a/src/avr-demo/Makefile
b/src/avr-demo/Makefile
index ea356654e1798ae580f8871939f90c74d37a1d2b..e21ad0471ea85465d89838c267830ab70fc6d0f8 100644
(file)
--- a/
src/avr-demo/Makefile
+++ b/
src/avr-demo/Makefile
@@
-2,7
+2,7
@@
# AltOS build
#
#
# AltOS build
#
#
-vpath % ..:../
core:../product:../drive
r
+vpath % ..:../
kernel:../product:../drivers:../av
r
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 \
@@
-38,18
+32,21
@@
ALTOS_SRC = \
ao_mutex.c \
ao_panic.c \
ao_product.c \
ao_mutex.c \
ao_panic.c \
ao_product.c \
+ ao_romconfig.c \
ao_serial_avr.c \
ao_avr_stdio.c \
ao_stdio.c \
ao_task.c \
ao_timer.c \
ao_serial_avr.c \
ao_avr_stdio.c \
ao_stdio.c \
ao_task.c \
ao_timer.c \
- ao_led.c
+ ao_led.c \
+ ao_usb_avr.c \
+ ao_lcd.c
PRODUCT=AvrDemo-v0.0
MCU=atmega32u4
PRODUCT_DEF=-DAVR_DEMO
IDPRODUCT=0x000a
PRODUCT=AvrDemo-v0.0
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