From 266226379418df640e4c810ebfccb8168ec01e8c Mon Sep 17 00:00:00 2001 From: Michael Hayes Date: Wed, 25 Sep 2013 15:43:39 +1200 Subject: [PATCH 1/5] Tweak comments --- apps/space12/flasher.c | 3 ++- apps/space12/flasher.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/space12/flasher.c b/apps/space12/flasher.c index 2cdebd4..338f964 100644 --- a/apps/space12/flasher.c +++ b/apps/space12/flasher.c @@ -1,7 +1,8 @@ /** @file flasher.c @author M. P. Hayes, UCECE @date 13 March 2005 - @brief + @brief Combined software PWM and flashing module. Use at your peril! + This should be simplified. */ #include "flasher.h" diff --git a/apps/space12/flasher.h b/apps/space12/flasher.h index 4cfd6f8..bc5d08d 100644 --- a/apps/space12/flasher.h +++ b/apps/space12/flasher.h @@ -2,6 +2,7 @@ @author M. P. Hayes, UCECE @date 13 March 2005 @brief Combined software PWM and flashing module. Use at your peril! + This should be simplified. */ #ifndef FLASHER_H #define FLASHER_H @@ -38,7 +39,7 @@ typedef struct /* This is the modulation period. It determines the frequency of a tone or flicker rate of a LED. */ uint8_t mod_period; - /* This is the modulation duty. It determines the luminance of a LED. */ + /* This is the modulation duty. It determines the luminance of an LED. */ uint8_t mod_duty; /* This is the period between the start of two flashes in a sequence. */ uint8_t flasher_period; From a53f82d932b7ae595b673379b3fcedc6eec1e051 Mon Sep 17 00:00:00 2001 From: Michael Hayes Date: Wed, 25 Sep 2013 15:44:00 +1200 Subject: [PATCH 2/5] Add software PWM support and test app --- apps/ledpwm1/Makefile | 65 ++++++++++++++++++++++++++++++++++++++ apps/ledpwm1/Makefile.test | 55 ++++++++++++++++++++++++++++++++ apps/ledpwm1/doc/Makefile | 45 ++++++++++++++++++++++++++ apps/ledpwm1/doc/README | 16 ++++++++++ apps/ledpwm1/ledpwm1.c | 31 ++++++++++++++++++ utils/spwm.c | 48 ++++++++++++++++++++++++++++ utils/spwm.h | 45 ++++++++++++++++++++++++++ 7 files changed, 305 insertions(+) create mode 100644 apps/ledpwm1/Makefile create mode 100644 apps/ledpwm1/Makefile.test create mode 100644 apps/ledpwm1/doc/Makefile create mode 100644 apps/ledpwm1/doc/README create mode 100644 apps/ledpwm1/ledpwm1.c create mode 100644 utils/spwm.c create mode 100644 utils/spwm.h diff --git a/apps/ledpwm1/Makefile b/apps/ledpwm1/Makefile new file mode 100644 index 0000000..948a0b7 --- /dev/null +++ b/apps/ledpwm1/Makefile @@ -0,0 +1,65 @@ +# File: Makefile +# Author: M. P. Hayes, UCECE +# Date: 12 Sep 2010 +# Descr: Makefile for ledpwm1 + +# 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: ledpwm1.out + + +# Compile: create object files from C source files. +ledpwm1.o: ledpwm1.c ../../drivers/avr/system.h ../../drivers/led.h ../../utils/pacer.h ../../utils/spwm.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 $@ + +led.o: ../../drivers/led.c ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/led.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 $@ + +spwm.o: ../../utils/spwm.c ../../drivers/avr/system.h ../../utils/spwm.h + $(CC) -c $(CFLAGS) $< -o $@ + + + + +# Link: create output file (executable) from object files. +ledpwm1.out: ledpwm1.o pio.o system.o timer.o led.o pacer.o spwm.o + $(CC) $(CFLAGS) $^ -o $@ -lm + $(SIZE) $@ + + +# Create hex file for programming from executable file. +ledpwm1.hex: ledpwm1.out + $(OBJCOPY) -O ihex ledpwm1.out ledpwm1.hex + + +# Target: clean project. +.PHONY: clean +clean: + -$(DEL) *.o *.out *.hex + + +# Target: program project. +.PHONY: program +program: ledpwm1.hex + dfu-programmer atmega32u2 erase; dfu-programmer atmega32u2 flash ledpwm1.hex; dfu-programmer atmega32u2 start + + diff --git a/apps/ledpwm1/Makefile.test b/apps/ledpwm1/Makefile.test new file mode 100644 index 0000000..2b7fdbd --- /dev/null +++ b/apps/ledpwm1/Makefile.test @@ -0,0 +1,55 @@ +# File: Makefile +# Author: M. P. Hayes, UCECE +# Date: 11 Sep 2010 +# Descr: Makefile for ledpwm1 + +CC = gcc +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../utils + +DEL = rm + + +# Default target. +all: ledpwm1 + + +# Compile: create object files from C source files. +ledpwm1-test.o: ledpwm1.c ../../drivers/led.h ../../drivers/test/system.h ../../utils/pacer.h ../../utils/spwm.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 $@ + +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 $@ + +spwm-test.o: ../../utils/spwm.c ../../drivers/test/system.h ../../utils/spwm.h + $(CC) -c $(CFLAGS) $< -o $@ + + + + +# Link: create executable file from object files. +ledpwm1: ledpwm1-test.o led-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o spwm-test.o + $(CC) $(CFLAGS) $^ -o $@ -lrt + + +# Clean: delete derived files. +.PHONY: clean +clean: + -$(DEL) ledpwm1 ledpwm1-test.o led-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o pacer-test.o spwm-test.o + + + diff --git a/apps/ledpwm1/doc/Makefile b/apps/ledpwm1/doc/Makefile new file mode 100644 index 0000000..c93d18c --- /dev/null +++ b/apps/ledpwm1/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/ledpwm1/doc/README b/apps/ledpwm1/doc/README new file mode 100644 index 0000000..39a9712 --- /dev/null +++ b/apps/ledpwm1/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/ledpwm1/ledpwm1.c b/apps/ledpwm1/ledpwm1.c new file mode 100644 index 0000000..4588842 --- /dev/null +++ b/apps/ledpwm1/ledpwm1.c @@ -0,0 +1,31 @@ +/** @file ledpwm1.c + @author M.P. Hayes + @date 25 Sep 2013 +*/ + +#include "system.h" +#include "pacer.h" +#include "led.h" +#include "spwm.h" + +#define LOOP_RATE 100 + + +int main (void) +{ + spwm_t spwm1 = {.duty = 50, .period = 100}; + + system_init (); + + led_init (); + + pacer_init (LOOP_RATE); + + while (1) + { + pacer_wait (); + + led_set (LED1, spwm_update (&spwm1)); + } + return 0; +} diff --git a/utils/spwm.c b/utils/spwm.c new file mode 100644 index 0000000..7d99862 --- /dev/null +++ b/utils/spwm.c @@ -0,0 +1,48 @@ +/** @file spwm.c + @author M. P. Hayes, UCECE + @date 25 Sep 2013 + @brief These routines are for software pulse width modulation. They are + useful for modulating the luiminance of an LED or beeping a piezo + tweeter. +*/ +#include "system.h" +#include "spwm.h" + + +/** Set the period. This must be greater than the duty. */ +void +spwm_period_set (spwm_t *spwm, spwm_period_t period) +{ + spwm->period = period; +} + + +/** Set the duty. This must be less than the period. */ +void +spwm_duty_set (spwm_t *spwm, spwm_period_t duty) +{ + spwm->duty = duty; +} + + +/** Return whether spwm output should be high or low. + For example, to control the flashing of a LED use: + + led_set (led, spwm_update (spwm)); */ +bool +spwm_update (spwm_t *spwm) +{ + spwm->count++; + if (spwm->count >= spwm->period) + spwm->count = 0; + + return spwm->count < spwm->duty; +} + + +/* Reset spwm. */ +void +spwm_reset (spwm_t *spwm) +{ + spwm->count = 0; +} diff --git a/utils/spwm.h b/utils/spwm.h new file mode 100644 index 0000000..002873c --- /dev/null +++ b/utils/spwm.h @@ -0,0 +1,45 @@ +/** @file spwm.h + @author M. P. Hayes, UCECE + @date 25 Sep 2013 + @brief These routines are for software pulse width modulation. They are + useful for modulating the luiminance of an LED or beeping a piezo + tweeter. +*/ +#ifndef SPWM_H +#define SPWM_H + +#include "system.h" + + +typedef uint8_t spwm_period_t; + + +/* This structure is defined here so the compiler can allocate enough + memory for it. However, its fields should be treated as + private. */ +typedef struct spwm_struct +{ + spwm_period_t period; + spwm_period_t duty; + spwm_period_t count; +} spwm_t; + + +/** Set the period. This must be greater than the duty. */ +void spwm_period_set (spwm_t *spwm, spwm_period_t period); + + +/** Set the duty. This must be less than the period. */ +void spwm_duty_set (spwm_t *spwm, spwm_period_t duty); + + +/** Return whether spwm output should be high or low. + For example, to control the flashing of a LED use: + + led_set (led, spwm_update (spwm)); */ +bool spwm_update (spwm_t *spwm); + + +/* Reset spwm. */ +void spwm_reset (spwm_t *spwm); +#endif From 9d73b2e79d300d0d2d049cadcb59098b1f42766d Mon Sep 17 00:00:00 2001 From: Michael Hayes Date: Wed, 25 Sep 2013 21:06:59 +1200 Subject: [PATCH 3/5] Add example of using random numbers and controlling pixel brightness with PWM --- apps/stars1/Makefile | 74 ++++++++++++++++++++++++++ apps/stars1/Makefile.test | 64 ++++++++++++++++++++++ apps/stars1/doc/Makefile | 45 ++++++++++++++++ apps/stars1/doc/README | 16 ++++++ apps/stars1/stars1.c | 109 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 308 insertions(+) create mode 100644 apps/stars1/Makefile create mode 100644 apps/stars1/Makefile.test create mode 100644 apps/stars1/doc/Makefile create mode 100644 apps/stars1/doc/README create mode 100644 apps/stars1/stars1.c diff --git a/apps/stars1/Makefile b/apps/stars1/Makefile new file mode 100644 index 0000000..dace03a --- /dev/null +++ b/apps/stars1/Makefile @@ -0,0 +1,74 @@ +# File: Makefile +# Author: M. P. Hayes, UCECE +# Date: 12 Sep 2010 +# Descr: Makefile for stars1 + +# 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: stars1.out + + +# Compile: create object files from C source files. +stars1.o: stars1.c ../../drivers/avr/system.h ../../drivers/display.h ../../utils/font.h ../../utils/pacer.h ../../utils/spwm.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 $@ + +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 $@ + +spwm.o: ../../utils/spwm.c ../../drivers/avr/system.h ../../utils/spwm.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. +stars1.out: stars1.o pio.o system.o timer.o display.o ledmat.o font.o pacer.o spwm.o tinygl.o + $(CC) $(CFLAGS) $^ -o $@ -lm + $(SIZE) $@ + + +# Create hex file for programming from executable file. +stars1.hex: stars1.out + $(OBJCOPY) -O ihex stars1.out stars1.hex + + +# Target: clean project. +.PHONY: clean +clean: + -$(DEL) *.o *.out *.hex + + +# Target: program project. +.PHONY: program +program: stars1.hex + dfu-programmer atmega32u2 erase; dfu-programmer atmega32u2 flash stars1.hex; dfu-programmer atmega32u2 start + + diff --git a/apps/stars1/Makefile.test b/apps/stars1/Makefile.test new file mode 100644 index 0000000..800101b --- /dev/null +++ b/apps/stars1/Makefile.test @@ -0,0 +1,64 @@ +# File: Makefile +# Author: M. P. Hayes, UCECE +# Date: 11 Sep 2010 +# Descr: Makefile for stars1 + +CC = gcc +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../utils + +DEL = rm + + +# Default target. +all: stars1 + + +# Compile: create object files from C source files. +stars1-test.o: stars1.c ../../drivers/display.h ../../drivers/test/system.h ../../utils/font.h ../../utils/pacer.h ../../utils/spwm.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 $@ + +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 $@ + +spwm-test.o: ../../utils/spwm.c ../../drivers/test/system.h ../../utils/spwm.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. +stars1: stars1-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 spwm-test.o tinygl-test.o + $(CC) $(CFLAGS) $^ -o $@ -lrt + + +# Clean: delete derived files. +.PHONY: clean +clean: + -$(DEL) stars1 stars1-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 spwm-test.o tinygl-test.o + + + diff --git a/apps/stars1/doc/Makefile b/apps/stars1/doc/Makefile new file mode 100644 index 0000000..c93d18c --- /dev/null +++ b/apps/stars1/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/stars1/doc/README b/apps/stars1/doc/README new file mode 100644 index 0000000..39a9712 --- /dev/null +++ b/apps/stars1/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/stars1/stars1.c b/apps/stars1/stars1.c new file mode 100644 index 0000000..5bf9f4f --- /dev/null +++ b/apps/stars1/stars1.c @@ -0,0 +1,109 @@ +/** @file stars1.c + @author M.P. Hayes + @date 25 Sep 2013 +*/ + +#include +#include "system.h" +#include "pacer.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. */ +#define PWM_RATE 40 + +/* This is the rate (Hz) that new stars are created. */ +#define CREATE_RATE 2 + +/* This is the rate (Hz) of luminance changes. */ +#define FADE_RATE 2 + +#define UPDATE_RATE (LUMINANCE_STEPS * PWM_RATE) + +#define LOOP_RATE (TINYGL_WIDTH * UPDATE_RATE) + +int main (void) +{ + uint16_t fade_tick = 0; + uint16_t create_tick = 0; + uint8_t pwm_tick = 0; + uint8_t x; + uint8_t y; + uint8_t col; + /* This stores the current luminance level for each pixel. */ + uint8_t display[TINYGL_HEIGHT][TINYGL_WIDTH] = {0, }; + /* This controls the luminance levels. The maximum value + of LUMINANCE_STEPS gives 100 percent duty cycle. + The first value must be zero to turn star off when it dies. */ + const uint8_t levels[] = {0, 1, 2, 4, 8, 15, 25, 15, 8, 4, 2, 1}; + + system_init (); + + tinygl_init (LOOP_RATE); + + pacer_init (LOOP_RATE); + + while (1) + { + /* Refresh display. */ + for (col = 0; col < TINYGL_WIDTH; col++) + { + pacer_wait (); + + tinygl_update (); + } + + + fade_tick++; + if (fade_tick >= UPDATE_RATE / FADE_RATE) + { + fade_tick = 0; + + /* Change luminance of stars until they die. */ + for (x = 0; x < TINYGL_WIDTH; x++) + { + for (y = 0; y < TINYGL_HEIGHT; y++) + { + if (display[y][x] > 0) + display[y][x]--; + } + } + } + + create_tick++; + if (create_tick >= UPDATE_RATE / CREATE_RATE) + { + create_tick = 0; + + /* Create new star, but not over a live one. */ + do + { + x = rand () % TINYGL_WIDTH; + y = rand () % TINYGL_HEIGHT; + } while (display[y][x]); + + display[y][x] = ARRAY_SIZE (levels) - 1; + } + + + /* 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), + levels[display[y][x]] > pwm_tick); + } + } + + pwm_tick++; + if (pwm_tick >= UPDATE_RATE / PWM_RATE) + { + pwm_tick = 0; + } + } + return 0; +} From 4839a0c46bc81f4be0861060edc2d689057b1263 Mon Sep 17 00:00:00 2001 From: Michael Hayes Date: Wed, 25 Sep 2013 21:23:29 +1200 Subject: [PATCH 4/5] Add example showing pseudorandom sequence --- apps/random1/Makefile | 74 ++++++++++++++++++++++++++++++++++++++ apps/random1/Makefile.test | 64 +++++++++++++++++++++++++++++++++ apps/random1/doc/Makefile | 45 +++++++++++++++++++++++ apps/random1/doc/README | 16 +++++++++ apps/random1/random1.c | 59 ++++++++++++++++++++++++++++++ apps/stars1/stars1.c | 7 ++-- 6 files changed, 263 insertions(+), 2 deletions(-) create mode 100644 apps/random1/Makefile create mode 100644 apps/random1/Makefile.test create mode 100644 apps/random1/doc/Makefile create mode 100644 apps/random1/doc/README create mode 100644 apps/random1/random1.c diff --git a/apps/random1/Makefile b/apps/random1/Makefile new file mode 100644 index 0000000..bdea93b --- /dev/null +++ b/apps/random1/Makefile @@ -0,0 +1,74 @@ +# File: Makefile +# Author: M. P. Hayes, UCECE +# Date: 12 Sep 2010 +# Descr: Makefile for random1 + +# 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: random1.out + + +# Compile: create object files from C source files. +random1.o: random1.c ../../drivers/avr/system.h ../../drivers/display.h ../../drivers/navswitch.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 $@ + +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 $@ + + + + +# Link: create output file (executable) from object files. +random1.out: random1.o pio.o system.o timer.o display.o ledmat.o navswitch.o font.o pacer.o tinygl.o + $(CC) $(CFLAGS) $^ -o $@ -lm + $(SIZE) $@ + + +# Create hex file for programming from executable file. +random1.hex: random1.out + $(OBJCOPY) -O ihex random1.out random1.hex + + +# Target: clean project. +.PHONY: clean +clean: + -$(DEL) *.o *.out *.hex + + +# Target: program project. +.PHONY: program +program: random1.hex + dfu-programmer atmega32u2 erase; dfu-programmer atmega32u2 flash random1.hex; dfu-programmer atmega32u2 start + + diff --git a/apps/random1/Makefile.test b/apps/random1/Makefile.test new file mode 100644 index 0000000..c64921a --- /dev/null +++ b/apps/random1/Makefile.test @@ -0,0 +1,64 @@ +# File: Makefile +# Author: M. P. Hayes, UCECE +# Date: 11 Sep 2010 +# Descr: Makefile for random1 + +CC = gcc +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../utils + +DEL = rm + + +# Default target. +all: random1 + + +# Compile: create object files from C source files. +random1-test.o: random1.c ../../drivers/display.h ../../drivers/navswitch.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 $@ + +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 $@ + +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. +random1: random1-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) random1 random1-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/random1/doc/Makefile b/apps/random1/doc/Makefile new file mode 100644 index 0000000..c93d18c --- /dev/null +++ b/apps/random1/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/random1/doc/README b/apps/random1/doc/README new file mode 100644 index 0000000..39a9712 --- /dev/null +++ b/apps/random1/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/random1/random1.c b/apps/random1/random1.c new file mode 100644 index 0000000..3de3237 --- /dev/null +++ b/apps/random1/random1.c @@ -0,0 +1,59 @@ +/** @file random1.c + @author M.P. Hayes + @date 25 Sep 2013 + @brief Example to show how pseudorandom numbers follow the same + sequence. +*/ + +#include +#include "system.h" +#include "pacer.h" +#include "tinygl.h" +#include "navswitch.h" +#include "../fonts/font5x7_1.h" + +#define LOOP_RATE 10000 + +#define NAVSWITCH_RATE 20 + + +int main (void) +{ + uint16_t navswitch_tick = 0; + + system_init (); + + navswitch_init (); + + tinygl_init (LOOP_RATE); + tinygl_font_set (&font5x7_1); + + pacer_init (LOOP_RATE); + + tinygl_draw_char ('*', tinygl_point (0, 0)); + + while (1) + { + pacer_wait (); + + tinygl_update (); + + navswitch_tick++; + if (navswitch_tick >= LOOP_RATE / NAVSWITCH_RATE) + { + navswitch_tick = 0; + + navswitch_update (); + + if (navswitch_push_event_p (NAVSWITCH_PUSH)) + { + char c; + + c = (rand () % 26) + 'A'; + + tinygl_draw_char (c, tinygl_point (0, 0)); + } + } + } + return 0; +} diff --git a/apps/stars1/stars1.c b/apps/stars1/stars1.c index 5bf9f4f..b6ea488 100644 --- a/apps/stars1/stars1.c +++ b/apps/stars1/stars1.c @@ -1,6 +1,9 @@ /** @file stars1.c @author M.P. Hayes @date 25 Sep 2013 + @brief Example of using pseudorandom numbers and controlling pixel + brightness with PWM. Note, pseudorandom numbers follow the same + sequence. */ #include @@ -12,7 +15,8 @@ but requires a faster update rate. */ #define LUMINANCE_STEPS 25 -/* This needs to be fast enough to prevent the eye noticing flicker. */ +/* 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) that new stars are created. */ @@ -56,7 +60,6 @@ int main (void) tinygl_update (); } - fade_tick++; if (fade_tick >= UPDATE_RATE / FADE_RATE) { From 90d477a6514ebea853515f319025c161da7d0a7c Mon Sep 17 00:00:00 2001 From: Michael Hayes Date: Wed, 25 Sep 2013 21:28:28 +1200 Subject: [PATCH 5/5] Add example to show how pseudorandom sequence can be changed --- apps/random2/Makefile | 74 ++++++++++++++++++++++++++++++++++++++ apps/random2/Makefile.test | 64 +++++++++++++++++++++++++++++++++ apps/random2/doc/Makefile | 45 +++++++++++++++++++++++ apps/random2/doc/README | 16 +++++++++ apps/random2/random2.c | 66 ++++++++++++++++++++++++++++++++++ 5 files changed, 265 insertions(+) create mode 100644 apps/random2/Makefile create mode 100644 apps/random2/Makefile.test create mode 100644 apps/random2/doc/Makefile create mode 100644 apps/random2/doc/README create mode 100644 apps/random2/random2.c diff --git a/apps/random2/Makefile b/apps/random2/Makefile new file mode 100644 index 0000000..cccecd2 --- /dev/null +++ b/apps/random2/Makefile @@ -0,0 +1,74 @@ +# File: Makefile +# Author: M. P. Hayes, UCECE +# Date: 12 Sep 2010 +# Descr: Makefile for random2 + +# 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: random2.out + + +# Compile: create object files from C source files. +random2.o: random2.c ../../drivers/avr/system.h ../../drivers/display.h ../../drivers/navswitch.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 $@ + +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 $@ + + + + +# Link: create output file (executable) from object files. +random2.out: random2.o pio.o system.o timer.o display.o ledmat.o navswitch.o font.o pacer.o tinygl.o + $(CC) $(CFLAGS) $^ -o $@ -lm + $(SIZE) $@ + + +# Create hex file for programming from executable file. +random2.hex: random2.out + $(OBJCOPY) -O ihex random2.out random2.hex + + +# Target: clean project. +.PHONY: clean +clean: + -$(DEL) *.o *.out *.hex + + +# Target: program project. +.PHONY: program +program: random2.hex + dfu-programmer atmega32u2 erase; dfu-programmer atmega32u2 flash random2.hex; dfu-programmer atmega32u2 start + + diff --git a/apps/random2/Makefile.test b/apps/random2/Makefile.test new file mode 100644 index 0000000..33841fa --- /dev/null +++ b/apps/random2/Makefile.test @@ -0,0 +1,64 @@ +# File: Makefile +# Author: M. P. Hayes, UCECE +# Date: 11 Sep 2010 +# Descr: Makefile for random2 + +CC = gcc +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../utils + +DEL = rm + + +# Default target. +all: random2 + + +# Compile: create object files from C source files. +random2-test.o: random2.c ../../drivers/display.h ../../drivers/navswitch.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 $@ + +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 $@ + +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. +random2: random2-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) random2 random2-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/random2/doc/Makefile b/apps/random2/doc/Makefile new file mode 100644 index 0000000..c93d18c --- /dev/null +++ b/apps/random2/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/random2/doc/README b/apps/random2/doc/README new file mode 100644 index 0000000..39a9712 --- /dev/null +++ b/apps/random2/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/random2/random2.c b/apps/random2/random2.c new file mode 100644 index 0000000..d0e1ace --- /dev/null +++ b/apps/random2/random2.c @@ -0,0 +1,66 @@ +/** @file random2.c + @author M.P. Hayes + @date 25 Sep 2013 + @brief Example to show how pseudorandom sequence can be changed by reseeding + the pseudorandom number generator. +*/ + +#include +#include "system.h" +#include "pacer.h" +#include "tinygl.h" +#include "navswitch.h" +#include "../fonts/font5x7_1.h" + +#define LOOP_RATE 10000 + +#define NAVSWITCH_RATE 20 + + +int main (void) +{ + uint16_t navswitch_tick = 0; + uint16_t count = 0; + + system_init (); + + navswitch_init (); + + tinygl_init (LOOP_RATE); + tinygl_font_set (&font5x7_1); + + pacer_init (LOOP_RATE); + + tinygl_draw_char ('*', tinygl_point (0, 0)); + + while (1) + { + pacer_wait (); + + tinygl_update (); + + count++; + + navswitch_tick++; + if (navswitch_tick >= LOOP_RATE / NAVSWITCH_RATE) + { + navswitch_tick = 0; + + navswitch_update (); + + if (navswitch_push_event_p (NAVSWITCH_PUSH)) + { + char c; + + c = (rand () % 26) + 'A'; + + tinygl_draw_char (c, tinygl_point (0, 0)); + + /* Reseed the pseudorandom number generator based on the + number of iterations of the paced loop. */ + srand (count); + } + } + } + return 0; +}