+++ Additional Codework

1 files changed, 29 insertions, 17 deletions

diff --git a/source/Concept/Framework/default/Makefile b/source/Concept/Framework/default/Makefile
index e8aa72d..d0fbfb0 100644
--- a/source/Concept/Framework/default/Makefile
+++ b/source/Concept/Framework/default/Makefile
@@ -13,7 +13,7 @@ COMMON = -mmcu=$(MCU)
 

 ## Compile options common for all C compilation units.

 CFLAGS = $(COMMON)

-CFLAGS += -Wall -gdwarf-2     -DF_CPU=16000000ULUL  -O3 -fsigned-char

+CFLAGS += -Wall -gdwarf-2 -O3 -fsigned-char 

 CFLAGS += -MD -MP -MT $(*F).o -MF dep/$(@F).d 

 

 ## Assembly specific flags

@@ -33,8 +33,11 @@ HEX_EEPROM_FLAGS += --set-section-flags=.eeprom="alloc,load"
 HEX_EEPROM_FLAGS += --change-section-lma .eeprom=0

 

 

+## Include Directories

+INCLUDES = -I"Y:\Concept\Framework\modules" -I"Y:\Concept\Framework\modules\executor" -I"Y:\Concept\Framework\modules\input" -I"Y:\Concept\Framework\modules\interpreter" -I"Y:\Concept\Framework\modules\logic" -I"Y:\Concept\Framework\modules\output" 

+

 ## Objects that must be built in order to link

-OBJECTS = main.o sensor.o tools.o atmega128io.o display.o keyboard.o distance_sensor.o mouse_sensor.o engine.o dribbler.o io_module.o ir_sensor.o kicker.o led.o robot.o position_tracker.o 

+OBJECTS = io_module.o atmega128io.o main.o robot.o tools.o distance_sensor.o ir_sensor.o keyboard.o mouse_sensor.o sensor.o position_tracker.o display.o dribbler.o engine.o kicker.o led.o ball_tracker.o navigator.o 

 

 ## Objects explicitly added by the user

 LINKONLYOBJECTS = 

@@ -43,49 +46,58 @@ LINKONLYOBJECTS =
 all: $(TARGET) RoboCode.hex RoboCode.eep size

 

 ## Compile

-main.o: ../main.cpp

+io_module.o: ../modules/io_module.c

+	$(CC) $(INCLUDES) $(CFLAGS) -c  $<

+

+atmega128io.o: ../atmega128io.c

+	$(CC) $(INCLUDES) $(CFLAGS) -c  $<

+

+main.o: ../main.c

+	$(CC) $(INCLUDES) $(CFLAGS) -c  $<

+

+robot.o: ../robot.c

 	$(CC) $(INCLUDES) $(CFLAGS) -c  $<

 

-tools.o: ../tools.cpp

+tools.o: ../tools.c

 	$(CC) $(INCLUDES) $(CFLAGS) -c  $<

 

-io_module.o: ../io_module.cpp

+distance_sensor.o: ../modules/input/distance_sensor.c

 	$(CC) $(INCLUDES) $(CFLAGS) -c  $<

 

-robot.o: ../robot.cpp

+ir_sensor.o: ../modules/input/ir_sensor.c

 	$(CC) $(INCLUDES) $(CFLAGS) -c  $<

 

-sensor.o: ../sensor.cpp

+keyboard.o: ../modules/input/keyboard.c

 	$(CC) $(INCLUDES) $(CFLAGS) -c  $<

 

-engine.o: ../engine.cpp

+mouse_sensor.o: ../modules/input/mouse_sensor.c

 	$(CC) $(INCLUDES) $(CFLAGS) -c  $<

 

-led.o: ../led.cpp

+sensor.o: ../modules/input/sensor.c

 	$(CC) $(INCLUDES) $(CFLAGS) -c  $<

 

-display.o: ../display.cpp

+position_tracker.o: ../modules/interpreter/position_tracker.c

 	$(CC) $(INCLUDES) $(CFLAGS) -c  $<

 

-keyboard.o: ../keyboard.cpp

+display.o: ../modules/output/display.c

 	$(CC) $(INCLUDES) $(CFLAGS) -c  $<

 

-ir_sensor.o: ../ir_sensor.cpp

+dribbler.o: ../modules/output/dribbler.c

 	$(CC) $(INCLUDES) $(CFLAGS) -c  $<

 

-distance_sensor.o: ../distance_sensor.cpp

+engine.o: ../modules/output/engine.c

 	$(CC) $(INCLUDES) $(CFLAGS) -c  $<

 

-mouse_sensor.o: ../mouse_sensor.cpp

+kicker.o: ../modules/output/kicker.c

 	$(CC) $(INCLUDES) $(CFLAGS) -c  $<

 

-kicker.o: ../kicker.cpp

+led.o: ../modules/output/led.c

 	$(CC) $(INCLUDES) $(CFLAGS) -c  $<

 

-dribbler.o: ../dribbler.cpp

+ball_tracker.o: ../modules/interpreter/ball_tracker.c

 	$(CC) $(INCLUDES) $(CFLAGS) -c  $<

 

-atmega128io.o: ../atmega128io.cpp

+navigator.o: ../modules/executor/navigator.c

 	$(CC) $(INCLUDES) $(CFLAGS) -c  $<

 

 ##Link