altos/telefireone-v1.0: Track ao_led_init API change

[fw/altos] / src / stm / ao_lcd_font.c

diff --git a/src/stm/ao_lcd_font.c b/src/stm/ao_lcd_font.c
index 2bd787ed6e0637d4dcaaa45cc29dc3b407f3172b..6c5ea5c2abcf6f07cfeb51439d4438cd5da15359 100644 (file)
--- a/src/stm/ao_lcd_font.c
+++ b/src/stm/ao_lcd_font.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,10 @@
  */
 
 #include <ao.h>
+#include "ao_lcd_font.h"
 
 static const uint16_t ao_lcd_font[] = {
-#include "ao_lcd_font.h"
+#include "ao_lcd_font_bits.h"
 };
 
 /*
@@ -98,6 +100,7 @@ ao_lcd_font_string(char *s) {
        }
        while (pos < 6)
                ao_lcd_font_char(pos++, ' ', 0);
+       stm_lcd.sr = (1 << STM_LCD_SR_UDR);
 }
 
 static void
@@ -112,10 +115,9 @@ ao_lcd_font_text(void)
        }
        string[c++] = '\0';
        ao_lcd_font_string(string);
-       stm_lcd.sr = (1 << STM_LCD_SR_UDR);
 }
 
-const struct ao_cmds ao_lcd_font_cmds[] = {
+static const struct ao_cmds ao_lcd_font_cmds[] = {
        { ao_lcd_font_text,     "t <string>\0Write <string> to LCD" },
        { 0, NULL }
 };
@@ -125,4 +127,3 @@ ao_lcd_font_init(void)
 {
        ao_cmd_register(ao_lcd_font_cmds);
 }
-