Revert tinygl_text API and add tinygl_draw_message

apps/chooser/chooser.c

@@ -29,7 +29,7 @@ static void show_num (char ch, uint8_t count)
     buffer[1] = count / 10 + '0';
     buffer[2] = count % 10 + '0';
     buffer[3] = 0;
-    tinygl_text (buffer, tinygl_point (0, 0));
+    tinygl_text (buffer);
 }
 
 
@@ -45,7 +45,7 @@ int main (void)
     tinygl_text_speed_set (MESSAGE_RATE);
     tinygl_text_mode_set (TINYGL_TEXT_MODE_SCROLL);
 
-    tinygl_text ("NUM?", tinygl_point (0, 0));
+    tinygl_text ("NUM?");
 
     pacer_init (LOOP_RATE);
 

apps/fonttest1/fonttest1.c

@@ -43,7 +43,7 @@ static char show_char (char ch)
 
     string[0] = ch;
     string[1] = 0;
-    tinygl_text (string, tinygl_point (0, 0));
+    tinygl_text (string);
     return ch;
 }
 

apps/hello2/hello2.c

@@ -27,7 +27,7 @@ int main (void)
     tinygl_font_set (&font5x7_1);
     tinygl_text_speed_set (MESSAGE_RATE);
 
-    tinygl_text ("HELLO WORLD", tinygl_point (0, 0));
+    tinygl_text ("HELLO WORLD");
 
     pacer_init (LOOP_RATE);
 

apps/hello3/hello3.c

@@ -28,7 +28,7 @@ int main (void)
     tinygl_text_speed_set (MESSAGE_RATE);
     tinygl_text_mode_set (TINYGL_TEXT_MODE_SCROLL);
 
-    tinygl_text ("HELLO WORLD", tinygl_point (0, 0));
+    tinygl_text ("HELLO WORLD");
 
     pacer_init (LOOP_RATE);
 

apps/hello4/hello4.c

@@ -31,7 +31,7 @@ int main (void)
     tinygl_text_speed_set (MESSAGE_RATE);
     tinygl_text_mode_set (TINYGL_TEXT_MODE_SCROLL);
 
-    tinygl_text ("HELLO WORLD", tinygl_point (0, 0));
+    tinygl_text ("HELLO WORLD");
 
     pacer_init (LOOP_RATE);
 

apps/hello5/hello5.c

@@ -32,7 +32,7 @@ int main (void)
     tinygl_text_mode_set (TINYGL_TEXT_MODE_SCROLL);
     tinygl_text_dir_set (TINYGL_TEXT_DIR_ROTATE);
 
-    tinygl_text ("HELLO WORLD ", tinygl_point (0, TINYGL_HEIGHT - 1));
+    tinygl_text ("HELLO WORLD ");
 
     pacer_init (LOOP_RATE);
 

apps/ir_grab1/ir_grab1.c

@@ -85,7 +85,7 @@ static void show_char (char ch)
 
     buffer[0] = ch;
     buffer[1] = 0;
-    tinygl_text (buffer, tinygl_point (0, 0));
+    tinygl_text (buffer);
 }
 
 

apps/ir_grab2/ir_grab2.c

@@ -89,7 +89,7 @@ static void show_char (char ch)
 
     buffer[0] = ch;
     buffer[1] = 0;
-    tinygl_text (buffer, tinygl_point (0, TINYGL_HEIGHT - 1));
+    tinygl_text (buffer);
 }
 
 
@@ -99,7 +99,7 @@ static void show_num (char ch, uint8_t num)
 
     buffer[0] = ch;
     uint8toa (num, buffer + 1, 0);
-    tinygl_text (buffer, tinygl_point (0, TINYGL_HEIGHT - 1));
+    tinygl_text (buffer);
 }
 
 

apps/ir_grab3/ir_grab3.c

@@ -156,7 +156,7 @@ int main (void)
 
     pacer_init (LOOP_RATE);
 
-    tinygl_text ("X", tinygl_point (0, 0));
+    tinygl_text ("X");
     led_set (LED1, 0);
 
     while (1)
@@ -176,7 +176,7 @@ int main (void)
 
             if (seq != -1)
             {
-                tinygl_text (strings[seq], tinygl_point (0, 0));
+                tinygl_text (strings[seq]);
                 transmit (&codeseqs[seq * CODESEQ_LEN_MAX]);
             }
                     
@@ -199,7 +199,7 @@ int main (void)
                 {
                     if (capture (codeseq, CODESEQ_LEN_MAX))
                     {
-                        tinygl_text ("?", tinygl_point (0, 0));
+                        tinygl_text ("?");
                         led_set (LED1, 1);
                         state = STATE_STORE;
                         break;
@@ -227,7 +227,7 @@ int main (void)
             {
                 memcpy (&codeseqs[seq * CODESEQ_LEN_MAX], codeseq, sizeof (codeseq));
                 codeseqs_write (codeseqs, CODESEQ_LEN_MAX, CODESEQ_NUM);
-                tinygl_text (strings[seq], tinygl_point (0, 0));
+                tinygl_text (strings[seq]);
                 led_set (LED1, 0);
                 state = STATE_NORMAL;
             }

apps/ir_serial_test1/ir_serial_test1.c

@@ -29,7 +29,7 @@ static void show_count (uint8_t count)
     buffer[0] = 'S';
     buffer[1] = count + '0';
     buffer[2] = 0;
-    tinygl_text (buffer, tinygl_point (0, TINYGL_HEIGHT - 1));
+    tinygl_text (buffer);
 }
 
 
@@ -40,7 +40,7 @@ static void show_err (uint8_t err)
     buffer[0] = 'E';
     buffer[1] = err + '0';
     buffer[2] = 0;
-    tinygl_text (buffer, tinygl_point (0, TINYGL_HEIGHT - 1));
+    tinygl_text (buffer);
 }
 
 

apps/ir_serial_test2/ir_serial_test2.c

@@ -28,7 +28,7 @@ static void show_count (uint8_t count)
     /* FIXME!  */
     buffer[0] = count + '0';
     buffer[1] = 0;
-    tinygl_text (buffer, tinygl_point (0, 0));
+    tinygl_text (buffer);
 }
 
 

apps/ir_serial_test3/ir_serial_test3.c

@@ -28,7 +28,7 @@ static void show_count (uint8_t count)
     /* FIXME!  */
     buffer[0] = count + '0';
     buffer[1] = 0;
-    tinygl_text (buffer, tinygl_point (0, 0));
+    tinygl_text (buffer);
 }
 
 

apps/ir_uart_test1/ir_uart_test1.c

@@ -28,7 +28,7 @@ static void show_count (uint8_t count)
     /* FIXME!  */
     buffer[0] = count + '0';
     buffer[1] = 0;
-    tinygl_text (buffer, tinygl_point (0, 0));
+    tinygl_text (buffer);
 }
 
 

apps/ir_uart_test2/ir_uart_test2.c

@@ -27,7 +27,7 @@ static void show_char (char ch)
 
     buffer[0] = ch;
     buffer[1] = 0;
-    tinygl_text (buffer, tinygl_point (0, 0));
+    tinygl_text (buffer);
 }
 
 

apps/space10/space10.c

@@ -86,7 +86,7 @@ game_over_display (char *buffer)
     *str++ = 'F';
     uint8toa (spacey_shells_fired_get (), str, 0);
     tinygl_clear ();
-    tinygl_text (buffer, tinygl_point (0, TINYGL_HEIGHT - 1));
+    tinygl_text (buffer);
 }
 
 
@@ -99,7 +99,7 @@ game_text_display (uint8_t num, char *buffer, char *msg)
         *str++ = *msg++;
     uint8toa (num, str, 0);
     tinygl_clear ();
-    tinygl_text (buffer, tinygl_point (0, TINYGL_HEIGHT - 1));
+    tinygl_text (buffer);
 }
 
 
@@ -287,8 +287,7 @@ main (void)
                 break;
                 
             case STATE_INIT:
-                tinygl_text ("SPACEY READY V" VERSION " BY MPH ",
+                tinygl_text ("SPACEY READY V" VERSION " BY MPH ");
-                             tinygl_point (0, TINYGL_HEIGHT - 1));
                 state = STATE_READY;
                 break;
                 

apps/space11/space11.c

@@ -91,7 +91,7 @@ game_over_display (char *buffer)
     *str++ = '/';
     uint8toa (spacey_shells_fired_get (), str, 0);
     tinygl_clear ();
-    tinygl_text (buffer, tinygl_point (0, TINYGL_HEIGHT - 1));
+    tinygl_text (buffer);
 }
 
 
@@ -104,7 +104,7 @@ game_text_display (uint8_t num, char *buffer, char *msg)
         *str++ = *msg++;
     uint8toa (num, str, 0);
     tinygl_clear ();
-    tinygl_text (buffer, tinygl_point (0, TINYGL_HEIGHT - 1));
+    tinygl_text (buffer);
 }
 
 
@@ -238,8 +238,7 @@ static void game_task (__unused__ void *data)
         break;
         
     case STATE_INIT:
-        tinygl_text ("SPACEY READY V" VERSION " BY MPH ", 
+        tinygl_text ("SPACEY READY V" VERSION " BY MPH ");
-                     tinygl_point (0, TINYGL_HEIGHT - 1));
         state = STATE_READY;
         break;
         

apps/space12/space12.c

@@ -152,7 +152,7 @@ game_over_display (char *buffer)
     *str++ = '/';
     uint8toa (spacey_shells_fired_get (), str, 0);
     tinygl_clear ();
-    tinygl_text (buffer, tinygl_point (0, TINYGL_HEIGHT - 1));
+    tinygl_text (buffer);
 }
 
 
@@ -165,7 +165,7 @@ game_text_display (uint8_t num, char *buffer, char *msg)
         *str++ = *msg++;
     uint8toa (num, str, 0);
     tinygl_clear ();
-    tinygl_text (buffer, tinygl_point (0, TINYGL_HEIGHT - 1));
+    tinygl_text (buffer);
 }
 
 
@@ -304,8 +304,7 @@ static void game_task (__unused__ void *data)
         break;
         
     case STATE_INIT:
-        tinygl_text ("SPACEY READY V" VERSION " BY MPH ",
+        tinygl_text ("SPACEY READY V" VERSION " BY MPH ");
-                      tinygl_point (0, TINYGL_HEIGHT - 1));
         mmelody_play (melody, game_intro_tune);
         state = STATE_READY;
         break;

apps/space9/space9.c

@@ -87,7 +87,7 @@ game_over_display (char *buffer)
     *str++ = '/';
     uint8toa (spacey_shells_fired_get (), str, 0);
     tinygl_clear ();
-    tinygl_text (buffer, tinygl_point (0, TINYGL_HEIGHT - 1));
+    tinygl_text (buffer);
 }
 
 
@@ -100,7 +100,7 @@ game_text_display (uint8_t num, char *buffer, char *msg)
         *str++ = *msg++;
     uint8toa (num, str, 0);
     tinygl_clear ();
-    tinygl_text (buffer, tinygl_point (0, TINYGL_HEIGHT - 1));
+    tinygl_text (buffer);
 }
 
 
@@ -303,8 +303,7 @@ main (void)
                 break;
                 
             case STATE_INIT:
-                tinygl_text ("SPACEY READY V" VERSION " BY MPH ",
+                tinygl_text ("SPACEY READY V" VERSION " BY MPH ");
-                             tinygl_point (0, TINYGL_HEIGHT - 1));
                 state = STATE_READY;
                 break;
                 

apps/spacey_remote1/spacey_remote1.c

@@ -38,7 +38,7 @@ int main (void)
 
     pacer_init (LOOP_RATE);
 
-    tinygl_text ("#", tinygl_point (0, 0));
+    tinygl_text ("#");
 
     /* Paced loop.  */
     while (1)
@@ -69,11 +69,11 @@ int main (void)
             switch (event)
             {
             case SPACEY_EVENT_ALIEN_HIT:
-                tinygl_text ("*", tinygl_point (0, 0));
+                tinygl_text ("*");
                 break;
 
             case SPACEY_EVENT_ALIEN_LANDED:
-                tinygl_text ("@", tinygl_point (0, 0));
+                tinygl_text ("@");
                 break;
             }
 

apps/squeak3/squeak3.c

@@ -77,7 +77,7 @@ static void button_task_init (void)
 static void display_note (void)
 {
     tinygl_clear ();
-    tinygl_text (note_names[note], tinygl_point (0, TINYGL_HEIGHT - 1));
+    tinygl_text (note_names[note]);
 }
 
 

apps/squeak4/squeak4.c

@@ -51,8 +51,7 @@ note_play (tweeter_t tweeter, tweeter_note_t note, uint8_t velocity)
 {
     tinygl_clear ();
     if (note != 0 && velocity != 0)
-        tinygl_text (note_names[note % 12],
+        tinygl_text (note_names[note % 12]);
-                     tinygl_point (0, TINYGL_HEIGHT - 1));
 
     tweeter_note_play (tweeter, note, velocity);
 }

apps/task2/task2.c

@@ -42,7 +42,7 @@ static void display_task_init (void)
     tinygl_text_mode_set (TINYGL_TEXT_MODE_SCROLL);
     tinygl_text_dir_set (TINYGL_TEXT_DIR_ROTATE);
     
-    tinygl_text ("HELLO WORLD ", tinygl_point (0, TINYGL_HEIGHT - 1));
+    tinygl_text ("HELLO WORLD ");
 }
 
 

apps/updown1/updown1.c

@@ -23,7 +23,7 @@ static void show_count (uint8_t count)
     /* FIXME!  */
     buffer[0] = count + '0';
     buffer[1] = 0;
-    tinygl_text (buffer, tinygl_point (0, 0));
+    tinygl_text (buffer);
 }
 
 

apps/updown2/updown2.c

@@ -24,7 +24,7 @@ static void show_count (uint8_t count)
     /* FIXME!  */
     buffer[0] = count + '0';
     buffer[1] = 0;
-    tinygl_text (buffer, tinygl_point (0, 0));
+    tinygl_text (buffer);
 }
 
 

utils/tinygl.c

@@ -263,7 +263,7 @@ static void tinygl_text_advance (void)
 /** Display a message repeatedly.
     @param string null terminated message to display
     @param pos position on screen.  */
-void tinygl_text (const char *string, tinygl_point_t pos)
+void tinygl_draw_message (const char *string, tinygl_point_t pos)
 {
     tinygl.message_index = 0;
     tinygl.scroll_pos = 0;
@@ -296,6 +296,19 @@ void tinygl_text (const char *string, tinygl_point_t pos)
 }
 
 
+/** Display a message repeatedly.
+    @param string null terminated message to display.  */
+void tinygl_text (const char *string)
+{
+    tinygl_point_t pos;
+
+    pos.x = 0;
+    pos.y = (tinygl.dir == TINYGL_TEXT_DIR_ROTATE) ? TINYGL_HEIGHT - 1 : 0;
+
+    tinygl_draw_message (string, pos);
+}
+
+
 /** Set the message update speed.
     @param speed text advance speed (characters per 10 s).  */
 void tinygl_text_speed_set (uint8_t speed)

utils/tinygl.h

@@ -136,12 +136,6 @@ static inline tinygl_point_t tinygl_point (tinygl_coord_t x, tinygl_coord_t y)
 }
 
 
-/** Display a message repeatedly.
-    @param string null terminated message to display
-    @param pos position on screen.  */
-void tinygl_text (const char *string, tinygl_point_t pos);
-
-
 /** Set the message update speed.
     @param speed text advance speed (characters per 10 s).  */
 void tinygl_text_speed_set (uint8_t speed);
@@ -176,6 +170,17 @@ tinygl_point_t tinygl_draw_char (char ch, tinygl_point_t pos);
 uint8_t tinygl_draw_string (const char *str, tinygl_point_t pos);
 
 
+/** Display a message repeatedly.
+    @param string null terminated message to display
+    @param pos position on screen.  */
+void tinygl_draw_message (const char *string, tinygl_point_t pos);
+
+
+/** Display a message repeatedly.
+    @param string null terminated message to display.  */
+void tinygl_text (const char *string);
+
+
 /** Draw point.
     @param pos coordinates of point
     @param pixel_value pixel value to draw point.  */