From dc3bfbd797db782b4cf711d04f1d6fff9c43977e Mon Sep 17 00:00:00 2001 From: Paul Goeser Date: Sat, 5 Feb 2011 02:47:00 +0100 Subject: [PATCH] moved F_CPU defines --- firmware/Makefile.inc | 1 - firmware/masterchip/Makefile | 2 ++ firmware/slavechip/Makefile | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/firmware/Makefile.inc b/firmware/Makefile.inc index 03314b8..466ab25 100644 --- a/firmware/Makefile.inc +++ b/firmware/Makefile.inc @@ -1,4 +1,3 @@ -DEFINES += -DF_CPU=16000000 CFLAGS += -save-temps CFLAGS += -std=gnu99 -Wall # implements C99, for # this removes dead code and does global linker optimization diff --git a/firmware/masterchip/Makefile b/firmware/masterchip/Makefile index 6630a39..f8b9ce8 100644 --- a/firmware/masterchip/Makefile +++ b/firmware/masterchip/Makefile @@ -1,6 +1,8 @@ # masterchip-makefile include ../Makefile.inc +DEFINES += -DF_CPU=16000000 + COMPILE = avr-gcc $(CFLAGS) $(DEFINES) OBJECTS = usbdrv/usbdrvasm.o usbdrv/usbdrv.o main.o display.o lcd/lcd.o usb.o softtimer.o spi.o spi_proto.o spi_pointers.o diff --git a/firmware/slavechip/Makefile b/firmware/slavechip/Makefile index 0e0fe40..d996db6 100644 --- a/firmware/slavechip/Makefile +++ b/firmware/slavechip/Makefile @@ -1,5 +1,8 @@ include ../Makefile.inc +DEFINES += -DF_CPU=8000000 + + COMPILE = avr-gcc $(CFLAGS) $(DEFINES) OBJECTS = main.o mcp_adc.o i2c_simple.o softtimer.o spi_proto.o spi.o spi_pointers.o muxer.o debug.o