Revert tinygl_text API and add tinygl_draw_message

This commit is contained in:
Michael Hayes
2011-09-24 21:25:49 +00:00
parent cc3347edd4
commit 76665cbc7f
26 changed files with 65 additions and 52 deletions
+2 -2
View File
@@ -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);
+1 -1
View File
@@ -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;
}
+1 -1
View File
@@ -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);
+1 -1
View File
@@ -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);
+1 -1
View File
@@ -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);
+1 -1
View File
@@ -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);
+1 -1
View File
@@ -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);
}
+2 -2
View File
@@ -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);
}
+4 -4
View File
@@ -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;
}
+2 -2
View File
@@ -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);
}
+1 -1
View File
@@ -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);
}
+1 -1
View File
@@ -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);
}
+1 -1
View File
@@ -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);
}
+1 -1
View File
@@ -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);
}
+3 -4
View File
@@ -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_point (0, TINYGL_HEIGHT - 1));
tinygl_text ("SPACEY READY V" VERSION " BY MPH ");
state = STATE_READY;
break;
+3 -4
View File
@@ -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_point (0, TINYGL_HEIGHT - 1));
tinygl_text ("SPACEY READY V" VERSION " BY MPH ");
state = STATE_READY;
break;
+3 -4
View File
@@ -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_point (0, TINYGL_HEIGHT - 1));
tinygl_text ("SPACEY READY V" VERSION " BY MPH ");
mmelody_play (melody, game_intro_tune);
state = STATE_READY;
break;
+3 -4
View File
@@ -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_point (0, TINYGL_HEIGHT - 1));
tinygl_text ("SPACEY READY V" VERSION " BY MPH ");
state = STATE_READY;
break;
+3 -3
View File
@@ -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;
}
+1 -1
View File
@@ -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]);
}
+1 -2
View File
@@ -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_point (0, TINYGL_HEIGHT - 1));
tinygl_text (note_names[note % 12]);
tweeter_note_play (tweeter, note, velocity);
}
+1 -1
View File
@@ -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 ");
}
+1 -1
View File
@@ -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);
}
+1 -1
View File
@@ -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);
}