X-Git-Url: https://git.karo-electronics.de/?p=oswald.git;a=blobdiff_plain;f=ui%2FLcdDisplay.c;h=f889bbc4ba7b7b118f95ff2212fd5379a090831d;hp=dbf775fbf4b6da665017c0391f15d35a682568a3;hb=5d0ff002cee35d109f4a60eff415b2db556fb8f4;hpb=dff6532fd5dbbd4a6c2f0fff2c428201b225c529

diff --git a/ui/LcdDisplay.c b/ui/LcdDisplay.c
index dbf775f..f889bbc 100644
--- a/ui/LcdDisplay.c
+++ b/ui/LcdDisplay.c
@@ -1,4 +1,5 @@
-#include "oswald-ui.h"
+#include "oswald.h"
+#include "oswald_hal.h"
 #include "oswald_strings.h"
 #include "Fonts.h"
 
@@ -32,7 +33,7 @@ void DrawLcdLineBresenham(u8t xstart, u8t ystart, u8t xend, u8t yend)
 	x = xstart;
 	y = ystart;
 	err = el/2;
-	lcd_set_pixel(x, y, TRUE);
+	hal_lcd_set_pixel(x, y, TRUE);
  
 	for (t = 0; t < el; ++t) {
 		err -= es; 
@@ -44,7 +45,7 @@ void DrawLcdLineBresenham(u8t xstart, u8t ystart, u8t xend, u8t yend)
 			x += pdx;
 			y += pdy;
 		}
-		lcd_set_pixel(x, y, TRUE);
+		hal_lcd_set_pixel(x, y, TRUE);
 	}
 	// lcd_update_display();
 }
@@ -77,12 +78,12 @@ void DrawLcdLineBresenhamWW(u8t xstart, u8t ystart, u8t xend, u8t yend, u8t thic
 	x = xstart;
 	y = ystart;
 	err = el/2;
-	lcd_set_pixel(x, y, TRUE);
+	hal_lcd_set_pixel(x, y, TRUE);
 	for (i=1; i<thickness; i++) {
-		lcd_set_pixel(x-i, y, TRUE);
-		lcd_set_pixel(x+i, y, TRUE);
-		lcd_set_pixel(x, y-i, TRUE);
-		lcd_set_pixel(x, y+i, TRUE);
+		hal_lcd_set_pixel(x-i, y, TRUE);
+		hal_lcd_set_pixel(x+i, y, TRUE);
+		hal_lcd_set_pixel(x, y-i, TRUE);
+		hal_lcd_set_pixel(x, y+i, TRUE);
 	}
  
 	for (t = 0; t < el; ++t) {
@@ -95,12 +96,12 @@ void DrawLcdLineBresenhamWW(u8t xstart, u8t ystart, u8t xend, u8t yend, u8t thic
 			x += pdx;
 			y += pdy;
 		}
-		lcd_set_pixel(x, y, TRUE);
+		hal_lcd_set_pixel(x, y, TRUE);
 		for (i=1; i<thickness; i++) {
-			lcd_set_pixel(x-i, y, TRUE);
-			lcd_set_pixel(x+i, y, TRUE);
-			lcd_set_pixel(x, y-i, TRUE);
-			lcd_set_pixel(x, y+i, TRUE);
+			hal_lcd_set_pixel(x-i, y, TRUE);
+			hal_lcd_set_pixel(x+i, y, TRUE);
+			hal_lcd_set_pixel(x, y-i, TRUE);
+			hal_lcd_set_pixel(x, y+i, TRUE);
 		}
 	}
 	// lcd_update_display();
@@ -119,10 +120,10 @@ u8t WriteLcdCharacter(u8t x, u8t y, u8t Character)
 	for (ly=0; ly<CharacterHeight; ly++) {
 		for (lx=0; lx<CharacterWidth; lx++) {
 			if (bitmap[ly] & (1<<lx)) {
-				lcd_set_pixel(lx+x, ly+y, TRUE);
+				hal_lcd_set_pixel(lx+x, ly+y, TRUE);
 				// printf(".");
 			} else {
-				lcd_set_pixel(lx+x, ly+y, FALSE);
+				hal_lcd_set_pixel(lx+x, ly+y, FALSE);
 				// printf(" ");
 			}
 		}
@@ -132,18 +133,19 @@ u8t WriteLcdCharacter(u8t x, u8t y, u8t Character)
 	return CharacterWidth + GetFontSpacing();
 }
 
-void WriteLcdString(u8t x, u8t y, char *str)
+u8t WriteLcdString(u8t x, u8t y, char *str)
 {
 	int lx, i, strl;
 
 	strl = oswald_strlen(str);
 	if (strl == 0)
-		return;
+		return 0;
 
 	lx = x;
 	for (i=0; i<strl; i++) {
 		lx += WriteLcdCharacter(lx, y, str[i]);
 	}
+	return lx;
 }