uGFX
/
ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

added orientation mode

ugfx_release_2.6
Tectu 2012-05-28 19:29:35 +02:00
parent 7069b4b245
commit 8a20373132
2 changed files with 55 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
glcd.c
View File

@ -68,22 +68,23 @@ uint16_t lcdReadReg(uint16_t lcdReg) {
return lcdRAM; return lcdRAM;
} }
static void lcdSetCursor(uint16_t Xpos,uint16_t Ypos) { static void lcdSetCursor(uint16_t x, uint16_t y) {
if(DeviceCode==0x8989) if(DeviceCode==0x8989) {
{ if(orientation == 0) {
lcdWriteReg(0x004e,Xpos); lcdWriteReg(0x004e, x);
lcdWriteReg(0x004f,Ypos); lcdWriteReg(0x004f, y);
} } else if(orientation == 1) {
else if(DeviceCode==0x9919) lcdWriteReg(0x004e, y);
{ lcdWriteReg(0x004f, x);
lcdWriteReg(0x004e,Xpos); }
lcdWriteReg(0x004f,Ypos); }
} else if(DeviceCode==0x9919) {
else lcdWriteReg(0x004e,x);
{ lcdWriteReg(0x004f,y);
lcdWriteReg(0x0020,Xpos); } else {
lcdWriteReg(0x0021,Ypos); lcdWriteReg(0x0020,x);
} lcdWriteReg(0x0021,y);
}
} }
static void lcdDelay(uint16_t nCount) { static void lcdDelay(uint16_t nCount) {
@ -94,8 +95,23 @@ static void lcdDelay(uint16_t nCount) {
} }
} }
void lcdSetOrientation(uint8_t orientation) { void lcdSetOrientation(uint8_t newOrientation) {
orientation = orientation; orientation = newOrientation;
switch(orientation) {
case 0:
lcdWriteReg(0x0001, 0x2B3F);
lcdWriteReg(0x0011, 0x6070);
break;
case 1:
lcdWriteReg(0x0001, 0x293F);
lcdWriteReg(0x0011, 0x6078);
break;
case 2:
break;
case 3:
break;
}
} }
void lcdSetWindows(uint16_t xStart,uint16_t yStart,uint16_t xLong,uint16_t yLong) { void lcdSetWindows(uint16_t xStart,uint16_t yStart,uint16_t xLong,uint16_t yLong) {
@ -117,10 +133,10 @@ void lcdClear(uint16_t color) {
Set_CS; Set_CS;
} }
uint16_t lcdGetPoint(uint16_t Xpos,uint16_t Ypos) { uint16_t lcdGetPoint(uint16_t x,uint16_t y) {
u16 dummy; u16 dummy;
lcdSetCursor(Xpos,Ypos); lcdSetCursor(x,y);
Clr_CS; Clr_CS;
lcdWriteIndex(0x0022); lcdWriteIndex(0x0022);
dummy = lcdReadData(); dummy = lcdReadData();
@ -133,8 +149,8 @@ uint16_t lcdGetPoint(uint16_t Xpos,uint16_t Ypos) {
return lcdBGR2RGB( dummy ); return lcdBGR2RGB( dummy );
} }
void lcdDrawPixel(uint16_t Xpos,uint16_t Ypos,uint16_t point) { void lcdDrawPixel(uint16_t x,uint16_t y,uint16_t point) {
lcdSetCursor(Xpos,Ypos); lcdSetCursor(x,y);
lcdWriteReg(0x0022,point); lcdWriteReg(0x0022,point);
} }
@ -200,7 +216,7 @@ void lcdDrawLine(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t co
} }
} }
void lcdChar(unsigned short Xpos,unsigned short Ypos,unsigned char c,unsigned short charcolor,unsigned short bkcolor) { void lcdChar(unsigned short x,unsigned short y,unsigned char c,unsigned short charcolor,unsigned short bkcolor) {
unsigned short i=0; unsigned short i=0;
unsigned short j=0; unsigned short j=0;
unsigned char buffer[16]; unsigned char buffer[16];
@ -213,30 +229,30 @@ void lcdChar(unsigned short Xpos,unsigned short Ypos,unsigned char c,unsigned sh
{ {
if (((tmp_char >> (7-j)) & 0x01) == 0x01) if (((tmp_char >> (7-j)) & 0x01) == 0x01)
{ {
lcdDrawPixel(Xpos+j,Ypos+i,charcolor); lcdDrawPixel(x+j,y+i,charcolor);
} }
else else
{ {
lcdDrawPixel(Xpos+j,Ypos+i,bkcolor); lcdDrawPixel(x+j,y+i,bkcolor);
} }
} }
} }
} }
void lcdString(uint16_t Xpos, uint16_t Ypos, uint8_t *str,uint16_t color, uint16_t bkcolor) { void lcdString(uint16_t x, uint16_t y, uint8_t *str,uint16_t color, uint16_t bkcolor) {
uint8_t TempChar; uint8_t TempChar;
do { do {
TempChar=*str++; TempChar=*str++;
lcdChar(Xpos,Ypos,TempChar,color,bkcolor); lcdChar(x,y,TempChar,color,bkcolor);
if (Xpos<232) { if (x<232) {
Xpos+=8; x+=8;
} else if (Ypos<304) { } else if (y<304) {
Xpos=0; x=0;
Ypos+=16; y+=16;
} else { } else {
Xpos=0; x=0;
Ypos=0; y=0;
} }
} while (*str!=0); } while (*str!=0);
} }

10
glcd.h
View File

@ -40,16 +40,16 @@ void lcdInit(void);
void lcdClear(uint16_t color); void lcdClear(uint16_t color);
void lcdTest(void); void lcdTest(void);
uint16_t lcdBGR2RGB(uint16_t color); uint16_t lcdBGR2RGB(uint16_t color);
uint16_t lcdGetPoint(uint16_t Xpos,uint16_t Ypos); uint16_t lcdGetPoint(uint16_t x,uint16_t y);
void lcdSetOrientation(uint8_t orientation); void lcdSetOrientation(uint8_t newOrientation);
void lcdDrawPixel(uint16_t Xpos,uint16_t Ypos,uint16_t point); void lcdDrawPixel(uint16_t x,uint16_t y,uint16_t point);
void lcdDrawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color); void lcdDrawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color);
void lcdDrawRect(uint8_t x0, uint16_t y0, uint8_t x1, uint16_t y1, uint8_t filled, uint16_t color); void lcdDrawRect(uint8_t x0, uint16_t y0, uint8_t x1, uint16_t y1, uint8_t filled, uint16_t color);
void lcdDrawCircle(uint8_t x, uint16_t y, uint16_t radius, uint8_t filled, uint16_t color); void lcdDrawCircle(uint8_t x, uint16_t y, uint16_t radius, uint8_t filled, uint16_t color);
void lcdFillArea(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color); void lcdFillArea(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color);
void lcdFillArea2(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color); void lcdFillArea2(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color);
void lcdSetWindows(uint16_t xStart,uint16_t yStart,uint16_t xLong,uint16_t yLong); void lcdSetWindows(uint16_t xStart,uint16_t yStart,uint16_t xLong,uint16_t yLong);
void lcdString(uint16_t Xpos, uint16_t Ypos, uint8_t *str,uint16_t color, uint16_t bkcolor); void lcdString(uint16_t x, uint16_t y, uint8_t *str,uint16_t color, uint16_t bkcolor);
void lcdChar(unsigned short Xpos,unsigned short Ypos,unsigned char c,unsigned short charcolor,unsigned short bkcolor); void lcdChar(unsigned short x,unsigned short y,unsigned char c,unsigned short charcolor,unsigned short bkcolor);
#endif #endif