fanwuyang/ence260-othello
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of eng-git.canterbury.ac.nz:mph/ucfk4

Browse Source
This commit is contained in:
Michael Hayes
2013-10-08 22:25:54 +13:00
parent dc54816f25 8d130a3baf
commit d17c7f3639
23 changed files with 54 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/beep1/Makefile
+3 -9
View File
@@ -5,7 +5,7 @@
# Definitions.
CC = avr-gcc
CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../drivers -I../../utils
CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../utils
OBJCOPY = avr-objcopy
SIZE = avr-size
DEL = rm
@@ -16,7 +16,7 @@ all: beep1.out
# Compile: create object files from C source files.
beep1.o: beep1.c ../../drivers/avr/delay.h ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/button.h ../../drivers/led.h ../../utils/pacer.h
beep1.o: beep1.c ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../utils/pacer.h
$(CC) -c $(CFLAGS) $< -o $@
pio.o: ../../drivers/avr/pio.c ../../drivers/avr/pio.h ../../drivers/avr/system.h
@@ -28,12 +28,6 @@ system.o: ../../drivers/avr/system.c ../../drivers/avr/system.h
timer.o: ../../drivers/avr/timer.c ../../drivers/avr/system.h ../../drivers/avr/timer.h
$(CC) -c $(CFLAGS) $< -o $@
button.o: ../../drivers/button.c ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/button.h
$(CC) -c $(CFLAGS) $< -o $@
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 $@
@@ -41,7 +35,7 @@ pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.
# Link: create output file (executable) from object files.
beep1.out: beep1.o pio.o system.o timer.o button.o led.o pacer.o
beep1.out: beep1.o pio.o system.o timer.o pacer.o
$(CC) $(CFLAGS) $^ -o $@ -lm
$(SIZE) $@
apps/beep1/doc/Makefile
+1 -1
View File
@@ -1,7 +1,7 @@
# File: Makefile
# Author: M. P. Hayes, UCECE
# Date: 11 Sep 2010
# Descr: Makefile for squeak1 docs
# Descr: Makefile for beep1 docs
# The scripts used to make the graphs require the program dot; this
# is part of the graphviz package.
apps/beep2/Makefile
+2 -5
View File
@@ -16,7 +16,7 @@ all: beep2.out
# Compile: create object files from C source files.
beep2.o: beep2.c ../../drivers/avr/delay.h ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/button.h ../../drivers/led.h ../../utils/pacer.h
beep2.o: beep2.c ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/button.h ../../utils/pacer.h
$(CC) -c $(CFLAGS) $< -o $@
pio.o: ../../drivers/avr/pio.c ../../drivers/avr/pio.h ../../drivers/avr/system.h
@@ -31,9 +31,6 @@ timer.o: ../../drivers/avr/timer.c ../../drivers/avr/system.h ../../drivers/avr/
button.o: ../../drivers/button.c ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/button.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 $@
@@ -41,7 +38,7 @@ pacer.o: ../../utils/pacer.c ../../drivers/avr/system.h ../../drivers/avr/timer.
# Link: create output file (executable) from object files.
beep2.out: beep2.o pio.o system.o timer.o button.o led.o pacer.o
beep2.out: beep2.o pio.o system.o timer.o button.o pacer.o
$(CC) $(CFLAGS) $^ -o $@ -lm
$(SIZE) $@
apps/beep2/doc/Makefile
+1 -1
View File
@@ -1,7 +1,7 @@
# File: Makefile
# Author: M. P. Hayes, UCECE
# Date: 11 Sep 2010
# Descr: Makefile for squeak1 docs
# Descr: Makefile for beep2 docs
# The scripts used to make the graphs require the program dot; this
# is part of the graphviz package.
apps/ir_spam1/doc/Makefile
+1 -1
View File
@@ -1,7 +1,7 @@
# File: Makefile
# Author: M. P. Hayes, UCECE
# Date: 11 Sep 2010
# Descr: Makefile for ir_uart_test1 docs
# Descr: Makefile for ir_spam1 docs
# The scripts used to make the graphs require the program dot; this
# is part of the graphviz package.
apps/ir_uart_demo1/doc/Makefile
+1 -1
View File
@@ -1,7 +1,7 @@
# File: Makefile
# Author: M. P. Hayes, UCECE
# Date: 11 Sep 2010
# Descr: Makefile for ir_uart_test3 docs
# Descr: Makefile for ir_uart_demo1 docs
# The scripts used to make the graphs require the program dot; this
# is part of the graphviz package.
apps/ir_uart_test1/Makefile
+1 -1
View File
@@ -19,7 +19,7 @@ all: ir_uart_test1.out
ir_uart_test1.o: ir_uart_test1.c ../../drivers/avr/ir_uart.h ../../drivers/avr/system.h ../../drivers/display.h ../../drivers/navswitch.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
ir_uart.o: ../../drivers/avr/ir_uart.c ../../drivers/avr/delay.h ../../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
apps/ir_uart_test2/Makefile
+1 -1
View File
@@ -19,7 +19,7 @@ all: ir_uart_test2.out
ir_uart_test2.o: ir_uart_test2.c ../../drivers/avr/ir_uart.h ../../drivers/avr/system.h ../../drivers/display.h ../../drivers/navswitch.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
ir_uart.o: ../../drivers/avr/ir_uart.c ../../drivers/avr/delay.h ../../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
apps/ir_uart_test3/Makefile
+1 -1
View File
@@ -19,7 +19,7 @@ all: ir_uart_test3.out
ir_uart_test3.o: ir_uart_test3.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
ir_uart.o: ../../drivers/avr/ir_uart.c ../../drivers/avr/delay.h ../../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
apps/ir_uart_test3/doc/callgraph.d
+6 -2
View File
@@ -116,7 +116,11 @@ [email protected]:
usart1_putc@usart1.c: usart1_write_ready_p
ir_uart_putc@ir_uart.c: usart1_putc
usart1_write_finished_p@usart1.c:
main@ir_uart_test3.c: system_init tinygl_init tinygl_font_set tinygl_text_speed_set tinygl_text_mode_set tinygl_text_dir_set navswitch_init ir_uart_init pacer_init show_byte pacer_wait tinygl_update ir_uart_read_ready_p ir_uart_getc show_byte navswitch_update navswitch_push_event_p ir_uart_putc ir_uart_getc navswitch_push_event_p ir_uart_putc ir_uart_getc
ir_uart_write_finished_p@ir_uart.c: usart1_write_finished_p
ir_uart_putc@ir_uart.c: usart1_putc ir_uart_write_finished_p _delay_loop_1 ir_uart_read_ready_p ir_uart_getc
main@ir_uart_test3.c: system_init tinygl_init tinygl_font_set tinygl_text_speed_set tinygl_text_mode_set tinygl_text_dir_set navswitch_init ir_uart_init pacer_init show_byte pacer_wait tinygl_update ir_uart_read_ready_p ir_uart_getc show_byte navswitch_update navswitch_push_event_p ir_uart_putc navswitch_push_event_p ir_uart_putc
apps/ir_uart_test3/doc/files.d
+3 -3
View File
@@ -26,7 +26,9 @@
../../drivers/avr/pio.h:
../../drivers/avr/ir_uart.c: ../../drivers/avr/ir_uart.h ../../drivers/avr/usart1.h ../../drivers/avr/timer0.h ../../drivers/avr/pio.h
../../drivers/avr/delay.h:
../../drivers/avr/ir_uart.c: ../../drivers/avr/ir_uart.h ../../drivers/avr/usart1.h ../../drivers/avr/timer0.h ../../drivers/avr/pio.h ../../drivers/avr/delay.h
../../drivers/avr/ir_uart.o: ../../drivers/avr/ir_uart.c
@@ -80,8 +82,6 @@ ir_uart_test3.o: ir_uart_test3.c
../../drivers/avr/prescale.o: ../../drivers/avr/prescale.c
../../drivers/avr/delay.h:
../../drivers/navswitch.c: ../../drivers/navswitch.h ../../drivers/avr/delay.h ../../drivers/avr/pio.h
../../drivers/navswitch.o: ../../drivers/navswitch.c
apps/ir_uart_test4/doc/Makefile
+1 -1
View File
@@ -1,7 +1,7 @@
# File: Makefile
# Author: M. P. Hayes, UCECE
# Date: 11 Sep 2010
# Descr: Makefile for ir_uart_test3 docs
# Descr: Makefile for ir_uart_test4 docs
# The scripts used to make the graphs require the program dot; this
# is part of the graphviz package.
apps/jukebox1/doc/Makefile
+1 -1
View File
@@ -1,7 +1,7 @@
# File: Makefile
# Author: M. P. Hayes, UCECE
# Date: 11 Sep 2010
# Descr: Makefile for squeak4 docs
# Descr: Makefile for jukebox1 docs
# The scripts used to make the graphs require the program dot; this
# is part of the graphviz package.
apps/ledpwm1/doc/Makefile
+1 -1
View File
@@ -1,7 +1,7 @@
# File: Makefile
# Author: M. P. Hayes, UCECE
# Date: 11 Sep 2010
# Descr: Makefile for led5 docs
# Descr: Makefile for ledpwm1 docs
# The scripts used to make the graphs require the program dot; this
# is part of the graphviz package.
apps/race1/doc/Makefile
+1 -1
View File
@@ -1,7 +1,7 @@
# File: Makefile
# Author: M. P. Hayes, UCECE
# Date: 11 Sep 2010
# Descr: Makefile for ir_uart_test3 docs
# Descr: Makefile for race1 docs
# The scripts used to make the graphs require the program dot; this
# is part of the graphviz package.
apps/random1/doc/Makefile
+1 -1
View File
@@ -1,7 +1,7 @@
# File: Makefile
# Author: M. P. Hayes, UCECE
# Date: 11 Sep 2010
# Descr: Makefile for led5 docs
# Descr: Makefile for random1 docs
# The scripts used to make the graphs require the program dot; this
# is part of the graphviz package.
apps/random2/doc/Makefile
+1 -1
View File
@@ -1,7 +1,7 @@
# File: Makefile
# Author: M. P. Hayes, UCECE
# Date: 11 Sep 2010
# Descr: Makefile for led5 docs
# Descr: Makefile for random2 docs
# The scripts used to make the graphs require the program dot; this
# is part of the graphviz package.
apps/snake1/Makefile
+2 -2
View File
@@ -5,7 +5,7 @@
# Definitions.
CC = avr-gcc
CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../fonts -I../../drivers -I../../utils
CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../drivers -I../../utils
OBJCOPY = avr-objcopy
SIZE = avr-size
DEL = rm
@@ -16,7 +16,7 @@ all: snake1.out
# Compile: create object files from C source files.
snake1.o: snake1.c ../../drivers/avr/system.h ../../drivers/display.h ../../drivers/navswitch.h ../../fonts/font5x7_1.h ../../utils/font.h ../../utils/pacer.h ../../utils/tinygl.h
snake1.o: snake1.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
apps/snake1/Makefile.test
+2 -2
View File
@@ -4,7 +4,7 @@
# Descr: Makefile for snake1
CC = gcc
CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../utils
CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../utils
DEL = rm
@@ -14,7 +14,7 @@ all: snake1
# Compile: create object files from C source files.
snake1-test.o: snake1.c ../../drivers/display.h ../../drivers/navswitch.h ../../drivers/test/system.h ../../fonts/font5x7_1.h ../../utils/font.h ../../utils/pacer.h ../../utils/tinygl.h
snake1-test.o: snake1.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
apps/stars1/doc/Makefile
+1 -1
View File
@@ -1,7 +1,7 @@
# File: Makefile
# Author: M. P. Hayes, UCECE
# Date: 11 Sep 2010
# Descr: Makefile for led5 docs
# Descr: Makefile for stars1 docs
# The scripts used to make the graphs require the program dot; this
# is part of the graphviz package.
apps/stars2/doc/Makefile
+1 -1
View File
@@ -1,7 +1,7 @@
# File: Makefile
# Author: M. P. Hayes, UCECE
# Date: 11 Sep 2010
# Descr: Makefile for led5 docs
# Descr: Makefile for stars2 docs
# The scripts used to make the graphs require the program dot; this
# is part of the graphviz package.
drivers/avr/ir_uart.c
+20 -2
View File
@@ -7,6 +7,7 @@
#include "usart1.h"
#include "timer0.h"
#include "pio.h"
#include "delay.h"
/* Return non-zero if there is a character ready to be read. */
@@ -51,8 +52,25 @@ ir_uart_putc (char ch)
/* Gobble echoed character. The echoing is due to an electrical
common-path interference problem caused by a poor PCB layout of the
track powering the IR receiver. */
ir_uart_getc ();
track powering the IR receiver. Unfortunately, it does not always
occur with some combination of UCFK4 boards and laptops. Perhaps
some laptops are more miserly with their current allocation and
some IR LEDs do not draw as much current? So as a workaround
we need to wait until the transmission has finished and then check
if something was immediately received.
Having said all this, it is possible to get an optical reflection
of the transmitted signal. The following code should handle this
as well. */
while (! ir_uart_write_finished_p ())
continue;
/* Play safe and wait for receive complete flag to be set. */
DELAY_US (1);
if (ir_uart_read_ready_p ())
ir_uart_getc ();
return 1;
}
drivers/avr/system.h
+1 -2
View File
@@ -8,8 +8,7 @@
/* Data typedefs. */
#include <stdint.h>
typedef uint8_t bool;
#include <stdbool.h>
/** Useful macros. */