diff --git a/apps/ir_spam1/Makefile b/apps/ir_spam1/Makefile index f751647..acf5cac 100644 --- a/apps/ir_spam1/Makefile +++ b/apps/ir_spam1/Makefile @@ -5,7 +5,7 @@ # Definitions. CC = avr-gcc -CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../utils +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../fonts -I../../drivers -I../../utils OBJCOPY = avr-objcopy SIZE = avr-size DEL = rm @@ -16,7 +16,7 @@ all: ir_spam1.out # Compile: create object files from C source files. -ir_spam1.o: ir_spam1.c ../../drivers/avr/ir_uart.h ../../drivers/avr/system.h ../../utils/pacer.h +ir_spam1.o: ir_spam1.c ../../drivers/avr/ir_uart.h ../../drivers/avr/system.h ../../drivers/display.h ../../fonts/font5x7_1.h ../../utils/font.h ../../utils/pacer.h ../../utils/tinygl.h $(CC) -c $(CFLAGS) $< -o $@ ir_uart.o: ../../drivers/avr/ir_uart.c ../../drivers/avr/ir_uart.h ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/avr/timer0.h ../../drivers/avr/usart1.h @@ -40,14 +40,26 @@ timer0.o: ../../drivers/avr/timer0.c ../../drivers/avr/bits.h ../../drivers/avr/ usart1.o: ../../drivers/avr/usart1.c ../../drivers/avr/system.h ../../drivers/avr/usart1.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 $@ + pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.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 output file (executable) from object files. -ir_spam1.out: ir_spam1.o ir_uart.o pio.o prescale.o system.o timer.o timer0.o usart1.o pacer.o +ir_spam1.out: ir_spam1.o ir_uart.o pio.o prescale.o system.o timer.o timer0.o usart1.o display.o ledmat.o font.o pacer.o tinygl.o $(CC) $(CFLAGS) $^ -o $@ -lm $(SIZE) $@ diff --git a/apps/ir_spam1/Makefile.test b/apps/ir_spam1/Makefile.test index 772517a..fc7ecd7 100644 --- a/apps/ir_spam1/Makefile.test +++ b/apps/ir_spam1/Makefile.test @@ -4,7 +4,7 @@ # Descr: Makefile for ir_spam1 CC = gcc -CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../utils +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../utils DEL = rm @@ -14,7 +14,13 @@ all: ir_spam1 # Compile: create object files from C source files. -ir_spam1-test.o: ir_spam1.c ../../drivers/test/ir_uart.h ../../drivers/test/system.h ../../utils/pacer.h +ir_spam1-test.o: ir_spam1.c ../../drivers/display.h ../../drivers/test/ir_uart.h ../../drivers/test/system.h ../../fonts/font5x7_1.h ../../utils/font.h ../../utils/pacer.h ../../utils/tinygl.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 $@ ir_uart-test.o: ../../drivers/test/ir_uart.c ../../drivers/test/ir_uart.h ../../drivers/test/system.h @@ -32,21 +38,27 @@ 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 $@ +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. -ir_spam1: ir_spam1-test.o ir_uart-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o +ir_spam1: ir_spam1-test.o display-test.o ledmat-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_spam1 ir_spam1-test.o ir_uart-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o + -$(DEL) ir_spam1 ir_spam1-test.o display-test.o ledmat-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_spam1/ir_spam1.c b/apps/ir_spam1/ir_spam1.c index f61f497..1f8fe4e 100644 --- a/apps/ir_spam1/ir_spam1.c +++ b/apps/ir_spam1/ir_spam1.c @@ -3,21 +3,27 @@ @date 24 September 2013 @brief Repeatedly send message over IR. */ - #include "system.h" #include "pacer.h" #include "ir_uart.h" +#include "tinygl.h" +#include "../fonts/font5x7_1.h" /* Define polling rate in Hz. */ -#define LOOP_RATE 20 +#define LOOP_RATE 300 int main (void) { - int count = 5; - + uint16_t ticks = 0; + system_init (); + tinygl_init (LOOP_RATE); + tinygl_font_set (&font5x7_1); + + tinygl_draw_char ('*', tinygl_point (0, 0)); + ir_uart_init (); pacer_init (LOOP_RATE); @@ -27,8 +33,15 @@ int main (void) { /* Wait for next tick. */ pacer_wait (); - - ir_uart_putc ('A'); + + ticks++; + if (ticks >= 10) + { + ticks = 0; + ir_uart_putc ('2'); + } + + tinygl_update (); } return 0; diff --git a/apps/ir_uart_test4/Makefile b/apps/ir_uart_test4/Makefile new file mode 100644 index 0000000..d29b503 --- /dev/null +++ b/apps/ir_uart_test4/Makefile @@ -0,0 +1,89 @@ +# File: Makefile +# Author: M. P. Hayes, UCECE +# Date: 12 Sep 2010 +# Descr: Makefile for ir_uart_test4 + +# Definitions. +CC = avr-gcc +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../fonts -I../../drivers -I../../utils +OBJCOPY = avr-objcopy +SIZE = avr-size +DEL = rm + + +# Default target. +all: ir_uart_test4.out + + +# Compile: create object files from C source files. +ir_uart_test4.o: ir_uart_test4.c ../../drivers/avr/ir_uart.h ../../drivers/avr/system.h ../../drivers/display.h ../../drivers/navswitch.h ../../fonts/font3x5_1.h ../../utils/font.h ../../utils/pacer.h ../../utils/tinygl.h ../../utils/uint8toa.h + $(CC) -c $(CFLAGS) $< -o $@ + +ir_uart.o: ../../drivers/avr/ir_uart.c ../../drivers/avr/ir_uart.h ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/avr/timer0.h ../../drivers/avr/usart1.h + $(CC) -c $(CFLAGS) $< -o $@ + +pio.o: ../../drivers/avr/pio.c ../../drivers/avr/pio.h ../../drivers/avr/system.h + $(CC) -c $(CFLAGS) $< -o $@ + +prescale.o: ../../drivers/avr/prescale.c ../../drivers/avr/prescale.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 $@ + +timer0.o: ../../drivers/avr/timer0.c ../../drivers/avr/bits.h ../../drivers/avr/prescale.h ../../drivers/avr/system.h ../../drivers/avr/timer0.h + $(CC) -c $(CFLAGS) $< -o $@ + +usart1.o: ../../drivers/avr/usart1.c ../../drivers/avr/system.h ../../drivers/avr/usart1.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 $@ + +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 $@ + +tinygl.o: ../../utils/tinygl.c ../../drivers/avr/system.h ../../drivers/display.h ../../utils/font.h ../../utils/tinygl.h + $(CC) -c $(CFLAGS) $< -o $@ + +uint8toa.o: ../../utils/uint8toa.c ../../drivers/avr/system.h + $(CC) -c $(CFLAGS) $< -o $@ + + + + +# Link: create output file (executable) from object files. +ir_uart_test4.out: ir_uart_test4.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 uint8toa.o + $(CC) $(CFLAGS) $^ -o $@ -lm + $(SIZE) $@ + + +# Create hex file for programming from executable file. +ir_uart_test4.hex: ir_uart_test4.out + $(OBJCOPY) -O ihex ir_uart_test4.out ir_uart_test4.hex + + +# Target: clean project. +.PHONY: clean +clean: + -$(DEL) *.o *.out *.hex + + +# Target: program project. +.PHONY: program +program: ir_uart_test4.hex + dfu-programmer atmega32u2 erase; dfu-programmer atmega32u2 flash ir_uart_test4.hex; dfu-programmer atmega32u2 start + + diff --git a/apps/ir_uart_test4/Makefile.test b/apps/ir_uart_test4/Makefile.test new file mode 100644 index 0000000..5f03b55 --- /dev/null +++ b/apps/ir_uart_test4/Makefile.test @@ -0,0 +1,70 @@ +# File: Makefile +# Author: M. P. Hayes, UCECE +# Date: 11 Sep 2010 +# Descr: Makefile for ir_uart_test4 + +CC = gcc +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../utils + +DEL = rm + + +# Default target. +all: ir_uart_test4 + + +# Compile: create object files from C source files. +ir_uart_test4-test.o: ir_uart_test4.c ../../drivers/display.h ../../drivers/navswitch.h ../../drivers/test/ir_uart.h ../../drivers/test/system.h ../../fonts/font3x5_1.h ../../utils/font.h ../../utils/pacer.h ../../utils/tinygl.h ../../utils/uint8toa.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 $@ + +navswitch-test.o: ../../drivers/navswitch.c ../../drivers/navswitch.h ../../drivers/test/avrtest.h ../../drivers/test/delay.h ../../drivers/test/pio.h ../../drivers/test/system.h + $(CC) -c $(CFLAGS) $< -o $@ + +ir_uart-test.o: ../../drivers/test/ir_uart.c ../../drivers/test/ir_uart.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 $@ + +pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.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 $@ + +uint8toa-test.o: ../../utils/uint8toa.c ../../drivers/test/system.h + $(CC) -c $(CFLAGS) $< -o $@ + + + + +# Link: create executable file from object files. +ir_uart_test4: ir_uart_test4-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 uint8toa-test.o + $(CC) $(CFLAGS) $^ -o $@ -lrt + + +# Clean: delete derived files. +.PHONY: clean +clean: + -$(DEL) ir_uart_test4 ir_uart_test4-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 uint8toa-test.o + + + diff --git a/apps/ir_uart_test4/doc/Makefile b/apps/ir_uart_test4/doc/Makefile new file mode 100644 index 0000000..195c459 --- /dev/null +++ b/apps/ir_uart_test4/doc/Makefile @@ -0,0 +1,45 @@ +# File: Makefile +# Author: M. P. Hayes, UCECE +# Date: 11 Sep 2010 +# Descr: Makefile for ir_uart_test3 docs + +# The scripts used to make the graphs require the program dot; this +# is part of the graphviz package. + +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 --rotate --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/ir_uart_test4/doc/README b/apps/ir_uart_test4/doc/README new file mode 100644 index 0000000..39a9712 --- /dev/null +++ b/apps/ir_uart_test4/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/ir_uart_test4/ir_uart_test4.c b/apps/ir_uart_test4/ir_uart_test4.c new file mode 100644 index 0000000..83e8123 --- /dev/null +++ b/apps/ir_uart_test4/ir_uart_test4.c @@ -0,0 +1,98 @@ +/** @file ir_uart_test4.c + @author M. P. Hayes, UCECE + @date 26 September 2013 + @brief Test program for IR serial communications. This transmits + continuously while navswitch is pushed and uses alternate codes + for separate pushes. +*/ + +#include "system.h" +#include "navswitch.h" +#include "tinygl.h" +#include "pacer.h" +#include "uint8toa.h" +#include "ir_uart.h" +#include "../fonts/font5x7_1.h" + + +/* Define polling rate in Hz. */ +#define LOOP_RATE 300 + +#define SWITCH_POLL_RATE 20 + + +int main (void) +{ + uint16_t tick = 0; + uint8_t altcode = 0; + + system_init (); + tinygl_init (LOOP_RATE); + tinygl_font_set (&font5x7_1); + + navswitch_init (); + ir_uart_init (); + + pacer_init (LOOP_RATE); + + tinygl_draw_char ('*', tinygl_point (0, 0)); + + /* Paced loop. */ + while (1) + { + /* Wait for next tick. */ + pacer_wait (); + + /* Refresh display. */ + tinygl_update (); + + /* Note, if messages come in too fast, say due to IR + inteference from fluorescent lights, then the display will + not keep up and will appear to freeze. */ + if (ir_uart_read_ready_p ()) + { + uint8_t data; + + data = ir_uart_getc (); + + /* Ignore any dodgy received characters. */ + if (data >= 'A' && data <= 'Z') + tinygl_draw_char (data, tinygl_point (0, 0)); + } + + tick++; + if (tick > LOOP_RATE / SWITCH_POLL_RATE) + { + tick = 0; + + navswitch_update (); + + /* On each button press event toggle the code. */ + if (navswitch_push_event_p (NAVSWITCH_NORTH) + || navswitch_push_event_p (NAVSWITCH_EAST) + || navswitch_push_event_p (NAVSWITCH_SOUTH) + || navswitch_push_event_p (NAVSWITCH_WEST) + || navswitch_push_event_p (NAVSWITCH_PUSH)) + altcode = !altcode; + + /* While a button is pressed, continuously send + its code. */ + if (navswitch_down_p (NAVSWITCH_NORTH)) + ir_uart_putc (altcode ? 'O' : 'N'); + + if (navswitch_down_p (NAVSWITCH_EAST)) + ir_uart_putc (altcode ? 'F' : 'E'); + + if (navswitch_down_p (NAVSWITCH_SOUTH)) + ir_uart_putc (altcode ? 'T' : 'S'); + + if (navswitch_down_p (NAVSWITCH_WEST)) + ir_uart_putc (altcode ? 'X' : 'W'); + + if (navswitch_down_p (NAVSWITCH_PUSH)) + ir_uart_putc (altcode ? 'Q' : 'P'); + } + } + + return 0; +} diff --git a/apps/pulsate1/Makefile b/apps/pulsate1/Makefile new file mode 100644 index 0000000..3dbe9ae --- /dev/null +++ b/apps/pulsate1/Makefile @@ -0,0 +1,74 @@ +# File: Makefile +# Author: M. P. Hayes, UCECE +# Date: 12 Sep 2010 +# Descr: Makefile for pulsate1 + +# Definitions. +CC = avr-gcc +CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../drivers -I../../utils +OBJCOPY = avr-objcopy +SIZE = avr-size +DEL = rm + + +# Default target. +all: pulsate1.out + + +# Compile: create object files from C source files. +pulsate1.o: pulsate1.c ../../drivers/avr/system.h ../../drivers/display.h ../../drivers/led.h ../../utils/font.h ../../utils/pacer.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 $@ + +display.o: ../../drivers/display.c ../../drivers/avr/system.h ../../drivers/display.h ../../drivers/ledmat.h + $(CC) -c $(CFLAGS) $< -o $@ + +led.o: ../../drivers/led.c ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/led.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 $@ + +pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h ../../utils/pacer.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 output file (executable) from object files. +pulsate1.out: pulsate1.o pio.o system.o timer.o display.o led.o ledmat.o font.o pacer.o tinygl.o + $(CC) $(CFLAGS) $^ -o $@ -lm + $(SIZE) $@ + + +# Create hex file for programming from executable file. +pulsate1.hex: pulsate1.out + $(OBJCOPY) -O ihex pulsate1.out pulsate1.hex + + +# Target: clean project. +.PHONY: clean +clean: + -$(DEL) *.o *.out *.hex + + +# Target: program project. +.PHONY: program +program: pulsate1.hex + dfu-programmer atmega32u2 erase; dfu-programmer atmega32u2 flash pulsate1.hex; dfu-programmer atmega32u2 start + + diff --git a/apps/pulsate1/Makefile.test b/apps/pulsate1/Makefile.test new file mode 100644 index 0000000..b733611 --- /dev/null +++ b/apps/pulsate1/Makefile.test @@ -0,0 +1,64 @@ +# File: Makefile +# Author: M. P. Hayes, UCECE +# Date: 11 Sep 2010 +# Descr: Makefile for pulsate1 + +CC = gcc +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../utils + +DEL = rm + + +# Default target. +all: pulsate1 + + +# Compile: create object files from C source files. +pulsate1-test.o: pulsate1.c ../../drivers/display.h ../../drivers/led.h ../../drivers/test/system.h ../../utils/font.h ../../utils/pacer.h ../../utils/tinygl.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 $@ + +led-test.o: ../../drivers/led.c ../../drivers/led.h ../../drivers/test/avrtest.h ../../drivers/test/pio.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 $@ + +pacer-test.o: ../../utils/pacer.c ../../drivers/test/system.h ../../drivers/test/timer.h ../../utils/pacer.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. +pulsate1: pulsate1-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 pacer-test.o tinygl-test.o + $(CC) $(CFLAGS) $^ -o $@ -lrt + + +# Clean: delete derived files. +.PHONY: clean +clean: + -$(DEL) pulsate1 pulsate1-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 pacer-test.o tinygl-test.o + + + diff --git a/apps/pulsate1/doc/Makefile b/apps/pulsate1/doc/Makefile new file mode 100644 index 0000000..c93d18c --- /dev/null +++ b/apps/pulsate1/doc/Makefile @@ -0,0 +1,45 @@ +# File: Makefile +# Author: M. P. Hayes, UCECE +# Date: 11 Sep 2010 +# Descr: Makefile for led5 docs + +# The scripts used to make the graphs require the program dot; this +# is part of the graphviz package. + +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 --rotate --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/pulsate1/doc/README b/apps/pulsate1/doc/README new file mode 100644 index 0000000..39a9712 --- /dev/null +++ b/apps/pulsate1/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/pulsate1/pulsate1.c b/apps/pulsate1/pulsate1.c new file mode 100644 index 0000000..544a0db --- /dev/null +++ b/apps/pulsate1/pulsate1.c @@ -0,0 +1,90 @@ +/** @file pulsate1.c + @author M.P. Hayes + @date 25 Sep 2013 + @brief Example of controlling pixel brightness with PWM. +*/ + +#include +#include "system.h" +#include "pacer.h" +#include "led.h" +#include "tinygl.h" + +/* This controls the range of luminance. A bigger number gives more + dynamic range but requires a faster update rate. */ +#define LUMINANCE_STEPS 25 + +/* This needs to be fast enough to prevent the eye noticing flicker. + A lower value (say 5) is useful for flashing pixels. */ +#define PWM_RATE 40 + +/* This is the rate (Hz) of luminance changes. */ +#define PULSATE_RATE 10 + +#define UPDATE_RATE (LUMINANCE_STEPS * PWM_RATE) + +#define LOOP_RATE (TINYGL_WIDTH * UPDATE_RATE) + +int main (void) +{ + uint16_t pulsate_tick = 0; + uint8_t pwm_tick = 0; + uint8_t x; + uint8_t y; + uint8_t col; + uint8_t luminance = 0; + /* This controls the luminance levels. The maximum value + of LUMINANCE_STEPS gives 100 percent duty cycle. */ + const uint8_t levels[] = {1, 2, 4, 8, 15, 25, 15, 8, 4, 2, 1}; + + system_init (); + + tinygl_init (LOOP_RATE); + led_init (); + + pacer_init (LOOP_RATE); + + while (1) + { + uint8_t state; + + /* Refresh display. */ + for (col = 0; col < TINYGL_WIDTH; col++) + { + pacer_wait (); + + tinygl_update (); + } + + pulsate_tick++; + if (pulsate_tick >= UPDATE_RATE / PULSATE_RATE) + { + pulsate_tick = 0; + + if (luminance == 0) + luminance = ARRAY_SIZE (levels) - 1; + else + luminance--; + } + + state = levels[luminance] > pwm_tick; + + /* Pulse width modulate pixels to control luminance. */ + for (x = 0; x < TINYGL_WIDTH; x++) + { + for (y = 0; y < TINYGL_HEIGHT; y++) + { + tinygl_draw_point (tinygl_point (x, y), state); + } + } + + led_set (LED1, state); + + pwm_tick++; + if (pwm_tick >= UPDATE_RATE / PWM_RATE) + { + pwm_tick = 0; + } + } + return 0; +}