From 58043570caf636f1275e7b6f98079cd5dd6a2c01 Mon Sep 17 00:00:00 2001 From: Michael Hayes Date: Thu, 26 Sep 2013 22:21:22 +1200 Subject: [PATCH] Add pulsate1 to show PWM control of display luminance --- apps/pulsate1/Makefile | 74 ++++++++++++++++++++++++++++++ apps/pulsate1/Makefile.test | 64 ++++++++++++++++++++++++++ apps/pulsate1/doc/Makefile | 45 +++++++++++++++++++ apps/pulsate1/doc/README | 16 +++++++ apps/pulsate1/pulsate1.c | 90 +++++++++++++++++++++++++++++++++++++ 5 files changed, 289 insertions(+) create mode 100644 apps/pulsate1/Makefile create mode 100644 apps/pulsate1/Makefile.test create mode 100644 apps/pulsate1/doc/Makefile create mode 100644 apps/pulsate1/doc/README create mode 100644 apps/pulsate1/pulsate1.c 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; +}