Michel2/TFTLCD-Library
1
0
Fork 0
mirror of https://github.com/adafruit/TFTLCD-Library.git synced 2026-07-28 04:06:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge for readreg() and also, add ili9341 to graphicstest

Browse Source
This commit is contained in:
ladyada
2014-03-18 13:59:34 -04:00
parent 6bc43d3e67
commit 7fc3d6fb0a
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Adafruit_TFTLCD.cpp
+14 -11
View File
@@ -772,7 +772,7 @@ uint16_t Adafruit_TFTLCD::readID(void) {
uint8_t hi, lo;
id = readReg(0xD3);
uint16_t id = readReg(0xD3);
if (id == 0x9341) {
return id;
}
@@ -788,11 +788,13 @@ uint16_t Adafruit_TFTLCD::readID(void) {
setWriteDir(); // Restore LCD data port(s) to WRITE configuration
CS_IDLE;
return (hi << 8) | lo;
id = hi; id <<= 8; id |= lo;
return id;
}
uint32_t Adafruit_TFTLCD::readReg(uint8_t r) {
uint32_t id;
uint8_t x;
// try reading register #4
CS_ACTIVE;
@@ -801,21 +803,22 @@ uint32_t Adafruit_TFTLCD::readReg(uint8_t r) {
setReadDir(); // Set up LCD data port(s) for READ operations
CD_DATA;
delayMicroseconds(50);
id = read8(); // Do not merge or otherwise simplify
read8(x);
id = x; // Do not merge or otherwise simplify
id <<= 8; // these lines. It's an unfortunate
delayMicroseconds(50); // artifact of the macro substitution
id |= read8(); // shenanigans that are going on.
read8(x);
id |= x; // shenanigans that are going on.
id <<= 8; // these lines. It's an unfortunate
delayMicroseconds(50); // artifact of the macro substitution
id |= read8(); // shenanigans that are going on.
read8(x);
id |= x; // shenanigans that are going on.
id <<= 8; // these lines. It's an unfortunate
delayMicroseconds(50); // artifact of the macro substitution
id |= read8(); // shenanigans that are going on.
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);
//Serial.print("Read $"); Serial.print(r, HEX);
//Serial.print(":\t0x"); Serial.println(id, HEX);
return id;
}
examples/graphicstest/graphicstest.pde
+2
View File
@@ -63,6 +63,8 @@ void setup(void) {
Serial.println(F("Found ILI9328 LCD driver"));
} else if(identifier == 0x7575) {
Serial.println(F("Found HX8347G LCD driver"));
} else if(identifier == 0x9341) {
Serial.println(F("Found ILI9341 LCD driver"));
} else {
Serial.print(F("Unknown LCD driver chip: "));
Serial.println(identifier, HEX);