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

apps/ir_uart_demo1/ir_uart_demo1.c

@@ -8,7 +8,6 @@
 #include "navswitch.h"
 #include "tinygl.h"
 #include "task.h"
-#include "uint8toa.h"
 #include "ir_uart.h"
 
 #define DISPLAY_TASK_RATE 200

apps/snake1/snake1.c

@@ -1,14 +1,13 @@
 /** @file   snake1.c
     @author M.P. Hayes
     @date   5 Oct 2010
-    @note   The sneake head deliberately moves off screen unless turned.
+    @note   The snake head deliberately moves off screen unless turned.
 */
 
 #include "system.h"
 #include "navswitch.h"
 #include "tinygl.h"
 #include "pacer.h"
-#include "../fonts/font5x7_1.h"
 
 
 /* Define polling rate in Hz.  */
@@ -86,7 +85,6 @@ int main (void)
     snake.pos.y = TINYGL_HEIGHT - 1;
 
     tinygl_init (LOOP_RATE);
-    tinygl_font_set (&font5x7_1);
 
     navswitch_init ();
 

drivers/avr/usart1.c

@@ -54,7 +54,8 @@ usart1_write_ready_p (void)
 }
 
 
-/** Return non-zero if transmitter finished.  */
+/** Return non-zero if transmission finished.  This is useful for
+    half-duplex operation.  */
 bool
 usart1_write_finished_p (void)
 {

drivers/avr/usart1.h

@@ -37,7 +37,8 @@ bool
 usart1_write_ready_p (void);
 
 
-/** Return non-zero if transmitter finished.  */
+/** Return non-zero if transmission finished.  This is useful for
+    half-duplex operation.  */
 bool
 usart1_write_finished_p (void);
 

utils/tinygl.c

@@ -237,10 +237,10 @@ static void tinygl_text_advance (void)
 {
     if (!tinygl.message[tinygl.message_index])
     {
-        tinygl.message_index = 0;
+        if (tinygl.message_repeats <= 1)
-        if (tinygl.message_repeats == 0)
             return;
         tinygl.message_repeats--;
+        tinygl.message_index = 0;
     }
     
     if (tinygl.message[tinygl.message_index])