yuzu/MCUFRIEND_kbv
1
0
Fork 0
mirror of https://github.com/YuzuZensai/MCUFRIEND_kbv.git synced 2026-01-31 14:57:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove CD_DATA, call fillRect for drawPixel

Browse Source
This commit is contained in:
prenticedavid
2017-12-25 17:09:20 +00:00
parent 9b5e8b9248
commit b816e420b8
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
MCUFRIEND_kbv.cpp
View File

@@ -103,7 +103,7 @@ static void WriteCmdParamN(uint16_t cmd, int8_t N, uint8_t * block)
WriteCmd(cmd); WriteCmd(cmd);
while (N-- > 0) { while (N-- > 0) {
uint8_t u8 = *block++; uint8_t u8 = *block++;
CD_DATA; // CD_DATA;
write8(u8); write8(u8);
if (N && is8347) { if (N && is8347) {
cmd++; cmd++;
@@ -148,7 +148,7 @@ uint16_t MCUFRIEND_kbv::readReg(uint16_t reg, int8_t index)
CS_ACTIVE; CS_ACTIVE;
WriteCmd(reg); WriteCmd(reg);
setReadDir(); setReadDir();
CD_DATA; // CD_DATA;
delay(1); //1us should be adequate delay(1); //1us should be adequate
// READ_16(ret); // READ_16(ret);
do { ret = read16bits(); }while (--index >= 0); //need to test with SSD1963 do { ret = read16bits(); }while (--index >= 0); //need to test with SSD1963
@@ -277,7 +277,7 @@ int16_t MCUFRIEND_kbv::readGRAM(int16_t x, int16_t y, uint16_t * block, int16_t
CS_ACTIVE; CS_ACTIVE;
WriteCmd(_MR); WriteCmd(_MR);
setReadDir(); setReadDir();
CD_DATA; // CD_DATA;
if (_lcd_capable & READ_NODUMMY) { if (_lcd_capable & READ_NODUMMY) {
; ;
} else if ((_lcd_capable & MIPI_DCS_REV1) || _lcd_ID == 0x1289) { } else if ((_lcd_capable & MIPI_DCS_REV1) || _lcd_ID == 0x1289) {
@@ -481,6 +481,9 @@ void MCUFRIEND_kbv::setRotation(uint8_t r)
void MCUFRIEND_kbv::drawPixel(int16_t x, int16_t y, uint16_t color) void MCUFRIEND_kbv::drawPixel(int16_t x, int16_t y, uint16_t color)
{ {
#if 1
fillRect(x, y, 1, 1, color);
#else
// MCUFRIEND just plots at edge if you try to write outside of the box: // MCUFRIEND just plots at edge if you try to write outside of the box:
if (x < 0 || y < 0 || x >= width() || y >= height()) if (x < 0 || y < 0 || x >= width() || y >= height())
return; return;
@@ -501,6 +504,7 @@ void MCUFRIEND_kbv::drawPixel(int16_t x, int16_t y, uint16_t color)
if (is555) color = color565_to_555(color); if (is555) color = color565_to_555(color);
#endif #endif
WriteCmdData(_MW, color); WriteCmdData(_MW, color);
#endif
} }
void MCUFRIEND_kbv::setAddrWindow(int16_t x, int16_t y, int16_t x1, int16_t y1) void MCUFRIEND_kbv::setAddrWindow(int16_t x, int16_t y, int16_t x1, int16_t y1)
@@ -563,7 +567,6 @@ void MCUFRIEND_kbv::fillRect(int16_t x, int16_t y, int16_t w, int16_t h, uint16_
if (end > height()) if (end > height())
end = height(); end = height();
h = end - y; h = end - y;
setAddrWindow(x, y, x + w - 1, y + h - 1); setAddrWindow(x, y, x + w - 1, y + h - 1);
CS_ACTIVE; CS_ACTIVE;
WriteCmd(_MW); WriteCmd(_MW);
@@ -573,7 +576,7 @@ void MCUFRIEND_kbv::fillRect(int16_t x, int16_t y, int16_t w, int16_t h, uint16_
w = end; w = end;
} }
uint8_t hi = color >> 8, lo = color & 0xFF; uint8_t hi = color >> 8, lo = color & 0xFF;
CD_DATA; // CD_DATA;
while (h-- > 0) { while (h-- > 0) {
end = w; end = w;
#if USING_16BIT_BUS #if USING_16BIT_BUS
@@ -618,7 +621,7 @@ void MCUFRIEND_kbv::pushColors(uint16_t * block, int16_t n, bool first)
if (first) { if (first) {
WriteCmd(_MW); WriteCmd(_MW);
} }
CD_DATA; // CD_DATA;
while (n-- > 0) { while (n-- > 0) {
color = *block++; color = *block++;
#if defined(SUPPORT_9488_555) #if defined(SUPPORT_9488_555)
@@ -637,7 +640,7 @@ void MCUFRIEND_kbv::pushColors(uint8_t * block, int16_t n, bool first)
if (first) { if (first) {
WriteCmd(_MW); WriteCmd(_MW);
} }
CD_DATA; // CD_DATA;
while (n-- > 0) { while (n-- > 0) {
h = (*block++); h = (*block++);
l = (*block++); l = (*block++);
@@ -658,7 +661,7 @@ void MCUFRIEND_kbv::pushColors(const uint8_t * block, int16_t n, bool first, boo
if (first) { if (first) {
WriteCmd(_MW); WriteCmd(_MW);
} }
CD_DATA; // CD_DATA;
while (n-- > 0) { while (n-- > 0) {
l = pgm_read_byte(block++); l = pgm_read_byte(block++);
h = pgm_read_byte(block++); h = pgm_read_byte(block++);