X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Favr-demo%2FMakefile;h=e21ad0471ea85465d89838c267830ab70fc6d0f8;hb=426bacbbd6e0573b143e7c48d71db977e53181fc;hp=ea356654e1798ae580f8871939f90c74d37a1d2b;hpb=e9fab7dc99a0e7c22b511c5919adf7df85213252;p=fw%2Faltos

diff --git a/src/avr-demo/Makefile b/src/avr-demo/Makefile
index ea356654..e21ad047 100644
--- a/src/avr-demo/Makefile
+++ b/src/avr-demo/Makefile
@@ -2,7 +2,7 @@
 # AltOS build
 #
 #
-vpath % ..:../core:../product:../driver
+vpath % ..:../kernel:../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,18 +32,21 @@ 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
 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