aaron/discoverpixy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed lowlevel tft discovery functions for draw_char and fill_rect.

Browse Source
This commit is contained in:
t-moe
2015-06-01 22:44:58 +02:00
parent 3b95affd93
commit 60c2895e3a
1 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
discovery/src/ll_tft.c
View File

@@ -541,7 +541,20 @@ void ll_tft_fill_rectangle(uint16_t x1,uint16_t y1,uint16_t x2,uint16_t y2, uint
{ {
uint16_t area; uint16_t area;
uint32_t n; uint32_t n;
unsigned int tmp;
if(x1 > x2){
tmp = x1;
x1 = x2;
x2 = tmp;
}
if(y1 > y2){
tmp = y1;
y1 = y2;
y2 = tmp;
}
// set window // set window
tft_set_window(x1, y1, x2, y2); tft_set_window(x1, y1, x2, y2);
tft_set_cursor(x1, y1); tft_set_cursor(x1, y1);
@@ -609,42 +622,39 @@ void ll_tft_draw_char(uint16_t x, uint16_t y, uint16_t color, uint16_t bgcolor,
unsigned char bitm = 0; unsigned char bitm = 0;
bool bgIsTrans = (bgcolor == TRANSPARENT); bool bgIsTrans = (bgcolor == TRANSPARENT);
bool enTrans = 0; unsigned char xadd=0;
unsigned char yadd=0;
tft_set_window(x, y, x + width - 1, y + height - 1); tft_set_window(x, y, x + width - 1, y + height - 1);
tft_set_cursor(x, y); tft_set_cursor(x, y);
for(cnt = (width / 8) * height; cnt > 0; cnt--){ for(cnt = (width / 8) * height; cnt > 0; cnt--){
for(bitm = 0x80; bitm > 0; bitm >>= 1){ for(bitm = 0x80; bitm > 0; bitm >>= 1){
if((font[ind]) & bitm){ if((font[ind]) & bitm){
if(enTrans){ if(bgIsTrans) {
enTrans = 0; tft_set_cursor(x+xadd,y+yadd);
tft_write_reg(0x23,0x0000);
tft_write_reg(0x24,0x0000);
TFT_REG = TFT_SSD1289_REG_22;
} }
TFT_RAM = color; TFT_RAM = color;
} else { } else {
if(bgIsTrans && !enTrans){ if(!bgIsTrans) {
enTrans = 1; TFT_RAM = bgcolor;
tft_write_reg(0x23,0xFFFF); }
tft_write_reg(0x24,0xFFFF);
TFT_REG = TFT_SSD1289_REG_22;
}
TFT_RAM = bgcolor;
} }
if(bgIsTrans)
{
xadd++;
if(xadd==width)
{
xadd=0;
yadd++;
}
}
} }
ind++; ind++;
} }
if(enTrans){
tft_write_reg(0x23,0x0000);
tft_write_reg(0x24,0x0000);
}
tft_reset_window(); tft_reset_window();
} }