fixed compiler warnings

2 files changed, 5 insertions, 5 deletions

diff --git a/glcd.c b/glcd.c
index 9d65b663..8e2e9b92 100644
--- a/glcd.c
+++ b/glcd.c
@@ -40,7 +40,7 @@ void lcdClear(uint16_t color) {
 }

 

 uint16_t lcdGetPixelColor(uint16_t x, uint16_t y) {

-	lld_lcdGetPixelColor(x, y);

+	return lld_lcdGetPixelColor(x, y);

 }

 

 void lcdDrawPixel(uint16_t x, uint16_t y, uint16_t color) {

@@ -109,7 +109,7 @@ void lcdDrawLine(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t co
    }

 }

 

-void lcdDrawChar(uint16_t x, uint16_t y, unsigned char c, uint16_t charcolor, uint16_t bkcolor) {

+void lcdDrawChar(uint16_t x, uint16_t y, const char c, uint16_t charcolor, uint16_t bkcolor) {

 	uint16_t i = 0;

 	uint16_t j = 0;

 	unsigned char buffer[16];

@@ -128,7 +128,7 @@ void lcdDrawChar(uint16_t x, uint16_t y, unsigned char c, uint16_t charcolor, ui
 	}

 }

 

-void lcdDrawString(uint16_t x, uint16_t y, unsigned char *str, uint16_t color, uint16_t bkcolor) {

+void lcdDrawString(uint16_t x, uint16_t y, const char *str, uint16_t color, uint16_t bkcolor) {

 	uint8_t TempChar;

 

 	do {

diff --git a/glcd.h b/glcd.h
index 4fc375c6..9a23dc8e 100644
--- a/glcd.h
+++ b/glcd.h
@@ -48,8 +48,8 @@ void lcdDrawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t co
 void lcdDrawRect(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint8_t filled, uint16_t color);

 void lcdDrawRectString(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint8_t* str, uint16_t fontColor, uint16_t bkColor);

 void lcdDrawCircle(uint16_t x, uint16_t y, uint16_t radius, uint8_t filled, uint16_t color);

-void lcdDrawString(uint16_t x, uint16_t y, unsigned char *str, uint16_t color, uint16_t bkColor);

-void lcdDrawChar(uint16_t x, uint16_t y, unsigned char c, uint16_t charcolor, uint16_t bkColor);

+void lcdDrawString(uint16_t x, uint16_t y, const char *str, uint16_t color, uint16_t bkColor);

+void lcdDrawChar(uint16_t x, uint16_t y, const char c, uint16_t charcolor, uint16_t bkColor);

 uint16_t lcdGetHeight(void);

 uint16_t lcdGetWidth(void);

 uint16_t lcdGetOrientation(void);