From da88955fd44988094d0422214f6a69784ff9a5b8 Mon Sep 17 00:00:00 2001 From: Michael Hayes Date: Sat, 24 Sep 2011 21:27:13 +0000 Subject: [PATCH] Add stopwatch1 --- apps/stopwatch1/Makefile | 69 ++++++++++++++++++++++++ apps/stopwatch1/Makefile.test | 64 ++++++++++++++++++++++ apps/stopwatch1/doc/Makefile | 42 +++++++++++++++ apps/stopwatch1/doc/README | 16 ++++++ apps/stopwatch1/stopwatch1.c | 99 +++++++++++++++++++++++++++++++++++ 5 files changed, 290 insertions(+) create mode 100644 apps/stopwatch1/Makefile create mode 100644 apps/stopwatch1/Makefile.test create mode 100644 apps/stopwatch1/doc/Makefile create mode 100644 apps/stopwatch1/doc/README create mode 100644 apps/stopwatch1/stopwatch1.c diff --git a/apps/stopwatch1/Makefile b/apps/stopwatch1/Makefile new file mode 100644 index 0000000..8a2977b --- /dev/null +++ b/apps/stopwatch1/Makefile @@ -0,0 +1,69 @@ +# File: Makefile +# Author: M. P. Hayes, UCECE +# Date: 12 Sep 2010 +# Descr: Makefile for stopwatch1 + +# Definitions. +CC = avr-gcc +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils +OBJCOPY = avr-objcopy +SIZE = avr-size +DEL = rm + + +# Default target. +all: stopwatch1.out + + +# Compile: create object files from C source files. +stopwatch1.o: stopwatch1.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../drivers/button.h ../../drivers/display.h ../../fonts/font3x5_1.h ../../utils/font.h ../../utils/task.h ../../utils/tinygl.h + $(CC) -c $(CFLAGS) $< -o $@ + +pio.o: ../../drivers/avr/pio.c ../../drivers/avr/pio.h ../../drivers/avr/system.h + $(CC) -c $(CFLAGS) $< -o $@ + +system.o: ../../drivers/avr/system.c ../../drivers/avr/system.h + $(CC) -c $(CFLAGS) $< -o $@ + +timer.o: ../../drivers/avr/timer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h + $(CC) -c $(CFLAGS) $< -o $@ + +button.o: ../../drivers/button.c ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/button.h + $(CC) -c $(CFLAGS) $< -o $@ + +display.o: ../../drivers/display.c ../../drivers/avr/system.h ../../drivers/display.h ../../drivers/ledmat.h + $(CC) -c $(CFLAGS) $< -o $@ + +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 $@ + +tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display.h ../../utils/font.h ../../utils/tinygl.h + $(CC) -c $(CFLAGS) $< -o $@ + + + +# Link: create ELF output file from object files. +stopwatch1.out: stopwatch1.o pio.o system.o timer.o button.o display.o ledmat.o font.o task.o tinygl.o + $(CC) $(CFLAGS) $^ -o $@ -lm + $(SIZE) $@ + + +# Target: clean project. +.PHONY: clean +clean: + -$(DEL) *.o *.out *.hex + + +# Target: program project. +.PHONY: program +program: stopwatch1.out + $(OBJCOPY) -O ihex stopwatch1.out stopwatch1.hex + dfu-programmer atmega32u2 erase; dfu-programmer atmega32u2 flash stopwatch1.hex; dfu-programmer atmega32u2 start + + diff --git a/apps/stopwatch1/Makefile.test b/apps/stopwatch1/Makefile.test new file mode 100644 index 0000000..d9f5932 --- /dev/null +++ b/apps/stopwatch1/Makefile.test @@ -0,0 +1,64 @@ +# File: Makefile +# Author: M. P. Hayes, UCECE +# Date: 11 Sep 2010 +# Descr: Makefile for stopwatch1 + +CC = gcc +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../utils + +DEL = rm + + +# Default target. +all: stopwatch1 + + +# Compile: create object files from C source files. +stopwatch1-test.o: stopwatch1.c ../../drivers/button.h ../../drivers/display.h ../../drivers/test/system.h ../../drivers/test/timer.h ../../fonts/font3x5_1.h ../../utils/font.h ../../utils/task.h ../../utils/tinygl.h + $(CC) -c $(CFLAGS) $< -o $@ + +button-test.o: ../../drivers/button.c ../../drivers/button.h ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h + $(CC) -c $(CFLAGS) $< -o $@ + +display-test.o: ../../drivers/display.c ../../drivers/display.h ../../drivers/ledmat.h ../../drivers/test/system.h + $(CC) -c $(CFLAGS) $< -o $@ + +ledmat-test.o: ../../drivers/ledmat.c ../../drivers/ledmat.h ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.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 $@ + +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 $@ + +tinygl-test.o: ../../utils/tinygl.c ../../drivers/display.h ../../drivers/test/system.h ../../utils/font.h ../../utils/tinygl.h + $(CC) -c $(CFLAGS) $< -o $@ + + + + +# Link: create executable file from object files. +stopwatch1: stopwatch1-test.o button-test.o display-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) stopwatch1 stopwatch1-test.o button-test.o display-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/stopwatch1/doc/Makefile b/apps/stopwatch1/doc/Makefile new file mode 100644 index 0000000..21270fa --- /dev/null +++ b/apps/stopwatch1/doc/Makefile @@ -0,0 +1,42 @@ +# File: Makefile +# Author: M. P. Hayes, UCECE +# Date: 11 Sep 2010 +# Descr: Makefile for stopwatch1 docs + +DEL = rm + +all: file_dependencies.pdf module_dependencies.pdf makefile_dependencies.pdf build_dependencies.pdf callgraph.pdf + +file_dependencies.pdf: files.d + ../../../etc/graphdeps.py $< --out $@ + +module_dependencies.pdf: modules.d + ../../../etc/graphdeps.py $< --modules --out $@ + +makefile_dependencies.pdf: ../Makefile + ../../../etc/graphdeps.py $< --out $@ + +build_dependencies.pdf: ../Makefile + ../../../etc/graphdeps.py $< --out $@ --showops + +callgraph.pdf: callgraph.d + ../../../etc/graphdeps.py --calls --modules $< --out $@ --showops + + +files.d: ../Makefile + (cd ..; ../../etc/makemake.py --relpath --files . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/files.d) + + +modules.d: ../Makefile + (cd ..; ../../etc/makemake.py --relpath --modules . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system > doc/modules.d) + + +callgraph.d: ../Makefile + (cd ..; ../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --calls . . ../../drivers ../../drivers/avr ../../utils ../../extra --exclude system.h > doc/callgraph.d) + + +# Clean: delete derived files. +.PHONY: clean +clean: + -$(DEL) *.d *.pdf + diff --git a/apps/stopwatch1/doc/README b/apps/stopwatch1/doc/README new file mode 100644 index 0000000..39a9712 --- /dev/null +++ b/apps/stopwatch1/doc/README @@ -0,0 +1,16 @@ +Running make in this directory will generate a number of PDF graphs. +In the callgraph, the arrows means "calls". In the dependency graphs, +the arrows means "requires" (or "depends upon"). + +callgraph.pdf This shows the callgraph, i.e., what functions each + function in the program calls. +module_dependencies.pdf This shows the dependencies between the modules. +file_dependencies.pdf This shows the dependencies between the files. +makefile_dependencies.pdf This shows the dependencies required by make when + building the program. +build_dependencies.pdf This is like makefile_dependencies.pdf but shows + the operations performed to generate the new file. + +callgraph.d This shows the callgraph in text format. +files.d This shows the file dependencies in text format. +modules.d This shows the module dependencies in text format. diff --git a/apps/stopwatch1/stopwatch1.c b/apps/stopwatch1/stopwatch1.c new file mode 100644 index 0000000..3bf8e9d --- /dev/null +++ b/apps/stopwatch1/stopwatch1.c @@ -0,0 +1,99 @@ +/** @file stopwatch1.c + @author M.P. Hayes + @date 22 Sep 2011 +*/ + +#include "system.h" +#include "button.h" +#include "task.h" +#include "tinygl.h" +#include "../fonts/font3x5_1_r.h" + + +/* Define polling rates in Hz. */ +#define BUTTON_TASK_RATE 100 + +#define DISPLAY_TASK_RATE 250 + +#define TIMER_TASK_RATE 100 + + +static bool run; + + +static void button_task_init (void) +{ + button_init (); +} + + +static void button_task (__unused__ void *data) +{ + button_update (); + + if (button_push_event_p (BUTTON1)) + { + run = !run; + } +} + + +static void display_task_init (void) +{ + tinygl_init (DISPLAY_TASK_RATE); + tinygl_font_set (&font3x5_1_r); + tinygl_text_mode_set (TINYGL_TEXT_MODE_STEP); +} + + +static void display_task (__unused__ void *data) +{ + tinygl_update (); +} + + +static void timer_task_init (void) +{ + tinygl_draw_string ("00", tinygl_point (0, 0)); +} + + +static void timer_task (__unused__ void *data) +{ + static uint16_t time; + char str[3]; + + if (!run) + { + time = 0; + return; + } + + str[0] = ((time / 10) % 10) + '0'; + str[1] = (time % 10) + '0'; + str[2] = 0; + + tinygl_draw_string (str, tinygl_point (0, 0)); + + time++; +} + + +int main (void) +{ + task_t tasks[] = + { + {.func = display_task, .period = TASK_RATE / DISPLAY_TASK_RATE}, + {.func = button_task, .period = TASK_RATE / BUTTON_TASK_RATE}, + {.func = timer_task, .period = TASK_RATE / TIMER_TASK_RATE}, + }; + + system_init (); + + display_task_init (); + button_task_init (); + timer_task_init (); + + task_schedule (tasks, ARRAY_SIZE (tasks)); + return 0; +}