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

Merge remote-tracking branch 'refs/remotes/origin/test_555'

Browse Source
This commit is contained in:
prenticedavid
2017-05-16 13:43:20 +01:00
parent 8d66a3d7c3 24ac34b126
commit 5c6f1a5f91
1 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
MCUFRIEND_kbv.cpp
View File

@@ -15,6 +15,7 @@
//#define SUPPORT_9806
#define SUPPORT_B509_7793 //R61509, ST7793 +244 bytes
#define OFFSET_9327 32 //costs about 103 bytes, 0.08s
#define SUPPORT_9488_555 //costs +230 bytes, 0.03s / 0.19s
#include "MCUFRIEND_kbv.h"
#if defined(USE_SERIAL)
@@ -61,7 +62,13 @@ MCUFRIEND_kbv::MCUFRIEND_kbv(int CS, int RS, int WR, int RD, int RST):Adafruit_G
}
#endif
static uint8_t done_reset, is8347;
static uint8_t done_reset, is8347, is555;
static uint16_t color565_to_555(uint16_t color) {
return (color & 0xFFC0) | ((color & 0x1F) << 1) | ((color & 0x01)); //lose Green LSB, extend Blue LSB
}
static uint16_t color555_to_565(uint16_t color) {
return (color & 0xFFC0) | ((color & 0x0400) >> 5) | ((color & 0x3F) >> 1); //extend Green LSB
}
void MCUFRIEND_kbv::reset(void)
{
@@ -290,6 +297,9 @@ int16_t MCUFRIEND_kbv::readGRAM(int16_t x, int16_t y, uint16_t * block, int16_t
if (_lcd_capable & READ_BGR)
ret = (ret & 0x07E0) | (ret >> 11) | (ret << 11);
}
#if defined(SUPPORT_9488_555)
if (is555) ret = color555_to_565(ret);
#endif
*block++ = ret;
n--;
if (!(_lcd_capable & AUTO_READINC))
@@ -476,6 +486,9 @@ void MCUFRIEND_kbv::drawPixel(int16_t x, int16_t y, uint16_t color)
WriteCmdData(_MC, x);
WriteCmdData(_MP, y);
}
#if defined(SUPPORT_9488_555)
if (is555) color = color565_to_555(color);
#endif
WriteCmdData(_MW, color);
}
@@ -516,6 +529,9 @@ void MCUFRIEND_kbv::setAddrWindow(int16_t x, int16_t y, int16_t x1, int16_t y1)
void MCUFRIEND_kbv::fillRect(int16_t x, int16_t y, int16_t w, int16_t h, uint16_t color)
{
int16_t end;
#if defined(SUPPORT_9488_555)
if (is555) color = color565_to_555(color);
#endif
if (w < 0) {
w = -w;
x -= w;
@@ -594,6 +610,9 @@ void MCUFRIEND_kbv::pushColors(uint16_t * block, int16_t n, bool first)
CD_DATA;
while (n-- > 0) {
color = *block++;
#if defined(SUPPORT_9488_555)
if (is555) color = color565_to_555(color);
#endif
write16(color);
}
CS_IDLE;
@@ -612,6 +631,9 @@ void MCUFRIEND_kbv::pushColors(uint8_t * block, int16_t n, bool first)
h = (*block++);
l = (*block++);
color = h << 8 | l;
#if defined(SUPPORT_9488_555)
if (is555) color = color565_to_555(color);
#endif
write16(color);
}
CS_IDLE;
@@ -630,6 +652,9 @@ void MCUFRIEND_kbv::pushColors(const uint8_t * block, int16_t n, bool first, boo
l = pgm_read_byte(block++);
h = pgm_read_byte(block++);
color = (bigend) ? (l << 8 ) | h : (h << 8) | l;
#if defined(SUPPORT_9488_555)
if (is555) color = color565_to_555(color);
#endif
write16(color);
}
CS_IDLE;
@@ -2465,4 +2490,16 @@ case 0x4532: // thanks Leodino
}
setRotation(0); //PORTRAIT
invertDisplay(false);
#if defined(SUPPORT_9488_555)
if (_lcd_ID == 0x9488) {
is555 = 0;
drawPixel(0, 0, 0xFFE0);
if (readPixel(0, 0) == 0xFF1F) {
uint8_t pixfmt = 0x06;
pushCommand(0x3A, &pixfmt, 1);
_lcd_capable &= ~READ_24BITS;
is555 = 1;
}
}
#endif
}