Add support for more screens

[oswald.git] / ui / LcdDisplay.c

diff --git a/ui/LcdDisplay.c b/ui/LcdDisplay.c
index f2652c2b7911412fe047502095cd06d9bde0a8f6..4f6bf99a3a9922f00c55a6f9775190c9f4d1dfe5 100644 (file)
--- a/ui/LcdDisplay.c
+++ b/ui/LcdDisplay.c
@@ -1,9 +1,5 @@
-#include <time.h>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-

 #include "oswald-ui.h"
 #include "oswald-ui.h"

+#include "oswald_strings.h"

 #include "Fonts.h"
 
 #include "LcdDisplay.h"
 #include "Fonts.h"
 
 #include "LcdDisplay.h"


@@ -142,13 +138,14 @@ u8t WriteLcdCharacter(u8t x, u8t y, u8t Character)
 
 void WriteLcdString(u8t x, u8t y, u8t *str)
 {
 
 void WriteLcdString(u8t x, u8t y, u8t *str)
 {

-       register lx, i;
+       register lx, i, strl;

 
 

-       if (str == NULL || strlen(str)==0)
+       strl = oswald_strlen(str);
+       if (strl == 0)

                return;
 
        lx = x;
                return;
 
        lx = x;

-       for (i=0; i<strlen(str); i++) {
+       for (i=0; i<strl; i++) {

                lx += WriteLcdCharacter(lx, y, str[i]);
        }
 }
                lx += WriteLcdCharacter(lx, y, str[i]);
        }
 }