From 87da71a613f8153b0fbb6ba0bf2b0e2df2a97ef6 Mon Sep 17 00:00:00 2001 From: Michael Hayes Date: Mon, 7 Oct 2013 22:03:28 +1300 Subject: [PATCH] Add race1 showing possible race condition between two devices --- apps/race1/Makefile | 89 ++++++++++++++++++++++++++++++++ apps/race1/Makefile.test | 70 +++++++++++++++++++++++++ apps/race1/doc/Makefile | 45 ++++++++++++++++ apps/race1/doc/README | 16 ++++++ apps/race1/race1.c | 108 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 328 insertions(+) create mode 100644 apps/race1/Makefile create mode 100644 apps/race1/Makefile.test create mode 100644 apps/race1/doc/Makefile create mode 100644 apps/race1/doc/README create mode 100644 apps/race1/race1.c diff --git a/apps/race1/Makefile b/apps/race1/Makefile new file mode 100644 index 0000000..24b9065 --- /dev/null +++ b/apps/race1/Makefile @@ -0,0 +1,89 @@ +# File: Makefile +# Author: M. P. Hayes, UCECE +# Date: 12 Sep 2010 +# Descr: Makefile for race1 + +# 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: race1.out + + +# Compile: create object files from C source files. +race1.o: race1.c ../../drivers/avr/ir_uart.h ../../drivers/avr/system.h ../../drivers/display.h ../../drivers/navswitch.h ../../fonts/font3x5_1.h ../../utils/font.h ../../utils/task.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 $@ + +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 $@ + +uint8toa.o: ../../utils/uint8toa.c ../../drivers/avr/system.h + $(CC) -c $(CFLAGS) $< -o $@ + + + + +# Link: create output file (executable) from object files. +race1.out: race1.o ir_uart.o pio.o prescale.o system.o timer.o timer0.o usart1.o display.o ledmat.o navswitch.o font.o task.o tinygl.o uint8toa.o + $(CC) $(CFLAGS) $^ -o $@ -lm + $(SIZE) $@ + + +# Create hex file for programming from executable file. +race1.hex: race1.out + $(OBJCOPY) -O ihex race1.out race1.hex + + +# Target: clean project. +.PHONY: clean +clean: + -$(DEL) *.o *.out *.hex + + +# Target: program project. +.PHONY: program +program: race1.hex + dfu-programmer atmega32u2 erase; dfu-programmer atmega32u2 flash race1.hex; dfu-programmer atmega32u2 start + + diff --git a/apps/race1/Makefile.test b/apps/race1/Makefile.test new file mode 100644 index 0000000..6f584e4 --- /dev/null +++ b/apps/race1/Makefile.test @@ -0,0 +1,70 @@ +# File: Makefile +# Author: M. P. Hayes, UCECE +# Date: 11 Sep 2010 +# Descr: Makefile for race1 + +CC = gcc +CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../utils + +DEL = rm + + +# Default target. +all: race1 + + +# Compile: create object files from C source files. +race1-test.o: race1.c ../../drivers/display.h ../../drivers/navswitch.h ../../drivers/test/ir_uart.h ../../drivers/test/system.h ../../fonts/font3x5_1.h ../../utils/font.h ../../utils/task.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 $@ + +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 $@ + +uint8toa-test.o: ../../utils/uint8toa.c ../../drivers/test/system.h + $(CC) -c $(CFLAGS) $< -o $@ + + + + +# Link: create executable file from object files. +race1: race1-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 task-test.o tinygl-test.o uint8toa-test.o + $(CC) $(CFLAGS) $^ -o $@ -lrt + + +# Clean: delete derived files. +.PHONY: clean +clean: + -$(DEL) race1 race1-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 task-test.o tinygl-test.o uint8toa-test.o + + + diff --git a/apps/race1/doc/Makefile b/apps/race1/doc/Makefile new file mode 100644 index 0000000..195c459 --- /dev/null +++ b/apps/race1/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/race1/doc/README b/apps/race1/doc/README new file mode 100644 index 0000000..39a9712 --- /dev/null +++ b/apps/race1/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/race1/race1.c b/apps/race1/race1.c new file mode 100644 index 0000000..9bca286 --- /dev/null +++ b/apps/race1/race1.c @@ -0,0 +1,108 @@ +/** @file race1.c + @author M. P. Hayes, UCECE + @date 7 October 2013 + @brief Test program for IR UART communications showing possible + race condition. + @note Not tested yet... +*/ + +#include "system.h" +#include "navswitch.h" +#include "tinygl.h" +#include "task.h" +#include "ir_uart.h" +#include "../fonts/font5x7_1.h" + +#define DISPLAY_TASK_RATE 200 + +#define IR_UART_TX_TASK_RATE 20 + +#define IR_UART_RX_TASK_RATE 20 + +#define NAVSWITCH_TASK_RATE 20 + +typedef enum state {STATE_UNKNOWN, STATE_FIRST, STATE_SECOND} state_t; + +static state_t this_state = STATE_UNKNOWN; +static state_t other_state = STATE_UNKNOWN; + +static void display_task (__unused__ void *data) +{ + tinygl_update (); +} + + +static void ir_uart_tx_task (__unused__ void *data) +{ + /* Send our state. */ + ir_uart_putc ('A' + this_state); +} + + +static void ir_uart_rx_task (__unused__ void *data) +{ + state_t newstate; + + if (!ir_uart_read_ready_p ()) + return; + + newstate = ir_uart_getc () - 'A'; + + /* Check for corrupted message. */ + if (newstate > STATE_SECOND) + return; + + /* See if other devices state has changed. */ + if (other_state != newstate) + { + other_state = newstate; + if (this_state == STATE_UNKNOWN && other_state == STATE_FIRST) + { + this_state = STATE_SECOND; + tinygl_text ("2"); + } + else + { + /* So what should we do if there is a disagreement? + What if both devices think they were first? */ + } + } +} + + +static void navswitch_task (__unused__ void *data) +{ + navswitch_update (); + + if (navswitch_push_event_p (NAVSWITCH_PUSH)) + { + if (this_state == STATE_UNKNOWN) + { + this_state = STATE_FIRST; + tinygl_text ("1"); + } + } +} + + +int main (void) +{ + task_t tasks[] = + { + {.func = display_task, .period = TASK_RATE / DISPLAY_TASK_RATE}, + {.func = ir_uart_rx_task, .period = TASK_RATE / IR_UART_RX_TASK_RATE}, + {.func = ir_uart_tx_task, .period = TASK_RATE / IR_UART_TX_TASK_RATE}, + {.func = navswitch_task, .period = TASK_RATE / NAVSWITCH_TASK_RATE}, + }; + + system_init (); + ir_uart_init (); + tinygl_init (DISPLAY_TASK_RATE); + + tinygl_font_set (&font5x7_1); + tinygl_text ("*"); + + task_schedule (tasks, 4); + + return 0; +}