From dc8e5287931b1e6f1bf191d32b8ccdaf82f25a29 Mon Sep 17 00:00:00 2001 From: Michael Hayes Date: Sat, 17 Sep 2011 22:28:17 +0000 Subject: [PATCH] Break out font stuff into new module --- apps/bounce1/Makefile.test | 49 ------------------------- apps/bounce3/Makefile | 5 ++- apps/bounce3/Makefile.test | 7 ++-- apps/bounce4/Makefile | 5 ++- apps/bounce4/Makefile.test | 7 ++-- apps/bounce5/Makefile | 5 ++- apps/bounce5/Makefile.test | 7 ++-- apps/chooser/Makefile | 5 ++- apps/chooser/Makefile.test | 7 ++-- apps/fonttest1/Makefile | 5 ++- apps/fonttest1/Makefile.test | 7 ++-- apps/hello2/Makefile | 5 ++- apps/hello2/Makefile.test | 7 ++-- apps/hello3/Makefile | 5 ++- apps/hello3/Makefile.test | 7 ++-- apps/hello4/Makefile | 5 ++- apps/hello4/Makefile.test | 7 ++-- apps/ir_grab1/Makefile | 5 ++- apps/ir_grab1/Makefile.test | 7 ++-- apps/ir_grab2/Makefile | 5 ++- apps/ir_grab2/Makefile.test | 7 ++-- apps/ir_grab3/Makefile | 5 ++- apps/ir_grab3/Makefile.test | 7 ++-- apps/ir_serial_test1/Makefile | 5 ++- apps/ir_serial_test1/Makefile.test | 7 ++-- apps/ir_serial_test2/Makefile | 5 ++- apps/ir_serial_test2/Makefile.test | 7 ++-- apps/ir_serial_test3/Makefile | 5 ++- apps/ir_serial_test3/Makefile.test | 7 ++-- apps/ir_uart_test1/Makefile | 5 ++- apps/ir_uart_test1/Makefile.test | 7 ++-- apps/ir_uart_test2/Makefile | 5 ++- apps/ir_uart_test2/Makefile.test | 7 ++-- apps/scribble1/Makefile | 5 ++- apps/scribble1/Makefile.test | 7 ++-- apps/snake1/Makefile | 5 ++- apps/snake1/Makefile.test | 7 ++-- apps/space10/Makefile | 5 ++- apps/space10/Makefile.test | 7 ++-- apps/space11/Makefile | 5 ++- apps/space11/Makefile.test | 7 ++-- apps/space12/Makefile | 5 ++- apps/space12/Makefile.test | 7 ++-- apps/space9/Makefile | 5 ++- apps/space9/Makefile.test | 7 ++-- apps/spacey_remote1/Makefile | 5 ++- apps/spacey_remote1/Makefile.test | 7 ++-- apps/squeak0/Makefile | 2 +- apps/squeak0/Makefile.test | 15 ++++---- apps/squeak3/Makefile | 5 ++- apps/squeak3/Makefile.test | 7 ++-- apps/squeak4/Makefile | 5 ++- apps/squeak4/Makefile.test | 7 ++-- apps/steer1/Makefile | 5 ++- apps/steer1/Makefile.test | 7 ++-- apps/task2/Makefile | 5 ++- apps/task2/Makefile.test | 7 ++-- apps/updown1/Makefile | 5 ++- apps/updown1/Makefile.test | 7 ++-- apps/updown2/Makefile | 5 ++- apps/updown2/Makefile.test | 7 ++-- etc/Makefile | 2 +- utils/font.c | 57 ++++++++++++++++++++++++++++++ utils/font.h | 19 +++++++--- utils/tinygl.c | 19 +--------- 65 files changed, 341 insertions(+), 170 deletions(-) create mode 100644 utils/font.c diff --git a/apps/bounce1/Makefile.test b/apps/bounce1/Makefile.test index 7baac90..e69de29 100644 --- a/apps/bounce1/Makefile.test +++ b/apps/bounce1/Makefile.test @@ -1,49 +0,0 @@ -# File: Makefile -# Author: M. P. Hayes, UCECE -# Date: 11 Sep 2010 -# Descr: Makefile for bounce1 - -CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../utils - -DEL = rm - - -# Default target. -all: bounce1 - - -# Compile: create object files from C source files. -bounce1-test.o: bounce1.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h ../../utils/pacer.h - $(CC) -c $(CFLAGS) $< -o $@ - -mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h - $(CC) -c $(CFLAGS) $< -o $@ - -pio-test.o: ../../drivers/test/pio.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h - $(CC) -c $(CFLAGS) $< -o $@ - -system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../drivers/test/mgetkey.h ../../drivers/test/pio.h ../../drivers/test/system.h - $(CC) -c $(CFLAGS) $< -o $@ - -timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h - $(CC) -c $(CFLAGS) $< -o $@ - -pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h - $(CC) -c $(CFLAGS) $< -o $@ - - - - -# Link: create executable file from object files. -bounce1: bounce1-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o - $(CC) $(CFLAGS) $^ -o $@ -lrt - - -# Clean: delete derived files. -.PHONY: clean -clean: - -$(DEL) bounce1 bounce1-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o - - - diff --git a/apps/bounce3/Makefile b/apps/bounce3/Makefile index 360bcd8..3f041c9 100644 --- a/apps/bounce3/Makefile +++ b/apps/bounce3/Makefile @@ -34,6 +34,9 @@ display.o: ../../drivers/display.c ../../drivers/avr/system.h ../../drivers/disp ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/ledmat.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -43,7 +46,7 @@ tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display. # Link: create ELF output file from object files. -bounce3.out: bounce3.o pio.o system.o timer.o display.o ledmat.o pacer.o tinygl.o +bounce3.out: bounce3.o pio.o system.o timer.o display.o ledmat.o font.o pacer.o tinygl.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/bounce3/Makefile.test b/apps/bounce3/Makefile.test index 8db1677..932f947 100644 --- a/apps/bounce3/Makefile.test +++ b/apps/bounce3/Makefile.test @@ -35,6 +35,9 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -45,14 +48,14 @@ tinygl-test.o: ../../utils/tinygl.c ../../drivers/display.h ../../drivers/test/s # Link: create executable file from object files. -bounce3: bounce3-test.o display-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o +bounce3: bounce3-test.o display-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) bounce3 bounce3-test.o display-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o + -$(DEL) bounce3 bounce3-test.o display-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o diff --git a/apps/bounce4/Makefile b/apps/bounce4/Makefile index 9d799bc..f668325 100644 --- a/apps/bounce4/Makefile +++ b/apps/bounce4/Makefile @@ -37,6 +37,9 @@ ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/syste boing.o: ../../utils/boing.c ../../drivers/avr/system.h ../../drivers/display.h ../../utils/boing.h ../../utils/font.h ../../utils/tinygl.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -46,7 +49,7 @@ tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display. # Link: create ELF output file from object files. -bounce4.out: bounce4.o pio.o system.o timer.o display.o ledmat.o boing.o pacer.o tinygl.o +bounce4.out: bounce4.o pio.o system.o timer.o display.o ledmat.o boing.o font.o pacer.o tinygl.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/bounce4/Makefile.test b/apps/bounce4/Makefile.test index cd18ae4..9d64a71 100644 --- a/apps/bounce4/Makefile.test +++ b/apps/bounce4/Makefile.test @@ -38,6 +38,9 @@ timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drive boing-test.o: ../../utils/boing.c ../../drivers/display.h ../../drivers/test/system.h ../../utils/boing.h ../../utils/font.h ../../utils/tinygl.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -48,14 +51,14 @@ tinygl-test.o: ../../utils/tinygl.c ../../drivers/display.h ../../drivers/test/s # Link: create executable file from object files. -bounce4: bounce4-test.o display-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o boing-test.o pacer-test.o tinygl-test.o +bounce4: bounce4-test.o display-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o boing-test.o font-test.o pacer-test.o tinygl-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) bounce4 bounce4-test.o display-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o boing-test.o pacer-test.o tinygl-test.o + -$(DEL) bounce4 bounce4-test.o display-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o boing-test.o font-test.o pacer-test.o tinygl-test.o diff --git a/apps/bounce5/Makefile b/apps/bounce5/Makefile index afabd94..18ec097 100644 --- a/apps/bounce5/Makefile +++ b/apps/bounce5/Makefile @@ -37,6 +37,9 @@ ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/syste boing.o: ../../utils/boing.c ../../drivers/avr/system.h ../../drivers/display.h ../../utils/boing.h ../../utils/font.h ../../utils/tinygl.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -46,7 +49,7 @@ tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display. # Link: create ELF output file from object files. -bounce5.out: bounce5.o pio.o system.o timer.o display.o ledmat.o boing.o pacer.o tinygl.o +bounce5.out: bounce5.o pio.o system.o timer.o display.o ledmat.o boing.o font.o pacer.o tinygl.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/bounce5/Makefile.test b/apps/bounce5/Makefile.test index 69ec78b..03a5e26 100644 --- a/apps/bounce5/Makefile.test +++ b/apps/bounce5/Makefile.test @@ -38,6 +38,9 @@ timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drive boing-test.o: ../../utils/boing.c ../../drivers/display.h ../../drivers/test/system.h ../../utils/boing.h ../../utils/font.h ../../utils/tinygl.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -48,14 +51,14 @@ tinygl-test.o: ../../utils/tinygl.c ../../drivers/display.h ../../drivers/test/s # Link: create executable file from object files. -bounce5: bounce5-test.o display-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o boing-test.o pacer-test.o tinygl-test.o +bounce5: bounce5-test.o display-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o boing-test.o font-test.o pacer-test.o tinygl-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) bounce5 bounce5-test.o display-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o boing-test.o pacer-test.o tinygl-test.o + -$(DEL) bounce5 bounce5-test.o display-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o boing-test.o font-test.o pacer-test.o tinygl-test.o diff --git a/apps/chooser/Makefile b/apps/chooser/Makefile index ad428a9..9e441ca 100644 --- a/apps/chooser/Makefile +++ b/apps/chooser/Makefile @@ -37,6 +37,9 @@ ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/syste navswitch.o: ../../drivers/navswitch.c ../../drivers/avr/delay.h ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/navswitch.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -46,7 +49,7 @@ tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display. # Link: create ELF output file from object files. -chooser.out: chooser.o pio.o system.o timer.o display.o ledmat.o navswitch.o pacer.o tinygl.o +chooser.out: chooser.o pio.o system.o timer.o display.o ledmat.o navswitch.o font.o pacer.o tinygl.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/chooser/Makefile.test b/apps/chooser/Makefile.test index eb4aebd..a6da95f 100644 --- a/apps/chooser/Makefile.test +++ b/apps/chooser/Makefile.test @@ -38,6 +38,9 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -48,14 +51,14 @@ tinygl-test.o: ../../utils/tinygl.c ../../drivers/display.h ../../drivers/test/s # Link: create executable file from object files. -chooser: chooser-test.o display-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o +chooser: chooser-test.o display-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) chooser chooser-test.o display-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o + -$(DEL) chooser chooser-test.o display-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o diff --git a/apps/fonttest1/Makefile b/apps/fonttest1/Makefile index af8d3c3..eba1f4a 100644 --- a/apps/fonttest1/Makefile +++ b/apps/fonttest1/Makefile @@ -37,6 +37,9 @@ ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/syste navswitch.o: ../../drivers/navswitch.c ../../drivers/avr/delay.h ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/navswitch.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -46,7 +49,7 @@ tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display. # Link: create ELF output file from object files. -fonttest1.out: fonttest1.o pio.o system.o timer.o display.o ledmat.o navswitch.o pacer.o tinygl.o +fonttest1.out: fonttest1.o pio.o system.o timer.o display.o ledmat.o navswitch.o font.o pacer.o tinygl.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/fonttest1/Makefile.test b/apps/fonttest1/Makefile.test index 55e024d..2bdc9fb 100644 --- a/apps/fonttest1/Makefile.test +++ b/apps/fonttest1/Makefile.test @@ -38,6 +38,9 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -48,14 +51,14 @@ tinygl-test.o: ../../utils/tinygl.c ../../drivers/display.h ../../drivers/test/s # Link: create executable file from object files. -fonttest1: fonttest1-test.o display-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o +fonttest1: fonttest1-test.o display-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) fonttest1 fonttest1-test.o display-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o + -$(DEL) fonttest1 fonttest1-test.o display-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o diff --git a/apps/hello2/Makefile b/apps/hello2/Makefile index 3d314ac..8eb2100 100644 --- a/apps/hello2/Makefile +++ b/apps/hello2/Makefile @@ -34,6 +34,9 @@ display.o: ../../drivers/display.c ../../drivers/avr/system.h ../../drivers/disp ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/ledmat.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -43,7 +46,7 @@ tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display. # Link: create ELF output file from object files. -hello2.out: hello2.o pio.o system.o timer.o display.o ledmat.o pacer.o tinygl.o +hello2.out: hello2.o pio.o system.o timer.o display.o ledmat.o font.o pacer.o tinygl.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/hello2/Makefile.test b/apps/hello2/Makefile.test index 9978b96..cb2ddab 100644 --- a/apps/hello2/Makefile.test +++ b/apps/hello2/Makefile.test @@ -35,6 +35,9 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -45,14 +48,14 @@ tinygl-test.o: ../../utils/tinygl.c ../../drivers/display.h ../../drivers/test/s # Link: create executable file from object files. -hello2: hello2-test.o display-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o +hello2: hello2-test.o display-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) hello2 hello2-test.o display-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o + -$(DEL) hello2 hello2-test.o display-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o diff --git a/apps/hello3/Makefile b/apps/hello3/Makefile index d62a2b2..9bbaed6 100644 --- a/apps/hello3/Makefile +++ b/apps/hello3/Makefile @@ -34,6 +34,9 @@ display.o: ../../drivers/display.c ../../drivers/avr/system.h ../../drivers/disp ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/ledmat.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -43,7 +46,7 @@ tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display. # Link: create ELF output file from object files. -hello3.out: hello3.o pio.o system.o timer.o display.o ledmat.o pacer.o tinygl.o +hello3.out: hello3.o pio.o system.o timer.o display.o ledmat.o font.o pacer.o tinygl.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/hello3/Makefile.test b/apps/hello3/Makefile.test index dd0a144..6f6829f 100644 --- a/apps/hello3/Makefile.test +++ b/apps/hello3/Makefile.test @@ -35,6 +35,9 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -45,14 +48,14 @@ tinygl-test.o: ../../utils/tinygl.c ../../drivers/display.h ../../drivers/test/s # Link: create executable file from object files. -hello3: hello3-test.o display-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o +hello3: hello3-test.o display-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) hello3 hello3-test.o display-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o + -$(DEL) hello3 hello3-test.o display-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o diff --git a/apps/hello4/Makefile b/apps/hello4/Makefile index 0fb80b8..f398b15 100644 --- a/apps/hello4/Makefile +++ b/apps/hello4/Makefile @@ -37,6 +37,9 @@ ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/syste navswitch.o: ../../drivers/navswitch.c ../../drivers/avr/delay.h ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/navswitch.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -46,7 +49,7 @@ tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display. # Link: create ELF output file from object files. -hello4.out: hello4.o pio.o system.o timer.o display.o ledmat.o navswitch.o pacer.o tinygl.o +hello4.out: hello4.o pio.o system.o timer.o display.o ledmat.o navswitch.o font.o pacer.o tinygl.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/hello4/Makefile.test b/apps/hello4/Makefile.test index 2b2f877..8dd97c1 100644 --- a/apps/hello4/Makefile.test +++ b/apps/hello4/Makefile.test @@ -38,6 +38,9 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -48,14 +51,14 @@ tinygl-test.o: ../../utils/tinygl.c ../../drivers/display.h ../../drivers/test/s # Link: create executable file from object files. -hello4: hello4-test.o display-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o +hello4: hello4-test.o display-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) hello4 hello4-test.o display-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o + -$(DEL) hello4 hello4-test.o display-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o diff --git a/apps/ir_grab1/Makefile b/apps/ir_grab1/Makefile index cdfe816..263ed87 100644 --- a/apps/ir_grab1/Makefile +++ b/apps/ir_grab1/Makefile @@ -40,6 +40,9 @@ ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/syste navswitch.o: ../../drivers/navswitch.c ../../drivers/avr/delay.h ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/navswitch.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -49,7 +52,7 @@ tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display. # Link: create ELF output file from object files. -ir_grab1.out: ir_grab1.o pio.o system.o timer.o display.o ir.o ledmat.o navswitch.o pacer.o tinygl.o +ir_grab1.out: ir_grab1.o pio.o system.o timer.o display.o ir.o ledmat.o navswitch.o font.o pacer.o tinygl.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/ir_grab1/Makefile.test b/apps/ir_grab1/Makefile.test index c8e3ff3..469f4d1 100644 --- a/apps/ir_grab1/Makefile.test +++ b/apps/ir_grab1/Makefile.test @@ -41,6 +41,9 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -51,14 +54,14 @@ tinygl-test.o: ../../utils/tinygl.c ../../drivers/display.h ../../drivers/test/s # Link: create executable file from object files. -ir_grab1: ir_grab1-test.o display-test.o ir-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o +ir_grab1: ir_grab1-test.o display-test.o ir-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) ir_grab1 ir_grab1-test.o display-test.o ir-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o + -$(DEL) ir_grab1 ir_grab1-test.o display-test.o ir-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o diff --git a/apps/ir_grab2/Makefile b/apps/ir_grab2/Makefile index dd70742..281896f 100644 --- a/apps/ir_grab2/Makefile +++ b/apps/ir_grab2/Makefile @@ -40,6 +40,9 @@ ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/syste navswitch.o: ../../drivers/navswitch.c ../../drivers/avr/delay.h ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/navswitch.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -52,7 +55,7 @@ uint8toa.o: ../../utils/uint8toa.c ../../drivers/avr/system.h # Link: create ELF output file from object files. -ir_grab2.out: ir_grab2.o pio.o system.o timer.o display.o ir.o ledmat.o navswitch.o pacer.o tinygl.o uint8toa.o +ir_grab2.out: ir_grab2.o pio.o system.o timer.o display.o ir.o ledmat.o navswitch.o font.o pacer.o tinygl.o uint8toa.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/ir_grab2/Makefile.test b/apps/ir_grab2/Makefile.test index 0b1dc39..e5cd16f 100644 --- a/apps/ir_grab2/Makefile.test +++ b/apps/ir_grab2/Makefile.test @@ -41,6 +41,9 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -54,14 +57,14 @@ uint8toa-test.o: ../../utils/uint8toa.c ../../drivers/test/system.h # Link: create executable file from object files. -ir_grab2: ir_grab2-test.o display-test.o ir-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o uint8toa-test.o +ir_grab2: ir_grab2-test.o display-test.o ir-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o uint8toa-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) ir_grab2 ir_grab2-test.o display-test.o ir-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o uint8toa-test.o + -$(DEL) ir_grab2 ir_grab2-test.o display-test.o ir-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o uint8toa-test.o diff --git a/apps/ir_grab3/Makefile b/apps/ir_grab3/Makefile index 7bc8038..8bfd01f 100644 --- a/apps/ir_grab3/Makefile +++ b/apps/ir_grab3/Makefile @@ -49,6 +49,9 @@ ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/syste navswitch.o: ../../drivers/navswitch.c ../../drivers/avr/delay.h ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/navswitch.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -58,7 +61,7 @@ tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display. # Link: create ELF output file from object files. -ir_grab3.out: ir_grab3.o eeprom.o pio.o system.o timer.o button.o display.o ir.o led.o ledmat.o navswitch.o pacer.o tinygl.o +ir_grab3.out: ir_grab3.o eeprom.o pio.o system.o timer.o button.o display.o ir.o led.o ledmat.o navswitch.o font.o pacer.o tinygl.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/ir_grab3/Makefile.test b/apps/ir_grab3/Makefile.test index 5dd07a7..cfd1428 100644 --- a/apps/ir_grab3/Makefile.test +++ b/apps/ir_grab3/Makefile.test @@ -50,6 +50,9 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -60,14 +63,14 @@ tinygl-test.o: ../../utils/tinygl.c ../../drivers/display.h ../../drivers/test/s # Link: create executable file from object files. -ir_grab3: ir_grab3-test.o button-test.o display-test.o ir-test.o led-test.o ledmat-test.o navswitch-test.o eeprom-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o +ir_grab3: ir_grab3-test.o button-test.o display-test.o ir-test.o led-test.o ledmat-test.o navswitch-test.o eeprom-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) ir_grab3 ir_grab3-test.o button-test.o display-test.o ir-test.o led-test.o ledmat-test.o navswitch-test.o eeprom-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o + -$(DEL) ir_grab3 ir_grab3-test.o button-test.o display-test.o ir-test.o led-test.o ledmat-test.o navswitch-test.o eeprom-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o diff --git a/apps/ir_serial_test1/Makefile b/apps/ir_serial_test1/Makefile index 25e51db..70e15ac 100644 --- a/apps/ir_serial_test1/Makefile +++ b/apps/ir_serial_test1/Makefile @@ -43,6 +43,9 @@ ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/syste navswitch.o: ../../drivers/navswitch.c ../../drivers/avr/delay.h ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/navswitch.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -52,7 +55,7 @@ tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display. # Link: create ELF output file from object files. -ir_serial_test1.out: ir_serial_test1.o pio.o system.o timer.o display.o ir.o ir_serial.o ledmat.o navswitch.o pacer.o tinygl.o +ir_serial_test1.out: ir_serial_test1.o pio.o system.o timer.o display.o ir.o ir_serial.o ledmat.o navswitch.o font.o pacer.o tinygl.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/ir_serial_test1/Makefile.test b/apps/ir_serial_test1/Makefile.test index 673ea87..de67636 100644 --- a/apps/ir_serial_test1/Makefile.test +++ b/apps/ir_serial_test1/Makefile.test @@ -44,6 +44,9 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -54,14 +57,14 @@ tinygl-test.o: ../../utils/tinygl.c ../../drivers/display.h ../../drivers/test/s # Link: create executable file from object files. -ir_serial_test1: ir_serial_test1-test.o display-test.o ir-test.o ir_serial-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o +ir_serial_test1: ir_serial_test1-test.o display-test.o ir-test.o ir_serial-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) ir_serial_test1 ir_serial_test1-test.o display-test.o ir-test.o ir_serial-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o + -$(DEL) ir_serial_test1 ir_serial_test1-test.o display-test.o ir-test.o ir_serial-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o diff --git a/apps/ir_serial_test2/Makefile b/apps/ir_serial_test2/Makefile index 94abf1a..df01858 100644 --- a/apps/ir_serial_test2/Makefile +++ b/apps/ir_serial_test2/Makefile @@ -43,6 +43,9 @@ ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/syste navswitch.o: ../../drivers/navswitch.c ../../drivers/avr/delay.h ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/navswitch.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -52,7 +55,7 @@ tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display. # Link: create ELF output file from object files. -ir_serial_test2.out: ir_serial_test2.o pio.o system.o timer.o display.o ir.o ir_serial.o ledmat.o navswitch.o pacer.o tinygl.o +ir_serial_test2.out: ir_serial_test2.o pio.o system.o timer.o display.o ir.o ir_serial.o ledmat.o navswitch.o font.o pacer.o tinygl.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/ir_serial_test2/Makefile.test b/apps/ir_serial_test2/Makefile.test index 25b7e84..9ad626f 100644 --- a/apps/ir_serial_test2/Makefile.test +++ b/apps/ir_serial_test2/Makefile.test @@ -44,6 +44,9 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -54,14 +57,14 @@ tinygl-test.o: ../../utils/tinygl.c ../../drivers/display.h ../../drivers/test/s # Link: create executable file from object files. -ir_serial_test2: ir_serial_test2-test.o display-test.o ir-test.o ir_serial-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o +ir_serial_test2: ir_serial_test2-test.o display-test.o ir-test.o ir_serial-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) ir_serial_test2 ir_serial_test2-test.o display-test.o ir-test.o ir_serial-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o + -$(DEL) ir_serial_test2 ir_serial_test2-test.o display-test.o ir-test.o ir_serial-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o diff --git a/apps/ir_serial_test3/Makefile b/apps/ir_serial_test3/Makefile index 43edf03..5b68f9e 100644 --- a/apps/ir_serial_test3/Makefile +++ b/apps/ir_serial_test3/Makefile @@ -43,6 +43,9 @@ ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/syste navswitch.o: ../../drivers/navswitch.c ../../drivers/avr/delay.h ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/navswitch.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -52,7 +55,7 @@ tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display. # Link: create ELF output file from object files. -ir_serial_test3.out: ir_serial_test3.o pio.o system.o timer.o display.o ir.o ir_serial.o ledmat.o navswitch.o pacer.o tinygl.o +ir_serial_test3.out: ir_serial_test3.o pio.o system.o timer.o display.o ir.o ir_serial.o ledmat.o navswitch.o font.o pacer.o tinygl.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/ir_serial_test3/Makefile.test b/apps/ir_serial_test3/Makefile.test index bbf66ec..8f73d22 100644 --- a/apps/ir_serial_test3/Makefile.test +++ b/apps/ir_serial_test3/Makefile.test @@ -44,6 +44,9 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -54,14 +57,14 @@ tinygl-test.o: ../../utils/tinygl.c ../../drivers/display.h ../../drivers/test/s # Link: create executable file from object files. -ir_serial_test3: ir_serial_test3-test.o display-test.o ir-test.o ir_serial-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o +ir_serial_test3: ir_serial_test3-test.o display-test.o ir-test.o ir_serial-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) ir_serial_test3 ir_serial_test3-test.o display-test.o ir-test.o ir_serial-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o + -$(DEL) ir_serial_test3 ir_serial_test3-test.o display-test.o ir-test.o ir_serial-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o diff --git a/apps/ir_uart_test1/Makefile b/apps/ir_uart_test1/Makefile index b828e72..214ad38 100644 --- a/apps/ir_uart_test1/Makefile +++ b/apps/ir_uart_test1/Makefile @@ -49,6 +49,9 @@ ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/syste navswitch.o: ../../drivers/navswitch.c ../../drivers/avr/delay.h ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/navswitch.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -58,7 +61,7 @@ tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display. # Link: create ELF output file from object files. -ir_uart_test1.out: ir_uart_test1.o ir_uart.o pio.o prescale.o system.o timer.o timer0.o usart1.o display.o ledmat.o navswitch.o pacer.o tinygl.o +ir_uart_test1.out: ir_uart_test1.o ir_uart.o pio.o prescale.o system.o timer.o timer0.o usart1.o display.o ledmat.o navswitch.o font.o pacer.o tinygl.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/ir_uart_test1/Makefile.test b/apps/ir_uart_test1/Makefile.test index 3e9a42c..52a263c 100644 --- a/apps/ir_uart_test1/Makefile.test +++ b/apps/ir_uart_test1/Makefile.test @@ -41,6 +41,9 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -51,14 +54,14 @@ tinygl-test.o: ../../utils/tinygl.c ../../drivers/display.h ../../drivers/test/s # Link: create executable file from object files. -ir_uart_test1: ir_uart_test1-test.o display-test.o ledmat-test.o navswitch-test.o ir_uart-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o +ir_uart_test1: ir_uart_test1-test.o display-test.o ledmat-test.o navswitch-test.o ir_uart-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) ir_uart_test1 ir_uart_test1-test.o display-test.o ledmat-test.o navswitch-test.o ir_uart-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o + -$(DEL) ir_uart_test1 ir_uart_test1-test.o display-test.o ledmat-test.o navswitch-test.o ir_uart-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o diff --git a/apps/ir_uart_test2/Makefile b/apps/ir_uart_test2/Makefile index 7eb9e4f..c4c4a17 100644 --- a/apps/ir_uart_test2/Makefile +++ b/apps/ir_uart_test2/Makefile @@ -49,6 +49,9 @@ ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/syste navswitch.o: ../../drivers/navswitch.c ../../drivers/avr/delay.h ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/navswitch.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -58,7 +61,7 @@ tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display. # Link: create ELF output file from object files. -ir_uart_test2.out: ir_uart_test2.o ir_uart.o pio.o prescale.o system.o timer.o timer0.o usart1.o display.o ledmat.o navswitch.o pacer.o tinygl.o +ir_uart_test2.out: ir_uart_test2.o ir_uart.o pio.o prescale.o system.o timer.o timer0.o usart1.o display.o ledmat.o navswitch.o font.o pacer.o tinygl.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/ir_uart_test2/Makefile.test b/apps/ir_uart_test2/Makefile.test index 24494e8..c2254ab 100644 --- a/apps/ir_uart_test2/Makefile.test +++ b/apps/ir_uart_test2/Makefile.test @@ -41,6 +41,9 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -51,14 +54,14 @@ tinygl-test.o: ../../utils/tinygl.c ../../drivers/display.h ../../drivers/test/s # Link: create executable file from object files. -ir_uart_test2: ir_uart_test2-test.o display-test.o ledmat-test.o navswitch-test.o ir_uart-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o +ir_uart_test2: ir_uart_test2-test.o display-test.o ledmat-test.o navswitch-test.o ir_uart-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) ir_uart_test2 ir_uart_test2-test.o display-test.o ledmat-test.o navswitch-test.o ir_uart-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o + -$(DEL) ir_uart_test2 ir_uart_test2-test.o display-test.o ledmat-test.o navswitch-test.o ir_uart-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o diff --git a/apps/scribble1/Makefile b/apps/scribble1/Makefile index 0ada7df..81f8d7d 100644 --- a/apps/scribble1/Makefile +++ b/apps/scribble1/Makefile @@ -43,6 +43,9 @@ ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/syste navswitch.o: ../../drivers/navswitch.c ../../drivers/avr/delay.h ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/navswitch.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -52,7 +55,7 @@ tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display. # Link: create ELF output file from object files. -scribble1.out: scribble1.o pio.o system.o timer.o button.o display.o led.o ledmat.o navswitch.o pacer.o tinygl.o +scribble1.out: scribble1.o pio.o system.o timer.o button.o display.o led.o ledmat.o navswitch.o font.o pacer.o tinygl.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/scribble1/Makefile.test b/apps/scribble1/Makefile.test index aeff580..5a4ce9d 100644 --- a/apps/scribble1/Makefile.test +++ b/apps/scribble1/Makefile.test @@ -44,6 +44,9 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -54,14 +57,14 @@ tinygl-test.o: ../../utils/tinygl.c ../../drivers/display.h ../../drivers/test/s # Link: create executable file from object files. -scribble1: scribble1-test.o button-test.o display-test.o led-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o +scribble1: scribble1-test.o button-test.o display-test.o led-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) scribble1 scribble1-test.o button-test.o display-test.o led-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o + -$(DEL) scribble1 scribble1-test.o button-test.o display-test.o led-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o diff --git a/apps/snake1/Makefile b/apps/snake1/Makefile index 0952c15..0264b4c 100644 --- a/apps/snake1/Makefile +++ b/apps/snake1/Makefile @@ -37,6 +37,9 @@ ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/syste navswitch.o: ../../drivers/navswitch.c ../../drivers/avr/delay.h ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/navswitch.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -46,7 +49,7 @@ tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display. # Link: create ELF output file from object files. -snake1.out: snake1.o pio.o system.o timer.o display.o ledmat.o navswitch.o pacer.o tinygl.o +snake1.out: snake1.o pio.o system.o timer.o display.o ledmat.o navswitch.o font.o pacer.o tinygl.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/snake1/Makefile.test b/apps/snake1/Makefile.test index 9e01d7b..44cab5b 100644 --- a/apps/snake1/Makefile.test +++ b/apps/snake1/Makefile.test @@ -38,6 +38,9 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -48,14 +51,14 @@ tinygl-test.o: ../../utils/tinygl.c ../../drivers/display.h ../../drivers/test/s # Link: create executable file from object files. -snake1: snake1-test.o display-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o +snake1: snake1-test.o display-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) snake1 snake1-test.o display-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o + -$(DEL) snake1 snake1-test.o display-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o diff --git a/apps/space10/Makefile b/apps/space10/Makefile index 98aa773..9dd2345 100644 --- a/apps/space10/Makefile +++ b/apps/space10/Makefile @@ -49,6 +49,9 @@ ir_serial.o: ../../drivers/ir_serial.c ../../drivers/avr/delay.h ../../drivers/a ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/ledmat.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -61,7 +64,7 @@ uint8toa.o: ../../utils/uint8toa.c ../../drivers/avr/system.h # Link: create ELF output file from object files. -space10.out: space10.o flasher.o spacey.o eeprom.o pio.o system.o timer.o display.o ir.o ir_serial.o ledmat.o pacer.o tinygl.o uint8toa.o +space10.out: space10.o flasher.o spacey.o eeprom.o pio.o system.o timer.o display.o ir.o ir_serial.o ledmat.o font.o pacer.o tinygl.o uint8toa.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/space10/Makefile.test b/apps/space10/Makefile.test index 9c186cb..5851138 100644 --- a/apps/space10/Makefile.test +++ b/apps/space10/Makefile.test @@ -50,6 +50,9 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -63,14 +66,14 @@ uint8toa-test.o: ../../utils/uint8toa.c ../../drivers/test/system.h # Link: create executable file from object files. -space10: space10-test.o flasher-test.o spacey-test.o display-test.o ir-test.o ir_serial-test.o ledmat-test.o eeprom-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o uint8toa-test.o +space10: space10-test.o flasher-test.o spacey-test.o display-test.o ir-test.o ir_serial-test.o ledmat-test.o eeprom-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o uint8toa-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) space10 space10-test.o flasher-test.o spacey-test.o display-test.o ir-test.o ir_serial-test.o ledmat-test.o eeprom-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o uint8toa-test.o + -$(DEL) space10 space10-test.o flasher-test.o spacey-test.o display-test.o ir-test.o ir_serial-test.o ledmat-test.o eeprom-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o uint8toa-test.o diff --git a/apps/space11/Makefile b/apps/space11/Makefile index c45e7a9..4e06062 100644 --- a/apps/space11/Makefile +++ b/apps/space11/Makefile @@ -49,6 +49,9 @@ ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/syste navswitch.o: ../../drivers/navswitch.c ../../drivers/avr/delay.h ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/navswitch.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + task.o: ../../utils/task.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/task.h $(CC) -c $(CFLAGS) $< -o $@ @@ -61,7 +64,7 @@ uint8toa.o: ../../utils/uint8toa.c ../../drivers/avr/system.h # Link: create ELF output file from object files. -space11.out: space11.o flasher.o spacey.o eeprom.o pio.o system.o timer.o display.o led.o ledmat.o navswitch.o task.o tinygl.o uint8toa.o +space11.out: space11.o flasher.o spacey.o eeprom.o pio.o system.o timer.o display.o led.o ledmat.o navswitch.o font.o task.o tinygl.o uint8toa.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/space11/Makefile.test b/apps/space11/Makefile.test index 6769527..5815459 100644 --- a/apps/space11/Makefile.test +++ b/apps/space11/Makefile.test @@ -50,6 +50,9 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + task-test.o: ../../utils/task.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/task.h $(CC) -c $(CFLAGS) $< -o $@ @@ -63,14 +66,14 @@ uint8toa-test.o: ../../utils/uint8toa.c ../../drivers/test/system.h # Link: create executable file from object files. -space11: space11-test.o flasher-test.o spacey-test.o display-test.o led-test.o ledmat-test.o navswitch-test.o eeprom-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o task-test.o tinygl-test.o uint8toa-test.o +space11: space11-test.o flasher-test.o spacey-test.o display-test.o led-test.o ledmat-test.o navswitch-test.o eeprom-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o task-test.o tinygl-test.o uint8toa-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) space11 space11-test.o flasher-test.o spacey-test.o display-test.o led-test.o ledmat-test.o navswitch-test.o eeprom-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o task-test.o tinygl-test.o uint8toa-test.o + -$(DEL) space11 space11-test.o flasher-test.o spacey-test.o display-test.o led-test.o ledmat-test.o navswitch-test.o eeprom-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o task-test.o tinygl-test.o uint8toa-test.o diff --git a/apps/space12/Makefile b/apps/space12/Makefile index c4d63a3..f79eaf7 100644 --- a/apps/space12/Makefile +++ b/apps/space12/Makefile @@ -58,6 +58,9 @@ ticker.o: ../../extra/ticker.c tweeter.o: ../../extra/tweeter.c ../../drivers/avr/system.h ../../extra/ticker.h ../../extra/tweeter.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + task.o: ../../utils/task.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/task.h $(CC) -c $(CFLAGS) $< -o $@ @@ -70,7 +73,7 @@ uint8toa.o: ../../utils/uint8toa.c ../../drivers/avr/system.h # Link: create ELF output file from object files. -space12.out: space12.o flasher.o spacey.o eeprom.o pio.o system.o timer.o display.o led.o ledmat.o navswitch.o mmelody.o ticker.o tweeter.o task.o tinygl.o uint8toa.o +space12.out: space12.o flasher.o spacey.o eeprom.o pio.o system.o timer.o display.o led.o ledmat.o navswitch.o mmelody.o ticker.o tweeter.o font.o task.o tinygl.o uint8toa.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/space12/Makefile.test b/apps/space12/Makefile.test index 0af1097..60e77a4 100644 --- a/apps/space12/Makefile.test +++ b/apps/space12/Makefile.test @@ -59,6 +59,9 @@ ticker-test.o: ../../extra/ticker.c tweeter-test.o: ../../extra/tweeter.c ../../drivers/test/system.h ../../extra/ticker.h ../../extra/tweeter.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + task-test.o: ../../utils/task.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/task.h $(CC) -c $(CFLAGS) $< -o $@ @@ -72,14 +75,14 @@ uint8toa-test.o: ../../utils/uint8toa.c ../../drivers/test/system.h # Link: create executable file from object files. -space12: space12-test.o flasher-test.o spacey-test.o display-test.o led-test.o ledmat-test.o navswitch-test.o eeprom-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o mmelody-test.o ticker-test.o tweeter-test.o task-test.o tinygl-test.o uint8toa-test.o +space12: space12-test.o flasher-test.o spacey-test.o display-test.o led-test.o ledmat-test.o navswitch-test.o eeprom-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o mmelody-test.o ticker-test.o tweeter-test.o font-test.o task-test.o tinygl-test.o uint8toa-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) space12 space12-test.o flasher-test.o spacey-test.o display-test.o led-test.o ledmat-test.o navswitch-test.o eeprom-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o mmelody-test.o ticker-test.o tweeter-test.o task-test.o tinygl-test.o uint8toa-test.o + -$(DEL) space12 space12-test.o flasher-test.o spacey-test.o display-test.o led-test.o ledmat-test.o navswitch-test.o eeprom-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o mmelody-test.o ticker-test.o tweeter-test.o font-test.o task-test.o tinygl-test.o uint8toa-test.o diff --git a/apps/space9/Makefile b/apps/space9/Makefile index 84b55e9..ec6cd7b 100644 --- a/apps/space9/Makefile +++ b/apps/space9/Makefile @@ -49,6 +49,9 @@ ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/syste navswitch.o: ../../drivers/navswitch.c ../../drivers/avr/delay.h ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/navswitch.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -61,7 +64,7 @@ uint8toa.o: ../../utils/uint8toa.c ../../drivers/avr/system.h # Link: create ELF output file from object files. -space9.out: space9.o flasher.o spacey.o eeprom.o pio.o system.o timer.o display.o led.o ledmat.o navswitch.o pacer.o tinygl.o uint8toa.o +space9.out: space9.o flasher.o spacey.o eeprom.o pio.o system.o timer.o display.o led.o ledmat.o navswitch.o font.o pacer.o tinygl.o uint8toa.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/space9/Makefile.test b/apps/space9/Makefile.test index f9d0a1d..69b93d0 100644 --- a/apps/space9/Makefile.test +++ b/apps/space9/Makefile.test @@ -50,6 +50,9 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -63,14 +66,14 @@ uint8toa-test.o: ../../utils/uint8toa.c ../../drivers/test/system.h # Link: create executable file from object files. -space9: space9-test.o flasher-test.o spacey-test.o display-test.o led-test.o ledmat-test.o navswitch-test.o eeprom-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o uint8toa-test.o +space9: space9-test.o flasher-test.o spacey-test.o display-test.o led-test.o ledmat-test.o navswitch-test.o eeprom-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o uint8toa-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) space9 space9-test.o flasher-test.o spacey-test.o display-test.o led-test.o ledmat-test.o navswitch-test.o eeprom-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o uint8toa-test.o + -$(DEL) space9 space9-test.o flasher-test.o spacey-test.o display-test.o led-test.o ledmat-test.o navswitch-test.o eeprom-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o uint8toa-test.o diff --git a/apps/spacey_remote1/Makefile b/apps/spacey_remote1/Makefile index 4884ab0..43172f4 100644 --- a/apps/spacey_remote1/Makefile +++ b/apps/spacey_remote1/Makefile @@ -43,6 +43,9 @@ ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/syste navswitch.o: ../../drivers/navswitch.c ../../drivers/avr/delay.h ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/navswitch.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -52,7 +55,7 @@ tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display. # Link: create ELF output file from object files. -spacey_remote1.out: spacey_remote1.o pio.o system.o timer.o display.o ir.o ir_serial.o ledmat.o navswitch.o pacer.o tinygl.o +spacey_remote1.out: spacey_remote1.o pio.o system.o timer.o display.o ir.o ir_serial.o ledmat.o navswitch.o font.o pacer.o tinygl.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/spacey_remote1/Makefile.test b/apps/spacey_remote1/Makefile.test index ef83a37..bacef09 100644 --- a/apps/spacey_remote1/Makefile.test +++ b/apps/spacey_remote1/Makefile.test @@ -44,6 +44,9 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -54,14 +57,14 @@ tinygl-test.o: ../../utils/tinygl.c ../../drivers/display.h ../../drivers/test/s # Link: create executable file from object files. -spacey_remote1: spacey_remote1-test.o display-test.o ir-test.o ir_serial-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o +spacey_remote1: spacey_remote1-test.o display-test.o ir-test.o ir_serial-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) spacey_remote1 spacey_remote1-test.o display-test.o ir-test.o ir_serial-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o + -$(DEL) spacey_remote1 spacey_remote1-test.o display-test.o ir-test.o ir_serial-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o diff --git a/apps/squeak0/Makefile b/apps/squeak0/Makefile index cc9aad6..f29828b 100644 --- a/apps/squeak0/Makefile +++ b/apps/squeak0/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../extra -I../../drivers -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../extra -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm diff --git a/apps/squeak0/Makefile.test b/apps/squeak0/Makefile.test index d84d095..3ccb7f5 100644 --- a/apps/squeak0/Makefile.test +++ b/apps/squeak0/Makefile.test @@ -1,23 +1,20 @@ # File: Makefile # Author: M. P. Hayes, UCECE # Date: 11 Sep 2010 -# Descr: Makefile for squeak1 +# Descr: Makefile for squeak0 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../extra -I../../utils +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../extra -I../../utils DEL = rm # Default target. -all: squeak1 +all: squeak0 # Compile: create object files from C source files. -squeak1-test.o: squeak1.c ../../drivers/led.h ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h ../../drivers/test/timer.h ../../extra/mmelody.h ../../extra/ticker.h ../../extra/tweeter.h ../../utils/task.h - $(CC) -c $(CFLAGS) $< -o $@ - -led-test.o: ../../drivers/led.c ../../drivers/led.h ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h +squeak0-test.o: squeak0.c ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h ../../drivers/test/timer.h ../../extra/mmelody.h ../../extra/ticker.h ../../extra/tweeter.h ../../utils/task.h $(CC) -c $(CFLAGS) $< -o $@ mgetkey-test.o: ../../drivers/test/mgetkey.c ../../drivers/test/mgetkey.h @@ -48,14 +45,14 @@ task-test.o: ../../utils/task.c ../../drivers/test/system.h ../../drivers/test/t # Link: create executable file from object files. -squeak1: squeak1-test.o led-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o mmelody-test.o ticker-test.o tweeter-test.o task-test.o +squeak0: squeak0-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o mmelody-test.o ticker-test.o tweeter-test.o task-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) squeak1 squeak1-test.o led-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o mmelody-test.o ticker-test.o tweeter-test.o task-test.o + -$(DEL) squeak0 squeak0-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o mmelody-test.o ticker-test.o tweeter-test.o task-test.o diff --git a/apps/squeak3/Makefile b/apps/squeak3/Makefile index 47be8b3..14fff47 100644 --- a/apps/squeak3/Makefile +++ b/apps/squeak3/Makefile @@ -49,6 +49,9 @@ ticker.o: ../../extra/ticker.c tweeter.o: ../../extra/tweeter.c ../../drivers/avr/system.h ../../extra/ticker.h ../../extra/tweeter.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + task.o: ../../utils/task.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/task.h $(CC) -c $(CFLAGS) $< -o $@ @@ -58,7 +61,7 @@ tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display. # Link: create ELF output file from object files. -squeak3.out: squeak3.o pio.o system.o timer.o button.o display.o led.o ledmat.o navswitch.o ticker.o tweeter.o task.o tinygl.o +squeak3.out: squeak3.o pio.o system.o timer.o button.o display.o led.o ledmat.o navswitch.o ticker.o tweeter.o font.o task.o tinygl.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/squeak3/Makefile.test b/apps/squeak3/Makefile.test index f2e2d8d..71ea2ee 100644 --- a/apps/squeak3/Makefile.test +++ b/apps/squeak3/Makefile.test @@ -50,6 +50,9 @@ ticker-test.o: ../../extra/ticker.c tweeter-test.o: ../../extra/tweeter.c ../../drivers/test/system.h ../../extra/ticker.h ../../extra/tweeter.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + task-test.o: ../../utils/task.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/task.h $(CC) -c $(CFLAGS) $< -o $@ @@ -60,14 +63,14 @@ tinygl-test.o: ../../utils/tinygl.c ../../drivers/display.h ../../drivers/test/s # Link: create executable file from object files. -squeak3: squeak3-test.o button-test.o display-test.o led-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o ticker-test.o tweeter-test.o task-test.o tinygl-test.o +squeak3: squeak3-test.o button-test.o display-test.o led-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o ticker-test.o tweeter-test.o font-test.o task-test.o tinygl-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) squeak3 squeak3-test.o button-test.o display-test.o led-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o ticker-test.o tweeter-test.o task-test.o tinygl-test.o + -$(DEL) squeak3 squeak3-test.o button-test.o display-test.o led-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o ticker-test.o tweeter-test.o font-test.o task-test.o tinygl-test.o diff --git a/apps/squeak4/Makefile b/apps/squeak4/Makefile index 36ab149..bdcc217 100644 --- a/apps/squeak4/Makefile +++ b/apps/squeak4/Makefile @@ -49,6 +49,9 @@ ticker.o: ../../extra/ticker.c tweeter.o: ../../extra/tweeter.c ../../drivers/avr/system.h ../../extra/ticker.h ../../extra/tweeter.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + task.o: ../../utils/task.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/task.h $(CC) -c $(CFLAGS) $< -o $@ @@ -58,7 +61,7 @@ tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display. # Link: create ELF output file from object files. -squeak4.out: squeak4.o pio.o system.o timer.o button.o display.o led.o ledmat.o mmelody.o ticker.o tweeter.o task.o tinygl.o +squeak4.out: squeak4.o pio.o system.o timer.o button.o display.o led.o ledmat.o mmelody.o ticker.o tweeter.o font.o task.o tinygl.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/squeak4/Makefile.test b/apps/squeak4/Makefile.test index 739177d..0b5b49c 100644 --- a/apps/squeak4/Makefile.test +++ b/apps/squeak4/Makefile.test @@ -50,6 +50,9 @@ ticker-test.o: ../../extra/ticker.c tweeter-test.o: ../../extra/tweeter.c ../../drivers/test/system.h ../../extra/ticker.h ../../extra/tweeter.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + task-test.o: ../../utils/task.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/task.h $(CC) -c $(CFLAGS) $< -o $@ @@ -60,14 +63,14 @@ tinygl-test.o: ../../utils/tinygl.c ../../drivers/display.h ../../drivers/test/s # Link: create executable file from object files. -squeak4: squeak4-test.o button-test.o display-test.o led-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o mmelody-test.o ticker-test.o tweeter-test.o task-test.o tinygl-test.o +squeak4: squeak4-test.o button-test.o display-test.o led-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o mmelody-test.o ticker-test.o tweeter-test.o font-test.o task-test.o tinygl-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) squeak4 squeak4-test.o button-test.o display-test.o led-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o mmelody-test.o ticker-test.o tweeter-test.o task-test.o tinygl-test.o + -$(DEL) squeak4 squeak4-test.o button-test.o display-test.o led-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o mmelody-test.o ticker-test.o tweeter-test.o font-test.o task-test.o tinygl-test.o diff --git a/apps/steer1/Makefile b/apps/steer1/Makefile index 8e37cea..3b2ebe7 100644 --- a/apps/steer1/Makefile +++ b/apps/steer1/Makefile @@ -37,6 +37,9 @@ ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/syste navswitch.o: ../../drivers/navswitch.c ../../drivers/avr/delay.h ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/navswitch.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -46,7 +49,7 @@ tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display. # Link: create ELF output file from object files. -steer1.out: steer1.o pio.o system.o timer.o display.o ledmat.o navswitch.o pacer.o tinygl.o +steer1.out: steer1.o pio.o system.o timer.o display.o ledmat.o navswitch.o font.o pacer.o tinygl.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/steer1/Makefile.test b/apps/steer1/Makefile.test index 43bfe3c..2c34525 100644 --- a/apps/steer1/Makefile.test +++ b/apps/steer1/Makefile.test @@ -38,6 +38,9 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -48,14 +51,14 @@ tinygl-test.o: ../../utils/tinygl.c ../../drivers/display.h ../../drivers/test/s # Link: create executable file from object files. -steer1: steer1-test.o display-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o +steer1: steer1-test.o display-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) steer1 steer1-test.o display-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o + -$(DEL) steer1 steer1-test.o display-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o diff --git a/apps/task2/Makefile b/apps/task2/Makefile index 11d4560..f6b9aca 100644 --- a/apps/task2/Makefile +++ b/apps/task2/Makefile @@ -37,6 +37,9 @@ led.o: ../../drivers/led.c ../../drivers/avr/pio.h ../../drivers/avr/system.h .. ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/ledmat.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + task.o: ../../utils/task.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/task.h $(CC) -c $(CFLAGS) $< -o $@ @@ -46,7 +49,7 @@ tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display. # Link: create ELF output file from object files. -task2.out: task2.o pio.o system.o timer.o display.o led.o ledmat.o task.o tinygl.o +task2.out: task2.o pio.o system.o timer.o display.o led.o ledmat.o font.o task.o tinygl.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/task2/Makefile.test b/apps/task2/Makefile.test index 7862b5b..610a184 100644 --- a/apps/task2/Makefile.test +++ b/apps/task2/Makefile.test @@ -38,6 +38,9 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + task-test.o: ../../utils/task.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/task.h $(CC) -c $(CFLAGS) $< -o $@ @@ -48,14 +51,14 @@ tinygl-test.o: ../../utils/tinygl.c ../../drivers/display.h ../../drivers/test/s # Link: create executable file from object files. -task2: task2-test.o display-test.o led-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o task-test.o tinygl-test.o +task2: task2-test.o display-test.o led-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o task-test.o tinygl-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) task2 task2-test.o display-test.o led-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o task-test.o tinygl-test.o + -$(DEL) task2 task2-test.o display-test.o led-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o task-test.o tinygl-test.o diff --git a/apps/updown1/Makefile b/apps/updown1/Makefile index bfe5c8c..7dfe61a 100644 --- a/apps/updown1/Makefile +++ b/apps/updown1/Makefile @@ -34,6 +34,9 @@ display.o: ../../drivers/display.c ../../drivers/avr/system.h ../../drivers/disp ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/ledmat.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -43,7 +46,7 @@ tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display. # Link: create ELF output file from object files. -updown1.out: updown1.o pio.o system.o timer.o display.o ledmat.o pacer.o tinygl.o +updown1.out: updown1.o pio.o system.o timer.o display.o ledmat.o font.o pacer.o tinygl.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/updown1/Makefile.test b/apps/updown1/Makefile.test index bde6f30..45866ae 100644 --- a/apps/updown1/Makefile.test +++ b/apps/updown1/Makefile.test @@ -35,6 +35,9 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -45,14 +48,14 @@ tinygl-test.o: ../../utils/tinygl.c ../../drivers/display.h ../../drivers/test/s # Link: create executable file from object files. -updown1: updown1-test.o display-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o +updown1: updown1-test.o display-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) updown1 updown1-test.o display-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o + -$(DEL) updown1 updown1-test.o display-test.o ledmat-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o diff --git a/apps/updown2/Makefile b/apps/updown2/Makefile index 411c1f2..c8ee338 100644 --- a/apps/updown2/Makefile +++ b/apps/updown2/Makefile @@ -37,6 +37,9 @@ ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/syste navswitch.o: ../../drivers/navswitch.c ../../drivers/avr/delay.h ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/navswitch.h $(CC) -c $(CFLAGS) $< -o $@ +font.o: ../../utils/font.c ../../drivers/avr/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -46,7 +49,7 @@ tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display. # Link: create ELF output file from object files. -updown2.out: updown2.o pio.o system.o timer.o display.o ledmat.o navswitch.o pacer.o tinygl.o +updown2.out: updown2.o pio.o system.o timer.o display.o ledmat.o navswitch.o font.o pacer.o tinygl.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/updown2/Makefile.test b/apps/updown2/Makefile.test index 1eaca40..d061078 100644 --- a/apps/updown2/Makefile.test +++ b/apps/updown2/Makefile.test @@ -38,6 +38,9 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h $(CC) -c $(CFLAGS) $< -o $@ +font-test.o: ../../utils/font.c ../../drivers/test/system.h ../../utils/font.h + $(CC) -c $(CFLAGS) $< -o $@ + pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.h $(CC) -c $(CFLAGS) $< -o $@ @@ -48,14 +51,14 @@ tinygl-test.o: ../../utils/tinygl.c ../../drivers/display.h ../../drivers/test/s # Link: create executable file from object files. -updown2: updown2-test.o display-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o +updown2: updown2-test.o display-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o $(CC) $(CFLAGS) $^ -o $@ -lrt # Clean: delete derived files. .PHONY: clean clean: - -$(DEL) updown2 updown2-test.o display-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o tinygl-test.o + -$(DEL) updown2 updown2-test.o display-test.o ledmat-test.o navswitch-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o font-test.o pacer-test.o tinygl-test.o diff --git a/etc/Makefile b/etc/Makefile index f552881..2c56215 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -9,7 +9,7 @@ # the applications looking for #includes. # It also creates the doc directories and the callgraphs, etc. -APPDIRS = $(filter-out ../apps/README ../lab1/Makefile ../Makefile, $(wildcard ../apps/*/ ../lab*/*/)) +APPDIRS = $(filter-out ../apps/README ../lab1/Makefile ../lab2/Makefile ../Makefile, $(wildcard ../apps/*/ ../lab*/*/)) DOCDIRS = $(addsuffix /doc, $(APPDIRS)) # Don't link against test-scaffold if directly accessing harware diff --git a/utils/font.c b/utils/font.c new file mode 100644 index 0000000..cc2aca4 --- /dev/null +++ b/utils/font.c @@ -0,0 +1,57 @@ +/** @file font.h + @author M. P. Hayes, UCECE + @date 18 Sep 2011 + @brief Font lookup. +*/ + +#include "font.h" + + +/** Determine if character in font. + @param font pointer to font structure + @param ch character to check + @return non-zero if character is in font. */ +bool font_contains_p (font_t *font, char ch) +{ + int8_t index; + + if (!font) + return 0; + + index = ch - font->offset; + return index >= 0 && index < font->size; +} + + +/** Determine if pixel on or off. + @param font pointer to font structure + @param ch character to display + @param col column of font element + @param row row of font element + @return 1 if pixel on; if pixel out of bounds return 0. */ +bool font_pixel_get (font_t *font, char ch, uint8_t col, uint8_t row) +{ + int8_t index; + font_data_t *char_data; + uint8_t offset; + + if (!font) + return 0; + + /* Check if desired pixel within size of an element. */ + if (col >= font->width || row >= font->height) + return 0; + + /* Find index of font element. */ + index = ch - font->offset; + if (index < 0 || index >= font->size) + return 0; + + /* Get start of font element data for ch. */ + char_data = &font->data[index * font->bytes]; + + /* Extract whether pixel should be on or off. */ + offset = row * font->width + col; + return (char_data[offset >> 3] & BIT (offset % 8)) != 0; +} + diff --git a/utils/font.h b/utils/font.h index 4e2714e..843dd8f 100644 --- a/utils/font.h +++ b/utils/font.h @@ -1,7 +1,7 @@ /** @file font.h @author M. P. Hayes, UCECE @date 1 March 2007 - @brief Font definition. + @brief Font lookup. */ #ifndef FONT_H @@ -31,11 +31,20 @@ typedef const struct } font_t; -/** Return the first character in the font. */ -#define FONT_FIRST(font) ((font)->offset) +/** Determine if character in font. + @param font pointer to font structure + @param ch character to check + @return non-zero if character is in font. */ +bool font_contains_p (font_t *font, char ch); -/** Return the last character in the font. */ -#define FONT_LAST(font) ((font)->offset + (font)->size - 1) +/** Determine if pixel on or off. + @param font pointer to font structure + @param ch character to display + @param col column of font element + @param row row of font element + @return 1 if pixel on; if pixel out of bounds return 0. */ +bool +font_pixel_get (font_t *font, char ch, uint8_t col, uint8_t row); #endif diff --git a/utils/tinygl.c b/utils/tinygl.c index 85f7548..fd2768d 100644 --- a/utils/tinygl.c +++ b/utils/tinygl.c @@ -123,24 +123,7 @@ void tinygl_clear (void) @return 1 if pixel on; if pixel out of bounds return 0. */ static bool tinygl_font_pixel_get (char ch, uint8_t col, uint8_t row) { - int8_t index; - font_data_t *char_data; - uint8_t offset; - - if (!font || col >= font->width || row >= font->height) - return 0; - - /* Find index of font entry. */ - index = ch - font->offset; - if (index < 0 || index >= font->size) - return 0; - - /* Get start of font entry data for ch. */ - char_data = &font->data[index * font->bytes]; - - /* Extract whether pixel should be on or off. */ - offset = row * font->width + col; - return (char_data[offset / 8] & BIT (offset % 8)) != 0; + return font_pixel_get (font, ch, col, row); }