Skip to content

Commit

Permalink
Various ILI9341 fixes
Browse files Browse the repository at this point in the history 
- added delay to reset command
- fixed fast V/H lines
- added support for extended registers and their correct initialization
- added support for ILI9341_MIRROR_X and ILI9341_MIRROR_Y defines to allow
  customization of mirroring during compile time
- added writeRegister40 method
- readReg renamed to readReg8 and also added readReg16 and readReg32
- consolidated usage of CS, now is the CS also set inactive in
  write8inline and read8inline macros
- fixed some spurious whitespaces

Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
  • Loading branch information
@yarda
yarda committed Sep 16, 2015
1 parent 97a8285 commit bdb2652
Show file tree
Hide file tree
Showing 4 changed files with 139 additions and 38 deletions.
145 changes: 114 additions & 31 deletions Adafruit_TFTLCD.cpp
View file
Expand Up @@ -144,7 +144,7 @@ static const uint8_t HX8347G_regValues[] PROGMEM = {
0x1A , 0x02,
0x24 , 0x61,
0x25 , 0x5C,

0x18 , 0x36,
0x19 , 0x01,
0x1F , 0x88,
Expand Down Expand Up @@ -278,16 +278,38 @@ void Adafruit_TFTLCD::begin(uint16_t id) {
delay(50);
writeRegister8(ILI9341_DISPLAYOFF, 0);

/* On my ILI9341 the pump ratio control register is set to 0 after
the reset. According to the datasheet this value is 'reserved',
and the register should be set to 0x20 (i.e. 2xVCI).
To be safe also setting other extended registers to their default values
according to the datasheet. If extended registers are not available,
the settings should be harmless and treated as NOP commands
(acording to the datasheet :).
*/
writeRegister40(ILI9341_POWERCONTROLA, 0x392C0034, 0x02);
writeRegister24(ILI9341_POWERCONTROLB, 0x00A2F0);
writeRegister24(ILI9341_DRVTIMINGCONTROLA, 0x84117A);
writeRegister16(ILI9341_DRVTIMINGCONTROLB, 0x6600);
writeRegister32(ILI9341_PWRONCTRLSEQUENCE, 0x55012301);

writeRegister8(ILI9341_PUMPRATIOCONTROL, 0x20);
writeRegister8(ILI9341_POWERCONTROL1, 0x23);
writeRegister8(ILI9341_POWERCONTROL2, 0x10);
writeRegister16(ILI9341_VCOMCONTROL1, 0x2B2B);
writeRegister8(ILI9341_VCOMCONTROL2, 0xC0);
writeRegister8(ILI9341_MEMCONTROL, ILI9341_MADCTL_MY | ILI9341_MADCTL_BGR);
d = 0;
#ifdef ILI9341_MIRROR_X
d |= ILI9341_MADCTL_MX;
#endif
#ifdef ILI9341_MIRROR_Y
d |= ILI9341_MADCTL_MY;
#endif
writeRegister8(ILI9341_MEMCONTROL, d | ILI9341_MADCTL_BGR);
writeRegister8(ILI9341_PIXELFORMAT, 0x55);
writeRegister16(ILI9341_FRAMECONTROL, 0x001B);

writeRegister8(ILI9341_ENTRYMODE, 0x07);
/* writeRegister32(ILI9341_DISPLAYFUNC, 0x0A822700);*/
// writeRegister32(ILI9341_DISPLAYFUNC, 0x0A822700);

writeRegister8(ILI9341_SLEEPOUT, 0);
delay(150);
Expand All @@ -304,25 +326,25 @@ void Adafruit_TFTLCD::begin(uint16_t id) {
uint8_t r = pgm_read_byte(&HX8357D_regValues[i++]);
uint8_t len = pgm_read_byte(&HX8357D_regValues[i++]);
if(r == TFTLCD_DELAY) {
delay(len);
delay(len);
} else {
//Serial.print("Register $"); Serial.print(r, HEX);
//Serial.print(" datalen "); Serial.println(len);

CS_ACTIVE;
CD_COMMAND;
write8(r);
CD_DATA;
for (uint8_t d=0; d<len; d++) {
uint8_t x = pgm_read_byte(&HX8357D_regValues[i++]);
write8(x);
}
CS_IDLE;
//Serial.print("Register $"); Serial.print(r, HEX);
//Serial.print(" datalen "); Serial.println(len);

CS_ACTIVE;
CD_COMMAND;
write8(r);
CD_DATA;
for (uint8_t d=0; d<len; d++) {
uint8_t x = pgm_read_byte(&HX8357D_regValues[i++]);
write8(x);
}
CS_IDLE;

}
}
return;

} else if(id == 0x7575) {

uint8_t a, d;
Expand Down Expand Up @@ -368,6 +390,7 @@ void Adafruit_TFTLCD::reset(void) {
write8(0x00);
for(uint8_t i=0; i<3; i++) WR_STROBE; // Three extra 0x00s
CS_IDLE;
delay(5); // A bit delay for reset to complete
}

// Sets the LCD address window (and address counter, on 932X).
Expand Down Expand Up @@ -488,6 +511,7 @@ void Adafruit_TFTLCD::flood(uint16_t color, uint32_t len) {
write8(hi);
write8(lo);
len--;
CS_ACTIVE;

blocks = (uint16_t)(len / 64); // 64 pixels/block
if(hi == lo) {
Expand Down Expand Up @@ -542,7 +566,7 @@ void Adafruit_TFTLCD::drawFastHLine(int16_t x, int16_t y, int16_t length,

setAddrWindow(x, y, x2, y);
flood(color, length);
if(driver == ID_932X) setAddrWindow(0, 0, _width - 1, _height - 1);
if(driver == ID_932X || driver == ID_9341) setAddrWindow(0, 0, _width - 1, _height - 1);
else setLR();
}

Expand All @@ -566,7 +590,7 @@ void Adafruit_TFTLCD::drawFastVLine(int16_t x, int16_t y, int16_t length,

setAddrWindow(x, y, x, y2);
flood(color, length);
if(driver == ID_932X) setAddrWindow(0, 0, _width - 1, _height - 1);
if(driver == ID_932X || driver == ID_9341) setAddrWindow(0, 0, _width - 1, _height - 1);
else setLR();
}

Expand Down Expand Up @@ -597,12 +621,12 @@ void Adafruit_TFTLCD::fillRect(int16_t x1, int16_t y1, int16_t w, int16_t h,

setAddrWindow(x1, y1, x2, y2);
flood(fillcolor, (uint32_t)w * (uint32_t)h);
if(driver == ID_932X) setAddrWindow(0, 0, _width - 1, _height - 1);
if(driver == ID_932X || driver == ID_9341) setAddrWindow(0, 0, _width - 1, _height - 1);
else setLR();
}

void Adafruit_TFTLCD::fillScreen(uint16_t color) {

if(driver == ID_932X) {

// For the 932X, a full-screen address window is already the default
Expand Down Expand Up @@ -878,28 +902,28 @@ uint16_t Adafruit_TFTLCD::readID(void) {
/*
for (uint8_t i=0; i<128; i++) {
Serial.print("$"); Serial.print(i, HEX);
Serial.print(" = 0x"); Serial.println(readReg(i), HEX);
Serial.print(" = 0x"); Serial.println(readReg32(i), HEX);
}
*/

if (readReg(0x04) == 0x8000) { // eh close enough
if (readReg32(0x04) == 0x8000) { // eh close enough
// setc!
/*
Serial.println("!");
for (uint8_t i=0; i<254; i++) {
Serial.print("$"); Serial.print(i, HEX);
Serial.print(" = 0x"); Serial.println(readReg(i), HEX);
Serial.print(" = 0x"); Serial.println(readReg32(i), HEX);
}
*/
writeRegister24(HX8357D_SETC, 0xFF8357);
delay(300);
//Serial.println(readReg(0xD0), HEX);
if (readReg(0xD0) == 0x990000) {
//Serial.println(readReg32(0xD0), HEX);
if (readReg32(0xD0) == 0x990000) {
return 0x8357;
}
}

uint16_t id = readReg(0xD3);
uint16_t id = readReg32(0xD3);
if (id == 0x9341) {
return id;
}
Expand All @@ -919,7 +943,50 @@ uint16_t Adafruit_TFTLCD::readID(void) {
return id;
}

uint32_t Adafruit_TFTLCD::readReg(uint8_t r) {
uint8_t Adafruit_TFTLCD::readReg8(uint8_t r) {
uint8_t id;

// try reading register #4
CS_ACTIVE;
CD_COMMAND;
write8(r);
setReadDir(); // Set up LCD data port(s) for READ operations
CD_DATA;
delayMicroseconds(50);
read8(id);
CS_IDLE;
setWriteDir(); // Restore LCD data port(s) to WRITE configuration

//Serial.print("Read $"); Serial.print(r, HEX);
//Serial.print(":\t0x"); Serial.println(id, HEX);
return id;
}

uint16_t Adafruit_TFTLCD::readReg16(uint8_t r) {
uint16_t id;
uint8_t x;

// try reading register #4
CS_ACTIVE;
CD_COMMAND;
write8(r);
setReadDir(); // Set up LCD data port(s) for READ operations
CD_DATA;
delayMicroseconds(50);
read8(x);
id = x; // Do not merge or otherwise simplify
id <<= 8; // these lines. It's an unfortunate
read8(x);
id |= x; // shenanigans that are going on.
CS_IDLE;
setWriteDir(); // Restore LCD data port(s) to WRITE configuration

//Serial.print("Read $"); Serial.print(r, HEX);
//Serial.print(":\t0x"); Serial.println(id, HEX);
return id;
}

uint32_t Adafruit_TFTLCD::readReg32(uint8_t r) {
uint32_t id;
uint8_t x;

Expand All @@ -944,7 +1011,7 @@ uint32_t Adafruit_TFTLCD::readReg(uint8_t r) {
CS_IDLE;
setWriteDir(); // Restore LCD data port(s) to WRITE configuration

//Serial.print("Read $"); Serial.print(r, HEX);
//Serial.print("Read $"); Serial.print(r, HEX);
//Serial.print(":\t0x"); Serial.println(id, HEX);
return id;
}
Expand Down Expand Up @@ -1014,7 +1081,6 @@ void Adafruit_TFTLCD::writeRegister24(uint8_t r, uint32_t d) {
delayMicroseconds(10);
write8(d);
CS_IDLE;

}


Expand All @@ -1032,5 +1098,22 @@ void Adafruit_TFTLCD::writeRegister32(uint8_t r, uint32_t d) {
delayMicroseconds(10);
write8(d);
CS_IDLE;
}

void Adafruit_TFTLCD::writeRegister40(uint8_t r, uint32_t d1, uint8_t d2) {
CS_ACTIVE;
CD_COMMAND;
write8(r);
CD_DATA;
delayMicroseconds(10);
write8(d1 >> 24);
delayMicroseconds(10);
write8(d1 >> 16);
delayMicroseconds(10);
write8(d1 >> 8);
delayMicroseconds(10);
write8(d1);
delayMicroseconds(10);
write8(d2);
CS_IDLE;
}
9 changes: 8 additions & 1 deletion Adafruit_TFTLCD.h
View file
Expand Up @@ -19,6 +19,10 @@

//#define USE_ADAFRUIT_SHIELD_PINOUT 1

// Some ILI9341 based kits have mirrored X or Y, uncomment/comment respectively
//# define ILI9341_MIRROR_X 1
# define ILI9341_MIRROR_Y 1

class Adafruit_TFTLCD : public Adafruit_GFX {

public:
Expand All @@ -43,7 +47,9 @@ class Adafruit_TFTLCD : public Adafruit_GFX {
uint16_t color565(uint8_t r, uint8_t g, uint8_t b),
readPixel(int16_t x, int16_t y),
readID(void);
uint32_t readReg(uint8_t r);
uint8_t readReg8(uint8_t r);
uint16_t readReg16(uint8_t r);
uint32_t readReg32(uint8_t r);

private:

Expand All @@ -67,6 +73,7 @@ class Adafruit_TFTLCD : public Adafruit_GFX {
#endif
writeRegister24(uint8_t a, uint32_t d),
writeRegister32(uint8_t a, uint32_t d),
writeRegister40(uint8_t a, uint32_t d1, uint8_t d2),
#ifndef writeRegisterPair
writeRegisterPair(uint8_t aH, uint8_t aL, uint16_t d),
#endif
Expand Down
8 changes: 6 additions & 2 deletions pin_magic.h
View file
Expand Up @@ -108,14 +108,18 @@
#else // Uno w/Breakout board

#define write8inline(d) { \
CS_ACTIVE; \
PORTD = (PORTD & B00000011) | ((d) & B11111100); \
PORTB = (PORTB & B11111100) | ((d) & B00000011); \
WR_STROBE; }
WR_STROBE; \
CS_IDLE;}
#define read8inline(result) { \
CS_ACTIVE; \
RD_ACTIVE; \
DELAY7; \
result = (PIND & B11111100) | (PINB & B00000011); \
RD_IDLE; }
RD_IDLE; \
CS_IDLE;}
#define setWriteDirInline() { DDRD |= B11111100; DDRB |= B00000011; }
#define setReadDirInline() { DDRD &= ~B11111100; DDRB &= ~B00000011; }

Expand Down
15 changes: 11 additions & 4 deletions registers.h
View file
Expand Up @@ -80,10 +80,17 @@
#define ILI9341_ENTRYMODE 0xB7
#define ILI9341_POWERCONTROL1 0xC0
#define ILI9341_POWERCONTROL2 0xC1
#define ILI9341_VCOMCONTROL1 0xC5
#define ILI9341_VCOMCONTROL2 0xC7
#define ILI9341_MEMCONTROL 0x36
#define ILI9341_MADCTL 0x36
#define ILI9341_VCOMCONTROL1 0xC5
#define ILI9341_VCOMCONTROL2 0xC7
#define ILI9341_MEMCONTROL 0x36
#define ILI9341_MADCTL 0x36
#define ILI9341_POWERCONTROLA 0xCB
#define ILI9341_POWERCONTROLB 0xCF
#define ILI9341_DRVTIMINGCONTROLA 0xE8
#define ILI9341_DRVTIMINGCONTROLB 0xEA
#define ILI9341_PWRONCTRLSEQUENCE 0xED
#define ILI9341_ENABLE3G 0xF2
#define ILI9341_PUMPRATIOCONTROL 0xF7

#define ILI9341_MADCTL_MY 0x80
#define ILI9341_MADCTL_MX 0x40
Expand Down

0 comments on commit bdb2652

Please sign in to comment.