altos: Add functions to init quaternions from vector pairs and euler angles

[fw/altos] / src / avr-demo / Makefile

diff --git a/src/avr-demo/Makefile b/src/avr-demo/Makefile
index ea356654e1798ae580f8871939f90c74d37a1d2b..6d9bfea2098f9102d4fff464f9f5760ec588a524 100644 (file)
--- a/src/avr-demo/Makefile
+++ b/src/avr-demo/Makefile
@@ -2,7 +2,7 @@
 # AltOS build
 #
 #
-vpath % ..:../core:../product:../driver
+vpath % ..:../core:../product:../drivers:../avr
 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
 
+include ../avr/Makefile.defs
+
 MCU=atmega32u4
 DUDECPUTYPE=m32u4
 #PROGRAMMER=stk500v2 -P usb
-PROGRAMMER=usbtiny
-LOADCMD=avrdude
 LOADARG=-p $(DUDECPUTYPE) -c $(PROGRAMMER) -e -U flash:w:
-CC=avr-gcc
-OBJCOPY=avr-objcopy
-
-ifndef VERSION
-include ../Version
-endif
 
 INC = \
        ao.h \
@@ -38,12 +32,15 @@ ALTOS_SRC = \
        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_led.c
+       ao_led.c \
+       ao_usb_avr.c \
+       ao_lcd.c
 
 PRODUCT=AvrDemo-v0.0
 MCU=atmega32u4