From 1bd4b1900eb884a71207c6cb1fec7b29ef444496 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Tue, 20 Aug 2019 12:15:56 +0200 Subject: [PATCH] Document display libraries Document display libraries --- .../README.md | 0 .../SSD1351.cpp | 0 .../SSD1351.h | 0 .../Tiger.c | 0 .../Tiger.rgb | Bin .../keywords.txt | 0 .../library.properties | 0 .../spi_register.h | 0 lib/{FT6236 => FT6236-gemu-1.0}/FT6236.cpp | 318 +++++++++--------- lib/{FT6236 => FT6236-gemu-1.0}/FT6236.h | 56 +-- .../ILI9488.cpp | 0 .../ILI9488.h | 0 .../README.md | 0 .../examples/graphicstest/graphicstest.ino | 0 .../keywords.txt | 0 .../library.properties | 0 .../spi_register.h | 0 .../RA8876.cpp | 0 .../RA8876.h | 0 .../README.md | 0 .../keywords.txt | 0 .../library.properties | 0 .../spi_register.h | 0 23 files changed, 187 insertions(+), 187 deletions(-) rename lib/{SSD1351 => Adafruit_SSD1351-gemu-1.0}/README.md (100%) rename lib/{SSD1351 => Adafruit_SSD1351-gemu-1.0}/SSD1351.cpp (100%) rename lib/{SSD1351 => Adafruit_SSD1351-gemu-1.0}/SSD1351.h (100%) rename lib/{SSD1351 => Adafruit_SSD1351-gemu-1.0}/Tiger.c (100%) rename lib/{SSD1351 => Adafruit_SSD1351-gemu-1.0}/Tiger.rgb (100%) rename lib/{SSD1351 => Adafruit_SSD1351-gemu-1.0}/keywords.txt (100%) rename lib/{SSD1351 => Adafruit_SSD1351-gemu-1.0}/library.properties (100%) rename lib/{ILI9488 => Adafruit_SSD1351-gemu-1.0}/spi_register.h (100%) mode change 100755 => 100644 rename lib/{FT6236 => FT6236-gemu-1.0}/FT6236.cpp (96%) mode change 100755 => 100644 rename lib/{FT6236 => FT6236-gemu-1.0}/FT6236.h (97%) mode change 100755 => 100644 rename lib/{ILI9488 => JaretBurkett_ILI9488-gemu-1.0}/ILI9488.cpp (100%) mode change 100755 => 100644 rename lib/{ILI9488 => JaretBurkett_ILI9488-gemu-1.0}/ILI9488.h (100%) mode change 100755 => 100644 rename lib/{ILI9488 => JaretBurkett_ILI9488-gemu-1.0}/README.md (100%) mode change 100755 => 100644 rename lib/{ILI9488 => JaretBurkett_ILI9488-gemu-1.0}/examples/graphicstest/graphicstest.ino (100%) mode change 100755 => 100644 rename lib/{ILI9488 => JaretBurkett_ILI9488-gemu-1.0}/keywords.txt (100%) mode change 100755 => 100644 rename lib/{ILI9488 => JaretBurkett_ILI9488-gemu-1.0}/library.properties (100%) mode change 100755 => 100644 rename lib/{RA8876 => JaretBurkett_ILI9488-gemu-1.0}/spi_register.h (100%) rename lib/{RA8876 => Xlatb_RA8876-gemu-1.0}/RA8876.cpp (100%) rename lib/{RA8876 => Xlatb_RA8876-gemu-1.0}/RA8876.h (100%) rename lib/{RA8876 => Xlatb_RA8876-gemu-1.0}/README.md (100%) rename lib/{RA8876 => Xlatb_RA8876-gemu-1.0}/keywords.txt (100%) rename lib/{RA8876 => Xlatb_RA8876-gemu-1.0}/library.properties (100%) rename lib/{SSD1351 => Xlatb_RA8876-gemu-1.0}/spi_register.h (100%) diff --git a/lib/SSD1351/README.md b/lib/Adafruit_SSD1351-gemu-1.0/README.md similarity index 100% rename from lib/SSD1351/README.md rename to lib/Adafruit_SSD1351-gemu-1.0/README.md diff --git a/lib/SSD1351/SSD1351.cpp b/lib/Adafruit_SSD1351-gemu-1.0/SSD1351.cpp similarity index 100% rename from lib/SSD1351/SSD1351.cpp rename to lib/Adafruit_SSD1351-gemu-1.0/SSD1351.cpp diff --git a/lib/SSD1351/SSD1351.h b/lib/Adafruit_SSD1351-gemu-1.0/SSD1351.h similarity index 100% rename from lib/SSD1351/SSD1351.h rename to lib/Adafruit_SSD1351-gemu-1.0/SSD1351.h diff --git a/lib/SSD1351/Tiger.c b/lib/Adafruit_SSD1351-gemu-1.0/Tiger.c similarity index 100% rename from lib/SSD1351/Tiger.c rename to lib/Adafruit_SSD1351-gemu-1.0/Tiger.c diff --git a/lib/SSD1351/Tiger.rgb b/lib/Adafruit_SSD1351-gemu-1.0/Tiger.rgb similarity index 100% rename from lib/SSD1351/Tiger.rgb rename to lib/Adafruit_SSD1351-gemu-1.0/Tiger.rgb diff --git a/lib/SSD1351/keywords.txt b/lib/Adafruit_SSD1351-gemu-1.0/keywords.txt similarity index 100% rename from lib/SSD1351/keywords.txt rename to lib/Adafruit_SSD1351-gemu-1.0/keywords.txt diff --git a/lib/SSD1351/library.properties b/lib/Adafruit_SSD1351-gemu-1.0/library.properties similarity index 100% rename from lib/SSD1351/library.properties rename to lib/Adafruit_SSD1351-gemu-1.0/library.properties diff --git a/lib/ILI9488/spi_register.h b/lib/Adafruit_SSD1351-gemu-1.0/spi_register.h old mode 100755 new mode 100644 similarity index 100% rename from lib/ILI9488/spi_register.h rename to lib/Adafruit_SSD1351-gemu-1.0/spi_register.h diff --git a/lib/FT6236/FT6236.cpp b/lib/FT6236-gemu-1.0/FT6236.cpp old mode 100755 new mode 100644 similarity index 96% rename from lib/FT6236/FT6236.cpp rename to lib/FT6236-gemu-1.0/FT6236.cpp index 57014d7e2..28aeff091 --- a/lib/FT6236/FT6236.cpp +++ b/lib/FT6236-gemu-1.0/FT6236.cpp @@ -1,159 +1,159 @@ -#include -#include - -/* - * This is a static library so we need to make sure we process stuff as quick as possible - * as we do not want it to interfere with the RTOS by delaying routines unnecessarily. - * So, no delay()'s etc and opto the code as much as possible. - * ^^^ Need to be on TODO list to go through and make sure everything is as opto as - * possible - */ - -uint8_t FT6236buf[FT6236_BUFFER_SIZE]; -uint8_t FT6236_i2c_addr = 0x38; -uint8_t lenLibVersion = 0; -uint8_t firmwareId = 0; - -struct tbuttonregister { - uint16_t BUTTONID; - uint16_t xmin; - uint16_t xmax; - uint16_t ymin; - uint16_t ymax; -} buttonregister[FT6236_MAX_BUTTONS]; // we're limiting to 16 buttons for now - can reduce or increase later as needed. - -uint8_t buttoncount = 0; - -void FT6236flushbuttonregister(void) { - uint16_t bid; - for (bid=0;bid 0) { - uint16_t x = tl[0].x; - uint16_t y = tl[0].y; - for (bid=0;bid= buttonregister[bid].xmin) { - if (x <= buttonregister[bid].xmax) { - if (y >= buttonregister[bid].ymin) { - if (y <= buttonregister[bid].ymax) { - return buttonregister[bid].BUTTONID; - } - } - } - } - } - } - return 0; -} - -void FT6236begin(uint8_t i2c_addr) { - FT6236_i2c_addr=i2c_addr; - Wire.begin(FT6236_i2c_addr); - FT6236writeTouchRegister(0,FT6236_MODE_NORMAL); - lenLibVersion = FT6236readTouchAddr(0x0a1, FT6236buf, 2 ); - firmwareId = FT6236readTouchRegister( 0xa6 ); -} - -void FT6236writeTouchRegister(uint8_t reg, uint8_t val) -{ - Wire.beginTransmission(FT6236_i2c_addr); - Wire.write(reg); // register 0 - Wire.write(val); // value - Wire.endTransmission(); -} - -uint8_t FT6236readTouchRegister(uint8_t reg) -{ - Wire.beginTransmission(FT6236_i2c_addr); - Wire.write(reg); // register 0 - uint8_t retVal = Wire.endTransmission(); - uint8_t returned = Wire.requestFrom(FT6236_i2c_addr,uint8_t(1)); // request 6 uint8_ts from slave device #2 - if (Wire.available()) - { - retVal = Wire.read(); - } - return retVal; -} - -uint8_t FT6236readTouchAddr( uint8_t regAddr, uint8_t * pBuf, uint8_t len ) -{ - Wire.beginTransmission(FT6236_i2c_addr); - Wire.write( regAddr ); // register 0 - uint8_t retVal = Wire.endTransmission(); - uint8_t returned = Wire.requestFrom(FT6236_i2c_addr, len); // request 1 bytes from slave device #2 - uint8_t i; - for (i = 0; (i < len) && Wire.available(); i++) { - pBuf[i] = Wire.read(); - } - return i; -} - -uint8_t FT6236readTouchLocation( TouchLocation * pLoc, uint8_t num ) -{ - uint8_t retVal = 0; - uint8_t i; - uint8_t k; - do - { - if (!pLoc) break; // must have a buffer - if (!num) break; // must be able to take at least one - uint8_t status = FT6236readTouchRegister(2); - static uint8_t tbuf[40]; - if ((status & 0x0f) == 0) break; // no points detected - uint8_t hitPoints = status & 0x0f; - FT6236readTouchAddr( 0x03, tbuf, hitPoints*6); - for (k=0,i = 0; (i < hitPoints*6)&&(k < num); k++, i += 6) { - pLoc[k].x = (tbuf[i+0] & 0x0f) << 8 | tbuf[i+1]; - pLoc[k].y = (tbuf[i+2] & 0x0f) << 8 | tbuf[i+3]; - } - retVal = k; - } while (0); - return retVal; -} - -uint32_t FT6236dist(const TouchLocation & loc) -{ - uint32_t retVal = 0; - uint32_t x = loc.x; - uint32_t y = loc.y; - retVal = x*x + y*y; - return retVal; -} - - -/* -uint32_t FT6236dist(const TouchLocation & loc1, const TouchLocation & loc2) -{ - uint32_t retVal = 0; - uint32_t x = loc1.x - loc2.x; - uint32_t y = loc1.y - loc2.y; - retVal = sqrt(x*x + y*y); - return retVal; -} -*/ - -bool FT6236sameLoc( const TouchLocation & loc, const TouchLocation & loc2 ) -{ - return FT6236dist(loc,loc2) < 50; -} +#include +#include + +/* + * This is a static library so we need to make sure we process stuff as quick as possible + * as we do not want it to interfere with the RTOS by delaying routines unnecessarily. + * So, no delay()'s etc and opto the code as much as possible. + * ^^^ Need to be on TODO list to go through and make sure everything is as opto as + * possible + */ + +uint8_t FT6236buf[FT6236_BUFFER_SIZE]; +uint8_t FT6236_i2c_addr = 0x38; +uint8_t lenLibVersion = 0; +uint8_t firmwareId = 0; + +struct tbuttonregister { + uint16_t BUTTONID; + uint16_t xmin; + uint16_t xmax; + uint16_t ymin; + uint16_t ymax; +} buttonregister[FT6236_MAX_BUTTONS]; // we're limiting to 16 buttons for now - can reduce or increase later as needed. + +uint8_t buttoncount = 0; + +void FT6236flushbuttonregister(void) { + uint16_t bid; + for (bid=0;bid 0) { + uint16_t x = tl[0].x; + uint16_t y = tl[0].y; + for (bid=0;bid= buttonregister[bid].xmin) { + if (x <= buttonregister[bid].xmax) { + if (y >= buttonregister[bid].ymin) { + if (y <= buttonregister[bid].ymax) { + return buttonregister[bid].BUTTONID; + } + } + } + } + } + } + return 0; +} + +void FT6236begin(uint8_t i2c_addr) { + FT6236_i2c_addr=i2c_addr; + Wire.begin(FT6236_i2c_addr); + FT6236writeTouchRegister(0,FT6236_MODE_NORMAL); + lenLibVersion = FT6236readTouchAddr(0x0a1, FT6236buf, 2 ); + firmwareId = FT6236readTouchRegister( 0xa6 ); +} + +void FT6236writeTouchRegister(uint8_t reg, uint8_t val) +{ + Wire.beginTransmission(FT6236_i2c_addr); + Wire.write(reg); // register 0 + Wire.write(val); // value + Wire.endTransmission(); +} + +uint8_t FT6236readTouchRegister(uint8_t reg) +{ + Wire.beginTransmission(FT6236_i2c_addr); + Wire.write(reg); // register 0 + uint8_t retVal = Wire.endTransmission(); + uint8_t returned = Wire.requestFrom(FT6236_i2c_addr,uint8_t(1)); // request 6 uint8_ts from slave device #2 + if (Wire.available()) + { + retVal = Wire.read(); + } + return retVal; +} + +uint8_t FT6236readTouchAddr( uint8_t regAddr, uint8_t * pBuf, uint8_t len ) +{ + Wire.beginTransmission(FT6236_i2c_addr); + Wire.write( regAddr ); // register 0 + uint8_t retVal = Wire.endTransmission(); + uint8_t returned = Wire.requestFrom(FT6236_i2c_addr, len); // request 1 bytes from slave device #2 + uint8_t i; + for (i = 0; (i < len) && Wire.available(); i++) { + pBuf[i] = Wire.read(); + } + return i; +} + +uint8_t FT6236readTouchLocation( TouchLocation * pLoc, uint8_t num ) +{ + uint8_t retVal = 0; + uint8_t i; + uint8_t k; + do + { + if (!pLoc) break; // must have a buffer + if (!num) break; // must be able to take at least one + uint8_t status = FT6236readTouchRegister(2); + static uint8_t tbuf[40]; + if ((status & 0x0f) == 0) break; // no points detected + uint8_t hitPoints = status & 0x0f; + FT6236readTouchAddr( 0x03, tbuf, hitPoints*6); + for (k=0,i = 0; (i < hitPoints*6)&&(k < num); k++, i += 6) { + pLoc[k].x = (tbuf[i+0] & 0x0f) << 8 | tbuf[i+1]; + pLoc[k].y = (tbuf[i+2] & 0x0f) << 8 | tbuf[i+3]; + } + retVal = k; + } while (0); + return retVal; +} + +uint32_t FT6236dist(const TouchLocation & loc) +{ + uint32_t retVal = 0; + uint32_t x = loc.x; + uint32_t y = loc.y; + retVal = x*x + y*y; + return retVal; +} + + +/* +uint32_t FT6236dist(const TouchLocation & loc1, const TouchLocation & loc2) +{ + uint32_t retVal = 0; + uint32_t x = loc1.x - loc2.x; + uint32_t y = loc1.y - loc2.y; + retVal = sqrt(x*x + y*y); + return retVal; +} +*/ + +bool FT6236sameLoc( const TouchLocation & loc, const TouchLocation & loc2 ) +{ + return FT6236dist(loc,loc2) < 50; +} diff --git a/lib/FT6236/FT6236.h b/lib/FT6236-gemu-1.0/FT6236.h old mode 100755 new mode 100644 similarity index 97% rename from lib/FT6236/FT6236.h rename to lib/FT6236-gemu-1.0/FT6236.h index aadaa1649..601d9c67e --- a/lib/FT6236/FT6236.h +++ b/lib/FT6236-gemu-1.0/FT6236.h @@ -1,28 +1,28 @@ -#ifndef FT6236 -#define FT6236 - -#define FT6236_MODE_NORMAL 0x00 -#define FT6236_MODE_TEST 0x04 -#define FT6236_MODE_SYSTEM 0x01 - -#define FT6236_BUFFER_SIZE 0x1E // 30 bytes buffer -#define FT6236_MAX_BUTTONS 1 // 50 buttons should be enough for just about any page - -struct TouchLocation { - uint16_t y; // we swop x and y in position because we're using the screen in portrait mode - uint16_t x; -}; - -void FT6236flushbuttonregister(void); -void FT6236registerbutton(uint16_t buttonid,uint16_t xmin,uint16_t ymin,uint16_t xmax, uint16_t ymax); -uint16_t FT6236GetButtonMask(void); -void FT6236begin(uint8_t i2c_addr); -uint8_t FT6236readTouchRegister( uint8_t reg ); -uint8_t FT6236readTouchLocation( TouchLocation * pLoc, uint8_t num ); -uint8_t FT6236readTouchAddr( uint8_t regAddr, uint8_t * pBuf, uint8_t len ); -void FT6236writeTouchRegister( uint8_t reg, uint8_t val); -uint32_t FT6236dist(const TouchLocation & loc); -uint32_t FT6236dist(const TouchLocation & loc1, const TouchLocation & loc2); -bool FT6236sameLoc( const TouchLocation & loc, const TouchLocation & loc2 ); - -#endif +#ifndef FT6236 +#define FT6236 + +#define FT6236_MODE_NORMAL 0x00 +#define FT6236_MODE_TEST 0x04 +#define FT6236_MODE_SYSTEM 0x01 + +#define FT6236_BUFFER_SIZE 0x1E // 30 bytes buffer +#define FT6236_MAX_BUTTONS 1 // 50 buttons should be enough for just about any page + +struct TouchLocation { + uint16_t y; // we swop x and y in position because we're using the screen in portrait mode + uint16_t x; +}; + +void FT6236flushbuttonregister(void); +void FT6236registerbutton(uint16_t buttonid,uint16_t xmin,uint16_t ymin,uint16_t xmax, uint16_t ymax); +uint16_t FT6236GetButtonMask(void); +void FT6236begin(uint8_t i2c_addr); +uint8_t FT6236readTouchRegister( uint8_t reg ); +uint8_t FT6236readTouchLocation( TouchLocation * pLoc, uint8_t num ); +uint8_t FT6236readTouchAddr( uint8_t regAddr, uint8_t * pBuf, uint8_t len ); +void FT6236writeTouchRegister( uint8_t reg, uint8_t val); +uint32_t FT6236dist(const TouchLocation & loc); +uint32_t FT6236dist(const TouchLocation & loc1, const TouchLocation & loc2); +bool FT6236sameLoc( const TouchLocation & loc, const TouchLocation & loc2 ); + +#endif diff --git a/lib/ILI9488/ILI9488.cpp b/lib/JaretBurkett_ILI9488-gemu-1.0/ILI9488.cpp old mode 100755 new mode 100644 similarity index 100% rename from lib/ILI9488/ILI9488.cpp rename to lib/JaretBurkett_ILI9488-gemu-1.0/ILI9488.cpp diff --git a/lib/ILI9488/ILI9488.h b/lib/JaretBurkett_ILI9488-gemu-1.0/ILI9488.h old mode 100755 new mode 100644 similarity index 100% rename from lib/ILI9488/ILI9488.h rename to lib/JaretBurkett_ILI9488-gemu-1.0/ILI9488.h diff --git a/lib/ILI9488/README.md b/lib/JaretBurkett_ILI9488-gemu-1.0/README.md old mode 100755 new mode 100644 similarity index 100% rename from lib/ILI9488/README.md rename to lib/JaretBurkett_ILI9488-gemu-1.0/README.md diff --git a/lib/ILI9488/examples/graphicstest/graphicstest.ino b/lib/JaretBurkett_ILI9488-gemu-1.0/examples/graphicstest/graphicstest.ino old mode 100755 new mode 100644 similarity index 100% rename from lib/ILI9488/examples/graphicstest/graphicstest.ino rename to lib/JaretBurkett_ILI9488-gemu-1.0/examples/graphicstest/graphicstest.ino diff --git a/lib/ILI9488/keywords.txt b/lib/JaretBurkett_ILI9488-gemu-1.0/keywords.txt old mode 100755 new mode 100644 similarity index 100% rename from lib/ILI9488/keywords.txt rename to lib/JaretBurkett_ILI9488-gemu-1.0/keywords.txt diff --git a/lib/ILI9488/library.properties b/lib/JaretBurkett_ILI9488-gemu-1.0/library.properties old mode 100755 new mode 100644 similarity index 100% rename from lib/ILI9488/library.properties rename to lib/JaretBurkett_ILI9488-gemu-1.0/library.properties diff --git a/lib/RA8876/spi_register.h b/lib/JaretBurkett_ILI9488-gemu-1.0/spi_register.h similarity index 100% rename from lib/RA8876/spi_register.h rename to lib/JaretBurkett_ILI9488-gemu-1.0/spi_register.h diff --git a/lib/RA8876/RA8876.cpp b/lib/Xlatb_RA8876-gemu-1.0/RA8876.cpp similarity index 100% rename from lib/RA8876/RA8876.cpp rename to lib/Xlatb_RA8876-gemu-1.0/RA8876.cpp diff --git a/lib/RA8876/RA8876.h b/lib/Xlatb_RA8876-gemu-1.0/RA8876.h similarity index 100% rename from lib/RA8876/RA8876.h rename to lib/Xlatb_RA8876-gemu-1.0/RA8876.h diff --git a/lib/RA8876/README.md b/lib/Xlatb_RA8876-gemu-1.0/README.md similarity index 100% rename from lib/RA8876/README.md rename to lib/Xlatb_RA8876-gemu-1.0/README.md diff --git a/lib/RA8876/keywords.txt b/lib/Xlatb_RA8876-gemu-1.0/keywords.txt similarity index 100% rename from lib/RA8876/keywords.txt rename to lib/Xlatb_RA8876-gemu-1.0/keywords.txt diff --git a/lib/RA8876/library.properties b/lib/Xlatb_RA8876-gemu-1.0/library.properties similarity index 100% rename from lib/RA8876/library.properties rename to lib/Xlatb_RA8876-gemu-1.0/library.properties diff --git a/lib/SSD1351/spi_register.h b/lib/Xlatb_RA8876-gemu-1.0/spi_register.h similarity index 100% rename from lib/SSD1351/spi_register.h rename to lib/Xlatb_RA8876-gemu-1.0/spi_register.h