aboutsummaryrefslogtreecommitdiff
path: root/libraries/TFT/utility
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/TFT/utility')
-rw-r--r--libraries/TFT/utility/Adafruit-README.txt21
-rw-r--r--libraries/TFT/utility/Adafruit-license.txt25
-rw-r--r--libraries/TFT/utility/Adafruit_GFX.cpp671
-rw-r--r--libraries/TFT/utility/Adafruit_GFX.h367
-rwxr-xr-xlibraries/TFT/utility/Adafruit_ST7735.cpp603
-rwxr-xr-xlibraries/TFT/utility/Adafruit_ST7735.h150
-rw-r--r--libraries/TFT/utility/PImage.h64
-rw-r--r--libraries/TFT/utility/glcdfont.c268
-rw-r--r--libraries/TFT/utility/keywords.txt70
9 files changed, 0 insertions, 2239 deletions
diff --git a/libraries/TFT/utility/Adafruit-README.txt b/libraries/TFT/utility/Adafruit-README.txt
deleted file mode 100644
index 6f3b682..0000000
--- a/libraries/TFT/utility/Adafruit-README.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-This is a library for the Adafruit 1.8" SPI display.
-This library works with the Adafruit 1.8" TFT Breakout w/SD card
- ----> http://www.adafruit.com/products/358
-as well as Adafruit raw 1.8" TFT display
- ----> http://www.adafruit.com/products/618
-
-Check out the links above for our tutorials and wiring diagrams.
-These displays use SPI to communicate, 4 or 5 pins are required
-to interface (RST is optional).
-Adafruit invests time and resources providing this open source code,
-please support Adafruit and open-source hardware by purchasing
-products from Adafruit!
-
-Written by Limor Fried/Ladyada for Adafruit Industries.
-MIT license, all text above must be included in any redistribution
-
-To download. click the DOWNLOADS button in the top right corner, rename the uncompressed folder Adafruit_ST7735. Check that the Adafruit_ST7735 folder contains Adafruit_ST7735.cpp and Adafruit_ST7735.
-
-Place the Adafruit_ST7735 library folder your <arduinosketchfolder>/libraries/ folder. You may need to create the libraries subfolder if its your first library. Restart the IDE
-
-Also requires the Adafruit_GFX library for Arduino.
diff --git a/libraries/TFT/utility/Adafruit-license.txt b/libraries/TFT/utility/Adafruit-license.txt
deleted file mode 100644
index 4bbfa39..0000000
--- a/libraries/TFT/utility/Adafruit-license.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Software License Agreement (BSD License)
-
-Copyright (c) 2012, Adafruit Industries. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-3. Neither the name of the copyright holders nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/libraries/TFT/utility/Adafruit_GFX.cpp b/libraries/TFT/utility/Adafruit_GFX.cpp
deleted file mode 100644
index a7a541c..0000000
--- a/libraries/TFT/utility/Adafruit_GFX.cpp
+++ /dev/null
@@ -1,671 +0,0 @@
-/******************************************************************
- This is the core graphics library for all our displays, providing
- basic graphics primitives (points, lines, circles, etc.). It needs
- to be paired with a hardware-specific library for each display
- device we carry (handling the lower-level functions).
-
- Adafruit invests time and resources providing this open
- source code, please support Adafruit and open-source hardware
- by purchasing products from Adafruit!
-
- Written by Limor Fried/Ladyada for Adafruit Industries.
- BSD license, check license.txt for more information.
- All text above must be included in any redistribution.
- ******************************************************************/
-
-#include "Adafruit_GFX.h"
-#include "glcdfont.c"
-#include <avr/pgmspace.h>
-
-void Adafruit_GFX::constructor(int16_t w, int16_t h) {
- _width = WIDTH = w;
- _height = HEIGHT = h;
-
- rotation = 0;
- cursor_y = cursor_x = 0;
- textsize = 1;
- textcolor = textbgcolor = 0xFFFF;
- wrap = true;
-
- strokeColor = 0;
- useStroke = true;
- fillColor = 0;
- useFill = false;
-
-}
-
-
-// draw a circle outline
-void Adafruit_GFX::drawCircle(int16_t x0, int16_t y0, int16_t r,
- uint16_t color) {
- int16_t f = 1 - r;
- int16_t ddF_x = 1;
- int16_t ddF_y = -2 * r;
- int16_t x = 0;
- int16_t y = r;
-
- drawPixel(x0, y0+r, color);
- drawPixel(x0, y0-r, color);
- drawPixel(x0+r, y0, color);
- drawPixel(x0-r, y0, color);
-
- while (x<y) {
- if (f >= 0) {
- y--;
- ddF_y += 2;
- f += ddF_y;
- }
- x++;
- ddF_x += 2;
- f += ddF_x;
-
- drawPixel(x0 + x, y0 + y, color);
- drawPixel(x0 - x, y0 + y, color);
- drawPixel(x0 + x, y0 - y, color);
- drawPixel(x0 - x, y0 - y, color);
- drawPixel(x0 + y, y0 + x, color);
- drawPixel(x0 - y, y0 + x, color);
- drawPixel(x0 + y, y0 - x, color);
- drawPixel(x0 - y, y0 - x, color);
-
- }
-}
-
-void Adafruit_GFX::drawCircleHelper( int16_t x0, int16_t y0,
- int16_t r, uint8_t cornername, uint16_t color) {
- int16_t f = 1 - r;
- int16_t ddF_x = 1;
- int16_t ddF_y = -2 * r;
- int16_t x = 0;
- int16_t y = r;
-
- while (x<y) {
- if (f >= 0) {
- y--;
- ddF_y += 2;
- f += ddF_y;
- }
- x++;
- ddF_x += 2;
- f += ddF_x;
- if (cornername & 0x4) {
- drawPixel(x0 + x, y0 + y, color);
- drawPixel(x0 + y, y0 + x, color);
- }
- if (cornername & 0x2) {
- drawPixel(x0 + x, y0 - y, color);
- drawPixel(x0 + y, y0 - x, color);
- }
- if (cornername & 0x8) {
- drawPixel(x0 - y, y0 + x, color);
- drawPixel(x0 - x, y0 + y, color);
- }
- if (cornername & 0x1) {
- drawPixel(x0 - y, y0 - x, color);
- drawPixel(x0 - x, y0 - y, color);
- }
- }
-}
-
-void Adafruit_GFX::fillCircle(int16_t x0, int16_t y0, int16_t r,
- uint16_t color) {
- drawFastVLine(x0, y0-r, 2*r+1, color);
- fillCircleHelper(x0, y0, r, 3, 0, color);
-}
-
-// used to do circles and roundrects!
-void Adafruit_GFX::fillCircleHelper(int16_t x0, int16_t y0, int16_t r,
- uint8_t cornername, int16_t delta, uint16_t color) {
-
- int16_t f = 1 - r;
- int16_t ddF_x = 1;
- int16_t ddF_y = -2 * r;
- int16_t x = 0;
- int16_t y = r;
-
- while (x<y) {
- if (f >= 0) {
- y--;
- ddF_y += 2;
- f += ddF_y;
- }
- x++;
- ddF_x += 2;
- f += ddF_x;
-
- if (cornername & 0x1) {
- drawFastVLine(x0+x, y0-y, 2*y+1+delta, color);
- drawFastVLine(x0+y, y0-x, 2*x+1+delta, color);
- }
- if (cornername & 0x2) {
- drawFastVLine(x0-x, y0-y, 2*y+1+delta, color);
- drawFastVLine(x0-y, y0-x, 2*x+1+delta, color);
- }
- }
-}
-
-// bresenham's algorithm - thx wikpedia
-void Adafruit_GFX::drawLine(int16_t x0, int16_t y0,
- int16_t x1, int16_t y1,
- uint16_t color) {
- int16_t steep = abs(y1 - y0) > abs(x1 - x0);
- if (steep) {
- swap(x0, y0);
- swap(x1, y1);
- }
-
- if (x0 > x1) {
- swap(x0, x1);
- swap(y0, y1);
- }
-
- int16_t dx, dy;
- dx = x1 - x0;
- dy = abs(y1 - y0);
-
- int16_t err = dx / 2;
- int16_t ystep;
-
- if (y0 < y1) {
- ystep = 1;
- } else {
- ystep = -1;
- }
-
- for (; x0<=x1; x0++) {
- if (steep) {
- drawPixel(y0, x0, color);
- } else {
- drawPixel(x0, y0, color);
- }
- err -= dy;
- if (err < 0) {
- y0 += ystep;
- err += dx;
- }
- }
-}
-
-
-// draw a rectangle
-void Adafruit_GFX::drawRect(int16_t x, int16_t y,
- int16_t w, int16_t h,
- uint16_t color) {
- drawFastHLine(x, y, w, color);
- drawFastHLine(x, y+h-1, w, color);
- drawFastVLine(x, y, h, color);
- drawFastVLine(x+w-1, y, h, color);
-}
-
-void Adafruit_GFX::drawFastVLine(int16_t x, int16_t y,
- int16_t h, uint16_t color) {
- // stupidest version - update in subclasses if desired!
- drawLine(x, y, x, y+h-1, color);
-}
-
-
-void Adafruit_GFX::drawFastHLine(int16_t x, int16_t y,
- int16_t w, uint16_t color) {
- // stupidest version - update in subclasses if desired!
- drawLine(x, y, x+w-1, y, color);
-}
-
-void Adafruit_GFX::fillRect(int16_t x, int16_t y, int16_t w, int16_t h,
- uint16_t color) {
- // stupidest version - update in subclasses if desired!
- for (int16_t i=x; i<x+w; i++) {
- drawFastVLine(i, y, h, color);
- }
-}
-
-
-void Adafruit_GFX::fillScreen(uint16_t color) {
- fillRect(0, 0, _width, _height, color);
-}
-
-// draw a rounded rectangle!
-void Adafruit_GFX::drawRoundRect(int16_t x, int16_t y, int16_t w,
- int16_t h, int16_t r, uint16_t color) {
- // smarter version
- drawFastHLine(x+r , y , w-2*r, color); // Top
- drawFastHLine(x+r , y+h-1, w-2*r, color); // Bottom
- drawFastVLine( x , y+r , h-2*r, color); // Left
- drawFastVLine( x+w-1, y+r , h-2*r, color); // Right
- // draw four corners
- drawCircleHelper(x+r , y+r , r, 1, color);
- drawCircleHelper(x+w-r-1, y+r , r, 2, color);
- drawCircleHelper(x+w-r-1, y+h-r-1, r, 4, color);
- drawCircleHelper(x+r , y+h-r-1, r, 8, color);
-}
-
-// fill a rounded rectangle!
-void Adafruit_GFX::fillRoundRect(int16_t x, int16_t y, int16_t w,
- int16_t h, int16_t r, uint16_t color) {
- // smarter version
- fillRect(x+r, y, w-2*r, h, color);
-
- // draw four corners
- fillCircleHelper(x+w-r-1, y+r, r, 1, h-2*r-1, color);
- fillCircleHelper(x+r , y+r, r, 2, h-2*r-1, color);
-}
-
-// draw a triangle!
-void Adafruit_GFX::drawTriangle(int16_t x0, int16_t y0,
- int16_t x1, int16_t y1,
- int16_t x2, int16_t y2, uint16_t color) {
- drawLine(x0, y0, x1, y1, color);
- drawLine(x1, y1, x2, y2, color);
- drawLine(x2, y2, x0, y0, color);
-}
-
-// fill a triangle!
-void Adafruit_GFX::fillTriangle ( int16_t x0, int16_t y0,
- int16_t x1, int16_t y1,
- int16_t x2, int16_t y2, uint16_t color) {
-
- int16_t a, b, y, last;
-
- // Sort coordinates by Y order (y2 >= y1 >= y0)
- if (y0 > y1) {
- swap(y0, y1); swap(x0, x1);
- }
- if (y1 > y2) {
- swap(y2, y1); swap(x2, x1);
- }
- if (y0 > y1) {
- swap(y0, y1); swap(x0, x1);
- }
-
- if(y0 == y2) { // Handle awkward all-on-same-line case as its own thing
- a = b = x0;
- if(x1 < a) a = x1;
- else if(x1 > b) b = x1;
- if(x2 < a) a = x2;
- else if(x2 > b) b = x2;
- drawFastHLine(a, y0, b-a+1, color);
- return;
- }
-
- int16_t
- dx01 = x1 - x0,
- dy01 = y1 - y0,
- dx02 = x2 - x0,
- dy02 = y2 - y0,
- dx12 = x2 - x1,
- dy12 = y2 - y1,
- sa = 0,
- sb = 0;
-
- // For upper part of triangle, find scanline crossings for segments
- // 0-1 and 0-2. If y1=y2 (flat-bottomed triangle), the scanline y1
- // is included here (and second loop will be skipped, avoiding a /0
- // error there), otherwise scanline y1 is skipped here and handled
- // in the second loop...which also avoids a /0 error here if y0=y1
- // (flat-topped triangle).
- if(y1 == y2) last = y1; // Include y1 scanline
- else last = y1-1; // Skip it
-
- for(y=y0; y<=last; y++) {
- a = x0 + sa / dy01;
- b = x0 + sb / dy02;
- sa += dx01;
- sb += dx02;
- /* longhand:
- a = x0 + (x1 - x0) * (y - y0) / (y1 - y0);
- b = x0 + (x2 - x0) * (y - y0) / (y2 - y0);
- */
- if(a > b) swap(a,b);
- drawFastHLine(a, y, b-a+1, color);
- }
-
- // For lower part of triangle, find scanline crossings for segments
- // 0-2 and 1-2. This loop is skipped if y1=y2.
- sa = dx12 * (y - y1);
- sb = dx02 * (y - y0);
- for(; y<=y2; y++) {
- a = x1 + sa / dy12;
- b = x0 + sb / dy02;
- sa += dx12;
- sb += dx02;
- /* longhand:
- a = x1 + (x2 - x1) * (y - y1) / (y2 - y1);
- b = x0 + (x2 - x0) * (y - y0) / (y2 - y0);
- */
- if(a > b) swap(a,b);
- drawFastHLine(a, y, b-a+1, color);
- }
-}
-
-void Adafruit_GFX::drawBitmap(int16_t x, int16_t y,
- const uint8_t *bitmap, int16_t w, int16_t h,
- uint16_t color) {
-
- int16_t i, j, byteWidth = (w + 7) / 8;
-
- for(j=0; j<h; j++) {
- for(i=0; i<w; i++ ) {
- if(pgm_read_byte(bitmap + j * byteWidth + i / 8) & (128 >> (i & 7))) {
- drawPixel(x+i, y+j, color);
- }
- }
- }
-}
-
-
-#if ARDUINO >= 100
-size_t Adafruit_GFX::write(uint8_t c) {
-#else
-void Adafruit_GFX::write(uint8_t c) {
-#endif
- if (c == '\n') {
- cursor_y += textsize*8;
- cursor_x = 0;
- } else if (c == '\r') {
- // skip em
- } else {
- drawChar(cursor_x, cursor_y, c, textcolor, textbgcolor, textsize);
- cursor_x += textsize*6;
- if (wrap && (cursor_x > (_width - textsize*6))) {
- cursor_y += textsize*8;
- cursor_x = 0;
- }
- }
-#if ARDUINO >= 100
- return 1;
-#endif
-}
-
-// draw a character
-void Adafruit_GFX::drawChar(int16_t x, int16_t y, unsigned char c,
- uint16_t color, uint16_t bg, uint8_t size) {
-
- if((x >= _width) || // Clip right
- (y >= _height) || // Clip bottom
- ((x + 5 * size - 1) < 0) || // Clip left
- ((y + 8 * size - 1) < 0)) // Clip top
- return;
-
- for (int8_t i=0; i<6; i++ ) {
- uint8_t line;
- if (i == 5)
- line = 0x0;
- else
- line = pgm_read_byte(font+(c*5)+i);
- for (int8_t j = 0; j<8; j++) {
- if (line & 0x1) {
- if (size == 1) // default size
- drawPixel(x+i, y+j, color);
- else { // big size
- fillRect(x+(i*size), y+(j*size), size, size, color);
- }
- } else if (bg != color) {
- if (size == 1) // default size
- drawPixel(x+i, y+j, bg);
- else { // big size
- fillRect(x+i*size, y+j*size, size, size, bg);
- }
- }
- line >>= 1;
- }
- }
-}
-
-void Adafruit_GFX::setCursor(int16_t x, int16_t y) {
- cursor_x = x;
- cursor_y = y;
-}
-
-
-void Adafruit_GFX::setTextSize(uint8_t s) {
- textsize = (s > 0) ? s : 1;
-}
-
-
-void Adafruit_GFX::setTextColor(uint16_t c) {
- textcolor = c;
- textbgcolor = c;
- // for 'transparent' background, we'll set the bg
- // to the same as fg instead of using a flag
-}
-
- void Adafruit_GFX::setTextColor(uint16_t c, uint16_t b) {
- textcolor = c;
- textbgcolor = b;
- }
-
-void Adafruit_GFX::setTextWrap(boolean w) {
- wrap = w;
-}
-
-uint8_t Adafruit_GFX::getRotation(void) {
- rotation %= 4;
- return rotation;
-}
-
-void Adafruit_GFX::setRotation(uint8_t x) {
- x %= 4; // cant be higher than 3
- rotation = x;
- switch (x) {
- case 0:
- case 2:
- _width = WIDTH;
- _height = HEIGHT;
- break;
- case 1:
- case 3:
- _width = HEIGHT;
- _height = WIDTH;
- break;
- }
-}
-
-void Adafruit_GFX::invertDisplay(boolean i) {
- // do nothing, can be subclassed
-}
-
-
-// return the size of the display which depends on the rotation!
-int16_t Adafruit_GFX::width(void) {
- return _width;
-}
-
-int16_t Adafruit_GFX::height(void) {
- return _height;
-}
-
-
-
-uint16_t Adafruit_GFX::newColor(uint8_t r, uint8_t g, uint8_t b) {
- return ((r & 0xF8) << 8) | ((g & 0xFC) << 3) | (b >> 3);
-}
-
-
-void Adafruit_GFX::background(uint8_t red, uint8_t green, uint8_t blue) {
- background(newColor(red, green, blue));
-}
-
-void Adafruit_GFX::background(color c) {
- fillScreen(c);
-}
-
-void Adafruit_GFX::stroke(uint8_t red, uint8_t green, uint8_t blue) {
- stroke(newColor(red, green, blue));
-}
-
-void Adafruit_GFX::stroke(color c) {
- useStroke = true;
- strokeColor = c;
- setTextColor(c);
-}
-
-void Adafruit_GFX::noStroke() {
- useStroke = false;
-}
-
-void Adafruit_GFX::noFill() {
- useFill = false;
-}
-
-void Adafruit_GFX::fill(uint8_t red, uint8_t green, uint8_t blue) {
- fill(newColor(red, green, blue));
-}
-
-void Adafruit_GFX::fill(color c) {
- useFill = true;
- fillColor = c;
-}
-
-
-void Adafruit_GFX::text(const char * text, int16_t x, int16_t y) {
- if (!useStroke)
- return;
-
- setTextWrap(false);
- setTextColor(strokeColor);
- setCursor(x, y);
- print(text);
-}
-
-void Adafruit_GFX::textWrap(const char * text, int16_t x, int16_t y) {
- if (!useStroke)
- return;
-
- setTextWrap(true);
- setTextColor(strokeColor);
- setCursor(x, y);
- print(text);
-}
-
-
-void Adafruit_GFX::textSize(uint8_t size) {
- setTextSize(size);
-}
-
-void Adafruit_GFX::point(int16_t x, int16_t y) {
- if (!useStroke)
- return;
-
- drawPixel(x, y, strokeColor);
-}
-
-void Adafruit_GFX::line(int16_t x1, int16_t y1, int16_t x2, int16_t y2) {
- if (!useStroke)
- return;
-
- if (x1 == x2) {
- if (y1 < y2)
- drawFastVLine(x1, y1, y2 - y1, strokeColor);
- else
- drawFastVLine(x1, y2, y1 - y2, strokeColor);
- }
- else if (y1 == y2) {
- if (x1 < x2)
- drawFastHLine(x1, y1, x2 - x1, strokeColor);
- else
- drawFastHLine(x2, y1, x1 - x2, strokeColor);
- }
- else {
- drawLine(x1, y1, x2, y2, strokeColor);
- }
-}
-
-void Adafruit_GFX::rect(int16_t x, int16_t y, int16_t width, int16_t height) {
- if (useFill) {
- fillRect(x, y, width, height, fillColor);
- }
- if (useStroke) {
- drawRect(x, y, width, height, strokeColor);
- }
-}
-
-void Adafruit_GFX::rect(int16_t x, int16_t y, int16_t width, int16_t height, int16_t radius) {
- if (radius == 0) {
- rect(x, y, width, height);
- }
- if (useFill) {
- fillRoundRect(x, y, width, height, radius, fillColor);
- }
- if (useStroke) {
- drawRoundRect(x, y, width, height, radius, strokeColor);
- }
-}
-
-void Adafruit_GFX::circle(int16_t x, int16_t y, int16_t r) {
- if (r == 0)
- return;
-
- if (useFill) {
- fillCircle(x, y, r, fillColor);
- }
- if (useStroke) {
- drawCircle(x, y, r, strokeColor);
- }
-}
-
-void Adafruit_GFX::triangle(int16_t x1, int16_t y1, int16_t x2, int16_t y2, int16_t x3, int16_t y3) {
- if (useFill) {
- fillTriangle(x1, y1, x2, y2, x3, y3, fillColor);
- }
- if (useStroke) {
- drawTriangle(x1, y1, x2, y2, x3, y3, strokeColor);
- }
-}
-
-#if defined(__SD_H__) // Arduino SD library
-
-#define BUFFPIXEL 20
-
-void Adafruit_GFX::image(PImage & img, uint16_t x, uint16_t y) {
- int w, h, row, col;
- uint8_t r, g, b;
- uint32_t pos = 0;
- uint8_t sdbuffer[3*BUFFPIXEL]; // pixel buffer (R+G+B per pixel)
- uint8_t buffidx = sizeof(sdbuffer); // Current position in sdbuffer
-
- // Crop area to be loaded
- w = img._bmpWidth;
- h = img._bmpHeight;
- if((x+w-1) >= width()) w = width() - x;
- if((y+h-1) >= height()) h = height() - y;
-
- /*
- // Set TFT address window to clipped image bounds
- setAddrWindow(x, y, x+w-1, y+h-1);
- */
-
- for (row=0; row<h; row++) { // For each scanline...
- // Seek to start of scan line. It might seem labor-
- // intensive to be doing this on every line, but this
- // method covers a lot of gritty details like cropping
- // and scanline padding. Also, the seek only takes
- // place if the file position actually needs to change
- // (avoids a lot of cluster math in SD library).
- if(img._flip) // Bitmap is stored bottom-to-top order (normal BMP)
- pos = img._bmpImageoffset + (img._bmpHeight - 1 - row) * img._rowSize;
- else // Bitmap is stored top-to-bottom
- pos = img._bmpImageoffset + row * img._rowSize;
- if(img._bmpFile.position() != pos) { // Need seek?
- img._bmpFile.seek(pos);
- buffidx = sizeof(sdbuffer); // Force buffer reload
- }
-
- for (col=0; col<w; col++) { // For each pixel...
- // Time to read more pixel data?
- if (buffidx >= sizeof(sdbuffer)) { // Indeed
- img._bmpFile.read(sdbuffer, sizeof(sdbuffer));
- buffidx = 0; // Set index to beginning
- }
-
- // Convert pixel from BMP to TFT format, push to display
- b = sdbuffer[buffidx++];
- g = sdbuffer[buffidx++];
- r = sdbuffer[buffidx++];
- //pushColor(tft.Color565(r,g,b));
- drawPixel(x + col, y + row, newColor(r, g, b));
-
- } // end pixel
- } // end scanline
-
-}
-
-#endif \ No newline at end of file
diff --git a/libraries/TFT/utility/Adafruit_GFX.h b/libraries/TFT/utility/Adafruit_GFX.h
deleted file mode 100644
index b49aa0f..0000000
--- a/libraries/TFT/utility/Adafruit_GFX.h
+++ /dev/null
@@ -1,367 +0,0 @@
-/******************************************************************
- This is the core graphics library for all our displays, providing
- basic graphics primitives (points, lines, circles, etc.). It needs
- to be paired with a hardware-specific library for each display
- device we carry (handling the lower-level functions).
-
- Adafruit invests time and resources providing this open
- source code, please support Adafruit and open-source hardware
- by purchasing products from Adafruit!
-
- Written by Limor Fried/Ladyada for Adafruit Industries.
- Processing-like API written by Enrico Gueli for Officine Arduino.
- BSD license, check license.txt for more information.
- All text above must be included in any redistribution.
- ******************************************************************/
-
-#ifndef _ADAFRUIT_GFX_H
-#define _ADAFRUIT_GFX_H
-
-#if ARDUINO >= 100
- #include "Arduino.h"
- #include "Print.h"
-#else
- #include "WProgram.h"
-#endif
-
-/*
- * This library can work with or without the presence of an SD
- * reading library (to load images). At the moment, only the
- * Arduino SD library is supported; it is included in
- * standard Arduino libraries.
- *
- * The presence of the SD library is detected by looking at the
- * __SD_H__ preprocessor variable, defined into
- * Arduino SD library to avoid double inclusion. This means
- * that in order to use the image-related API of Adafruit_GFX,
- * SD.h *must* be included before Adafruit_GFX.
- *
- * The bottom part of this include file contains the actual image
- * loading code; if it was in a separate .cpp file, there were no
- * way to check if the SD library was present or not.
- *
- * A partial solution was to include SD.h anyway, see if that works
- * (i.e. it is found in the include search path) and act accordingly.
- * But this solution relied on the preprocessor to issue only a
- * warning when an include file is not found. Avr-gcc, used for
- * Arduino 8-bit MCUs, does that, but the standard gcc-4.4, used for
- * Arduino Due, issues a fatal error and stops compilation.
- *
- * The best solution so far is to put the code here. It works if this
- * include is used only in one .cpp file in the build (this is the
- * case of most Arduino sketches); if used in multiple .cpp files,
- * the linker may complain about duplicate definitions.
- *
- */
-
-#if defined(__SD_H__) // Arduino SD library
-# include "PImage.h"
-#else
-# warning "The SD library was not found. loadImage() and image() won't be supported."
-#endif
-
-#define swap(a, b) { int16_t t = a; a = b; b = t; }
-
-/* TODO
-enum RectMode {
- CORNER,
- CORNERS,
- RADIUS,
- CENTER
-};
-*/
-
-typedef uint16_t color;
-
-class Adafruit_GFX : public Print {
- public:
-
- //Adafruit_GFX();
- // i have no idea why we have to formally call the constructor. kinda sux
- void constructor(int16_t w, int16_t h);
-
- // this must be defined by the subclass
- virtual void drawPixel(int16_t x, int16_t y, uint16_t color);
- virtual void invertDisplay(boolean i);
-
- // these are 'generic' drawing functions, so we can share them!
- virtual void drawLine(int16_t x0, int16_t y0, int16_t x1, int16_t y1,
- uint16_t color);
- virtual void drawFastVLine(int16_t x, int16_t y, int16_t h, uint16_t color);
- virtual void drawFastHLine(int16_t x, int16_t y, int16_t w, uint16_t color);
- virtual void drawRect(int16_t x, int16_t y, int16_t w, int16_t h,
- uint16_t color);
- virtual void fillRect(int16_t x, int16_t y, int16_t w, int16_t h,
- uint16_t color);
- virtual void fillScreen(uint16_t color);
-
- void drawCircle(int16_t x0, int16_t y0, int16_t r, uint16_t color);
- void drawCircleHelper(int16_t x0, int16_t y0,
- int16_t r, uint8_t cornername, uint16_t color);
- void fillCircle(int16_t x0, int16_t y0, int16_t r, uint16_t color);
- void fillCircleHelper(int16_t x0, int16_t y0, int16_t r,
- uint8_t cornername, int16_t delta, uint16_t color);
-
- void drawTriangle(int16_t x0, int16_t y0, int16_t x1, int16_t y1,
- int16_t x2, int16_t y2, uint16_t color);
- void fillTriangle(int16_t x0, int16_t y0, int16_t x1, int16_t y1,
- int16_t x2, int16_t y2, uint16_t color);
- void drawRoundRect(int16_t x0, int16_t y0, int16_t w, int16_t h,
- int16_t radius, uint16_t color);
- void fillRoundRect(int16_t x0, int16_t y0, int16_t w, int16_t h,
- int16_t radius, uint16_t color);
-
- void drawBitmap(int16_t x, int16_t y,
- const uint8_t *bitmap, int16_t w, int16_t h,
- uint16_t color);
- void drawChar(int16_t x, int16_t y, unsigned char c,
- uint16_t color, uint16_t bg, uint8_t size);
-#if ARDUINO >= 100
- virtual size_t write(uint8_t);
-#else
- virtual void write(uint8_t);
-#endif
- void setCursor(int16_t x, int16_t y);
- void setTextColor(uint16_t c);
- void setTextColor(uint16_t c, uint16_t bg);
- void setTextSize(uint8_t s);
- void setTextWrap(boolean w);
-
- int16_t height(void);
- int16_t width(void);
-
- void setRotation(uint8_t r);
- uint8_t getRotation(void);
-
-
- /*
- * Processing-like graphics primitives
- */
-
- /// transforms a color in 16-bit form given the RGB components.
- /// The default implementation makes a 5-bit red, a 6-bit
- /// green and a 5-bit blue (MSB to LSB). Devices that use
- /// different scheme should override this.
- virtual uint16_t newColor(uint8_t red, uint8_t green, uint8_t blue);
-
-
- // http://processing.org/reference/background_.html
- void background(uint8_t red, uint8_t green, uint8_t blue);
- void background(color c);
-
- // http://processing.org/reference/fill_.html
- void fill(uint8_t red, uint8_t green, uint8_t blue);
- void fill(color c);
-
- // http://processing.org/reference/noFill_.html
- void noFill();
-
- // http://processing.org/reference/stroke_.html
- void stroke(uint8_t red, uint8_t green, uint8_t blue);
- void stroke(color c);
-
- // http://processing.org/reference/noStroke_.html
- void noStroke();
-
- void text (const char * text, int16_t x, int16_t y);
- void textWrap(const char * text, int16_t x, int16_t y);
-
- void textSize(uint8_t size);
-
- // similar to ellipse() in Processing, but with
- // a single radius.
- // http://processing.org/reference/ellipse_.html
- void circle(int16_t x, int16_t y, int16_t r);
-
- void point(int16_t x, int16_t y);
-
- void line(int16_t x1, int16_t y1, int16_t x2, int16_t y2);
-
- void quad(int16_t x1, int16_t y1, int16_t x2, int16_t y2, int16_t x3, int16_t y3, int16_t x4, int16_t y4);
-
- void rect(int16_t x, int16_t y, int16_t width, int16_t height);
-
- void rect(int16_t x, int16_t y, int16_t width, int16_t height, int16_t radius);
-
- void triangle(int16_t x1, int16_t y1, int16_t x2, int16_t y2, int16_t x3, int16_t y3);
-
- /* TODO
- void rectMode(RectMode mode);
-
- void pushStyle();
- void popStyle();
- */
-
-#if defined(__SD_H__) // Arduino SD library
- PImage loadImage(const char * fileName) { return PImage::loadImage(fileName); }
-
- void image(PImage & img, uint16_t x, uint16_t y);
-#endif
-
- protected:
- int16_t WIDTH, HEIGHT; // this is the 'raw' display w/h - never changes
- int16_t _width, _height; // dependent on rotation
- int16_t cursor_x, cursor_y;
- uint16_t textcolor, textbgcolor;
- uint8_t textsize;
- uint8_t rotation;
- boolean wrap; // If set, 'wrap' text at right edge of display
-
- /*
- * Processing-style graphics state
- */
-
- color strokeColor;
- bool useStroke;
- color fillColor;
- bool useFill;
-};
-
-#if defined(__SD_H__) // Arduino SD library
-
-#define BUFFPIXEL 20
-
-void Adafruit_GFX::image(PImage & img, uint16_t x, uint16_t y) {
- int w, h, row, col;
- uint8_t r, g, b;
- uint32_t pos = 0;
- uint8_t sdbuffer[3*BUFFPIXEL]; // pixel buffer (R+G+B per pixel)
- uint8_t buffidx = sizeof(sdbuffer); // Current position in sdbuffer
-
- // Crop area to be loaded
- w = img._bmpWidth;
- h = img._bmpHeight;
- if((x+w-1) >= width()) w = width() - x;
- if((y+h-1) >= height()) h = height() - y;
-
- /*
- // Set TFT address window to clipped image bounds
- setAddrWindow(x, y, x+w-1, y+h-1);
- */
-
- for (row=0; row<h; row++) { // For each scanline...
- // Seek to start of scan line. It might seem labor-
- // intensive to be doing this on every line, but this
- // method covers a lot of gritty details like cropping
- // and scanline padding. Also, the seek only takes
- // place if the file position actually needs to change
- // (avoids a lot of cluster math in SD library).
- if(img._flip) // Bitmap is stored bottom-to-top order (normal BMP)
- pos = img._bmpImageoffset + (img._bmpHeight - 1 - row) * img._rowSize;
- else // Bitmap is stored top-to-bottom
- pos = img._bmpImageoffset + row * img._rowSize;
- if(img._bmpFile.position() != pos) { // Need seek?
- img._bmpFile.seek(pos);
- buffidx = sizeof(sdbuffer); // Force buffer reload
- }
-
- for (col=0; col<w; col++) { // For each pixel...
- // Time to read more pixel data?
- if (buffidx >= sizeof(sdbuffer)) { // Indeed
- img._bmpFile.read(sdbuffer, sizeof(sdbuffer));
- buffidx = 0; // Set index to beginning
- }
-
- // Convert pixel from BMP to TFT format, push to display
- b = sdbuffer[buffidx++];
- g = sdbuffer[buffidx++];
- r = sdbuffer[buffidx++];
- //pushColor(tft.Color565(r,g,b));
- drawPixel(x + col, y + row, newColor(r, g, b));
-
- } // end pixel
- } // end scanline
-
-}
-
-
-
-
-// These read 16- and 32-bit types from the SD card file.
-// BMP data is stored little-endian, Arduino is little-endian too.
-// May need to reverse subscript order if porting elsewhere.
-
-uint16_t PImage::read16(File f) {
- uint16_t result;
- ((uint8_t *)&result)[0] = f.read(); // LSB
- ((uint8_t *)&result)[1] = f.read(); // MSB
- return result;
-}
-
-uint32_t PImage::read32(File f) {
- uint32_t result;
- ((uint8_t *)&result)[0] = f.read(); // LSB
- ((uint8_t *)&result)[1] = f.read();
- ((uint8_t *)&result)[2] = f.read();
- ((uint8_t *)&result)[3] = f.read(); // MSB
- return result;
-}
-
-
-PImage PImage::loadImage(const char * fileName) {
- File bmpFile;
- int bmpWidth, bmpHeight; // W+H in pixels
- uint8_t bmpDepth; // Bit depth (currently must be 24)
- uint32_t bmpImageoffset; // Start of image data in file
- uint32_t rowSize; // Not always = bmpWidth; may have padding
- bool flip = true; // BMP is stored bottom-to-top
-
-
- // Open requested file on SD card
- if ((bmpFile = SD.open(fileName)) == NULL) {
- Serial.print("loadImage: file not found: ");
- Serial.println(fileName);
- return PImage(); // load error
- }
-
-
-
- // Parse BMP header
- if(read16(bmpFile) != 0x4D42) { // BMP signature
- Serial.println("loadImage: file doesn't look like a BMP");
- return PImage();
- }
-
- Serial.print("File size: "); Serial.println(read32(bmpFile));
- (void)read32(bmpFile); // Read & ignore creator bytes
- bmpImageoffset = read32(bmpFile); // Start of image data
- Serial.print("Image Offset: "); Serial.println(bmpImageoffset, DEC);
- // Read DIB header
- Serial.print("Header size: "); Serial.println(read32(bmpFile));
- bmpWidth = read32(bmpFile);
- bmpHeight = read32(bmpFile);
- if(read16(bmpFile) != 1) { // # planes -- must be '1'
- Serial.println("loadImage: invalid n. of planes");
- return PImage();
- }
-
- bmpDepth = read16(bmpFile); // bits per pixel
- Serial.print("Bit Depth: "); Serial.println(bmpDepth);
- if((bmpDepth != 24) || (read32(bmpFile) != 0)) { // 0 = uncompressed {
- Serial.println("loadImage: invalid pixel format");
- return PImage();
- }
-
- Serial.print("Image size: ");
- Serial.print(bmpWidth);
- Serial.print('x');
- Serial.println(bmpHeight);
-
- // BMP rows are padded (if needed) to 4-byte boundary
- rowSize = (bmpWidth * 3 + 3) & ~3;
-
- // If bmpHeight is negative, image is in top-down order.
- // This is not canon but has been observed in the wild.
- if(bmpHeight < 0) {
- bmpHeight = -bmpHeight;
- flip = false;
- }
-
- return PImage(bmpFile, bmpWidth, bmpHeight, bmpDepth, bmpImageoffset, rowSize, flip);
-}
-
-#endif
-
-
-
-#endif
diff --git a/libraries/TFT/utility/Adafruit_ST7735.cpp b/libraries/TFT/utility/Adafruit_ST7735.cpp
deleted file mode 100755
index ed57bf7..0000000
--- a/libraries/TFT/utility/Adafruit_ST7735.cpp
+++ /dev/null
@@ -1,603 +0,0 @@
-/***************************************************
- This is a library for the Adafruit 1.8" SPI display.
- This library works with the Adafruit 1.8" TFT Breakout w/SD card
- ----> http://www.adafruit.com/products/358
- as well as Adafruit raw 1.8" TFT display
- ----> http://www.adafruit.com/products/618
-
- Check out the links above for our tutorials and wiring diagrams
- These displays use SPI to communicate, 4 or 5 pins are required to
- interface (RST is optional)
- Adafruit invests time and resources providing this open source code,
- please support Adafruit and open-source hardware by purchasing
- products from Adafruit!
-
- Written by Limor Fried/Ladyada for Adafruit Industries.
- MIT license, all text above must be included in any redistribution
- ****************************************************/
-
-#include "Adafruit_ST7735.h"
-#include <avr/pgmspace.h>
-#include <limits.h>
-#include "pins_arduino.h"
-#include "wiring_private.h"
-#include <SPI.h>
-
-inline uint16_t swapcolor(uint16_t x) {
- return (x << 11) | (x & 0x07E0) | (x >> 11);
-}
-
-
-// Constructor when using software SPI. All output pins are configurable.
-Adafruit_ST7735::Adafruit_ST7735(uint8_t cs, uint8_t rs, uint8_t sid,
- uint8_t sclk, uint8_t rst) {
- _cs = cs;
- _rs = rs;
- _sid = sid;
- _sclk = sclk;
- _rst = rst;
- hwSPI = false;
-}
-
-
-// Constructor when using hardware SPI. Faster, but must use SPI pins
-// specific to each board type (e.g. 11,13 for Uno, 51,52 for Mega, etc.)
-Adafruit_ST7735::Adafruit_ST7735(uint8_t cs, uint8_t rs, uint8_t rst) {
- _cs = cs;
- _rs = rs;
- _rst = rst;
- hwSPI = true;
- _sid = _sclk = 0;
-}
-
-
-inline void Adafruit_ST7735::spiwrite(uint8_t c) {
-
- //Serial.println(c, HEX);
-
- if (hwSPI) {
- SPI.transfer(c);
- } else {
- // Fast SPI bitbang swiped from LPD8806 library
- for(uint8_t bit = 0x80; bit; bit >>= 1) {
- if(c & bit) *dataport |= datapinmask;
- else *dataport &= ~datapinmask;
- *clkport |= clkpinmask;
- *clkport &= ~clkpinmask;
- }
- }
-}
-
-
-void Adafruit_ST7735::writecommand(uint8_t c) {
- *rsport &= ~rspinmask;
- *csport &= ~cspinmask;
-
- //Serial.print("C ");
- spiwrite(c);
-
- *csport |= cspinmask;
-}
-
-
-void Adafruit_ST7735::writedata(uint8_t c) {
- *rsport |= rspinmask;
- *csport &= ~cspinmask;
-
- //Serial.print("D ");
- spiwrite(c);
-
- *csport |= cspinmask;
-}
-
-
-// Rather than a bazillion writecommand() and writedata() calls, screen
-// initialization commands and arguments are organized in these tables
-// stored in PROGMEM. The table may look bulky, but that's mostly the
-// formatting -- storage-wise this is hundreds of bytes more compact
-// than the equivalent code. Companion function follows.
-#define DELAY 0x80
-PROGMEM static prog_uchar
- Bcmd[] = { // Initialization commands for 7735B screens
- 18, // 18 commands in list:
- ST7735_SWRESET, DELAY, // 1: Software reset, no args, w/delay
- 50, // 50 ms delay
- ST7735_SLPOUT , DELAY, // 2: Out of sleep mode, no args, w/delay
- 255, // 255 = 500 ms delay
- ST7735_COLMOD , 1+DELAY, // 3: Set color mode, 1 arg + delay:
- 0x05, // 16-bit color
- 10, // 10 ms delay
- ST7735_FRMCTR1, 3+DELAY, // 4: Frame rate control, 3 args + delay:
- 0x00, // fastest refresh
- 0x06, // 6 lines front porch
- 0x03, // 3 lines back porch
- 10, // 10 ms delay
- ST7735_MADCTL , 1 , // 5: Memory access ctrl (directions), 1 arg:
- 0x08, // Row addr/col addr, bottom to top refresh
- ST7735_DISSET5, 2 , // 6: Display settings #5, 2 args, no delay:
- 0x15, // 1 clk cycle nonoverlap, 2 cycle gate
- // rise, 3 cycle osc equalize
- 0x02, // Fix on VTL
- ST7735_INVCTR , 1 , // 7: Display inversion control, 1 arg:
- 0x0, // Line inversion
- ST7735_PWCTR1 , 2+DELAY, // 8: Power control, 2 args + delay:
- 0x02, // GVDD = 4.7V
- 0x70, // 1.0uA
- 10, // 10 ms delay
- ST7735_PWCTR2 , 1 , // 9: Power control, 1 arg, no delay:
- 0x05, // VGH = 14.7V, VGL = -7.35V
- ST7735_PWCTR3 , 2 , // 10: Power control, 2 args, no delay:
- 0x01, // Opamp current small
- 0x02, // Boost frequency
- ST7735_VMCTR1 , 2+DELAY, // 11: Power control, 2 args + delay:
- 0x3C, // VCOMH = 4V
- 0x38, // VCOML = -1.1V
- 10, // 10 ms delay
- ST7735_PWCTR6 , 2 , // 12: Power control, 2 args, no delay:
- 0x11, 0x15,
- ST7735_GMCTRP1,16 , // 13: Magical unicorn dust, 16 args, no delay:
- 0x09, 0x16, 0x09, 0x20, // (seriously though, not sure what
- 0x21, 0x1B, 0x13, 0x19, // these config values represent)
- 0x17, 0x15, 0x1E, 0x2B,
- 0x04, 0x05, 0x02, 0x0E,
- ST7735_GMCTRN1,16+DELAY, // 14: Sparkles and rainbows, 16 args + delay:
- 0x0B, 0x14, 0x08, 0x1E, // (ditto)
- 0x22, 0x1D, 0x18, 0x1E,
- 0x1B, 0x1A, 0x24, 0x2B,
- 0x06, 0x06, 0x02, 0x0F,
- 10, // 10 ms delay
- ST7735_CASET , 4 , // 15: Column addr set, 4 args, no delay:
- 0x00, 0x02, // XSTART = 2
- 0x00, 0x81, // XEND = 129
- ST7735_RASET , 4 , // 16: Row addr set, 4 args, no delay:
- 0x00, 0x02, // XSTART = 1
- 0x00, 0x81, // XEND = 160
- ST7735_NORON , DELAY, // 17: Normal display on, no args, w/delay
- 10, // 10 ms delay
- ST7735_DISPON , DELAY, // 18: Main screen turn on, no args, w/delay
- 255 }, // 255 = 500 ms delay
-
- Rcmd1[] = { // Init for 7735R, part 1 (red or green tab)
- 15, // 15 commands in list:
- ST7735_SWRESET, DELAY, // 1: Software reset, 0 args, w/delay
- 150, // 150 ms delay
- ST7735_SLPOUT , DELAY, // 2: Out of sleep mode, 0 args, w/delay
- 255, // 500 ms delay
- ST7735_FRMCTR1, 3 , // 3: Frame rate ctrl - normal mode, 3 args:
- 0x01, 0x2C, 0x2D, // Rate = fosc/(1x2+40) * (LINE+2C+2D)
- ST7735_FRMCTR2, 3 , // 4: Frame rate control - idle mode, 3 args:
- 0x01, 0x2C, 0x2D, // Rate = fosc/(1x2+40) * (LINE+2C+2D)
- ST7735_FRMCTR3, 6 , // 5: Frame rate ctrl - partial mode, 6 args:
- 0x01, 0x2C, 0x2D, // Dot inversion mode
- 0x01, 0x2C, 0x2D, // Line inversion mode
- ST7735_INVCTR , 1 , // 6: Display inversion ctrl, 1 arg, no delay:
- 0x07, // No inversion
- ST7735_PWCTR1 , 3 , // 7: Power control, 3 args, no delay:
- 0xA2,
- 0x02, // -4.6V
- 0x84, // AUTO mode
- ST7735_PWCTR2 , 1 , // 8: Power control, 1 arg, no delay:
- 0xC5, // VGH25 = 2.4C VGSEL = -10 VGH = 3 * AVDD
- ST7735_PWCTR3 , 2 , // 9: Power control, 2 args, no delay:
- 0x0A, // Opamp current small
- 0x00, // Boost frequency
- ST7735_PWCTR4 , 2 , // 10: Power control, 2 args, no delay:
- 0x8A, // BCLK/2, Opamp current small & Medium low
- 0x2A,
- ST7735_PWCTR5 , 2 , // 11: Power control, 2 args, no delay:
- 0x8A, 0xEE,
- ST7735_VMCTR1 , 1 , // 12: Power control, 1 arg, no delay:
- 0x0E,
- ST7735_INVOFF , 0 , // 13: Don't invert display, no args, no delay
- ST7735_MADCTL , 1 , // 14: Memory access control (directions), 1 arg:
- 0xC8, // row addr/col addr, bottom to top refresh
- ST7735_COLMOD , 1 , // 15: set color mode, 1 arg, no delay:
- 0x05 }, // 16-bit color
-
- Rcmd2green[] = { // Init for 7735R, part 2 (green tab only)
- 2, // 2 commands in list:
- ST7735_CASET , 4 , // 1: Column addr set, 4 args, no delay:
- 0x00, 0x02, // XSTART = 0
- 0x00, 0x7F+0x02, // XEND = 127
- ST7735_RASET , 4 , // 2: Row addr set, 4 args, no delay:
- 0x00, 0x01, // XSTART = 0
- 0x00, 0x9F+0x01 }, // XEND = 159
- Rcmd2red[] = { // Init for 7735R, part 2 (red tab only)
- 2, // 2 commands in list:
- ST7735_CASET , 4 , // 1: Column addr set, 4 args, no delay:
- 0x00, 0x00, // XSTART = 0
- 0x00, 0x7F, // XEND = 127
- ST7735_RASET , 4 , // 2: Row addr set, 4 args, no delay:
- 0x00, 0x00, // XSTART = 0
- 0x00, 0x9F }, // XEND = 159
-
- Rcmd3[] = { // Init for 7735R, part 3 (red or green tab)
- 4, // 4 commands in list:
- ST7735_GMCTRP1, 16 , // 1: Magical unicorn dust, 16 args, no delay:
- 0x02, 0x1c, 0x07, 0x12,
- 0x37, 0x32, 0x29, 0x2d,
- 0x29, 0x25, 0x2B, 0x39,
- 0x00, 0x01, 0x03, 0x10,
- ST7735_GMCTRN1, 16 , // 2: Sparkles and rainbows, 16 args, no delay:
- 0x03, 0x1d, 0x07, 0x06,
- 0x2E, 0x2C, 0x29, 0x2D,
- 0x2E, 0x2E, 0x37, 0x3F,
- 0x00, 0x00, 0x02, 0x10,
- ST7735_NORON , DELAY, // 3: Normal display on, no args, w/delay
- 10, // 10 ms delay
- ST7735_DISPON , DELAY, // 4: Main screen turn on, no args w/delay
- 100 }; // 100 ms delay
-
-
-// Companion code to the above tables. Reads and issues
-// a series of LCD commands stored in PROGMEM byte array.
-void Adafruit_ST7735::commandList(uint8_t *addr) {
-
- uint8_t numCommands, numArgs;
- uint16_t ms;
-
- numCommands = pgm_read_byte(addr++); // Number of commands to follow
- while(numCommands--) { // For each command...
- writecommand(pgm_read_byte(addr++)); // Read, issue command
- numArgs = pgm_read_byte(addr++); // Number of args to follow
- ms = numArgs & DELAY; // If hibit set, delay follows args
- numArgs &= ~DELAY; // Mask out delay bit
- while(numArgs--) { // For each argument...
- writedata(pgm_read_byte(addr++)); // Read, issue argument
- }
-
- if(ms) {
- ms = pgm_read_byte(addr++); // Read post-command delay time (ms)
- if(ms == 255) ms = 500; // If 255, delay for 500 ms
- delay(ms);
- }
- }
-}
-
-
-// Initialization code common to both 'B' and 'R' type displays
-void Adafruit_ST7735::commonInit(uint8_t *cmdList) {
-
- constructor(ST7735_TFTWIDTH, ST7735_TFTHEIGHT);
- colstart = rowstart = 0; // May be overridden in init func
-
- pinMode(_rs, OUTPUT);
- pinMode(_cs, OUTPUT);
- csport = portOutputRegister(digitalPinToPort(_cs));
- cspinmask = digitalPinToBitMask(_cs);
- rsport = portOutputRegister(digitalPinToPort(_rs));
- rspinmask = digitalPinToBitMask(_rs);
-
- if(hwSPI) { // Using hardware SPI
- SPI.begin();
-#if defined(ARDUINO_ARCH_SAM)
- SPI.setClockDivider(24); // 4 MHz (half speed)
-#else
- SPI.setClockDivider(SPI_CLOCK_DIV4); // 4 MHz (half speed)
-#endif
- SPI.setBitOrder(MSBFIRST);
- SPI.setDataMode(SPI_MODE0);
- } else {
- pinMode(_sclk, OUTPUT);
- pinMode(_sid , OUTPUT);
- clkport = portOutputRegister(digitalPinToPort(_sclk));
- clkpinmask = digitalPinToBitMask(_sclk);
- dataport = portOutputRegister(digitalPinToPort(_sid));
- datapinmask = digitalPinToBitMask(_sid);
- *clkport &= ~clkpinmask;
- *dataport &= ~datapinmask;
- }
-
- // toggle RST low to reset; CS low so it'll listen to us
- *csport &= ~cspinmask;
- if (_rst) {
- pinMode(_rst, OUTPUT);
- digitalWrite(_rst, HIGH);
- delay(500);
- digitalWrite(_rst, LOW);
- delay(500);
- digitalWrite(_rst, HIGH);
- delay(500);
- }
-
- if(cmdList) commandList(cmdList);
-}
-
-
-// Initialization for ST7735B screens
-void Adafruit_ST7735::initB(void) {
- commonInit(Bcmd);
-}
-
-
-// Initialization for ST7735R screens (green or red tabs)
-void Adafruit_ST7735::initR(uint8_t options) {
- commonInit(Rcmd1);
- if(options == INITR_GREENTAB) {
- commandList(Rcmd2green);
- colstart = 2;
- rowstart = 1;
- } else {
- // colstart, rowstart left at default '0' values
- commandList(Rcmd2red);
- }
- commandList(Rcmd3);
- tabcolor = options;
-}
-
-
-void Adafruit_ST7735::setAddrWindow(uint8_t x0, uint8_t y0, uint8_t x1,
- uint8_t y1) {
-
- writecommand(ST7735_CASET); // Column addr set
- writedata(0x00);
- writedata(x0+colstart); // XSTART
- writedata(0x00);
- writedata(x1+colstart); // XEND
-
- writecommand(ST7735_RASET); // Row addr set
- writedata(0x00);
- writedata(y0+rowstart); // YSTART
- writedata(0x00);
- writedata(y1+rowstart); // YEND
-
- writecommand(ST7735_RAMWR); // write to RAM
-}
-
-
-void Adafruit_ST7735::pushColor(uint16_t color) {
- *rsport |= rspinmask;
- *csport &= ~cspinmask;
-
- if (tabcolor == INITR_BLACKTAB) color = swapcolor(color);
- spiwrite(color >> 8);
- spiwrite(color);
-
- *csport |= cspinmask;
-}
-
-void Adafruit_ST7735::drawPixel(int16_t x, int16_t y, uint16_t color) {
-
- if((x < 0) ||(x >= _width) || (y < 0) || (y >= _height)) return;
-
- setAddrWindow(x,y,x+1,y+1);
-
- *rsport |= rspinmask;
- *csport &= ~cspinmask;
-
- if (tabcolor == INITR_BLACKTAB) color = swapcolor(color);
-
- spiwrite(color >> 8);
- spiwrite(color);
-
- *csport |= cspinmask;
-}
-
-
-void Adafruit_ST7735::drawFastVLine(int16_t x, int16_t y, int16_t h,
- uint16_t color) {
-
- // Rudimentary clipping
- if((x >= _width) || (y >= _height)) return;
- if((y+h-1) >= _height) h = _height-y;
- setAddrWindow(x, y, x, y+h-1);
-
- if (tabcolor == INITR_BLACKTAB) color = swapcolor(color);
-
- uint8_t hi = color >> 8, lo = color;
- *rsport |= rspinmask;
- *csport &= ~cspinmask;
- while (h--) {
- spiwrite(hi);
- spiwrite(lo);
- }
- *csport |= cspinmask;
-}
-
-
-void Adafruit_ST7735::drawFastHLine(int16_t x, int16_t y, int16_t w,
- uint16_t color) {
-
- // Rudimentary clipping
- if((x >= _width) || (y >= _height)) return;
- if((x+w-1) >= _width) w = _width-x;
- setAddrWindow(x, y, x+w-1, y);
-
- if (tabcolor == INITR_BLACKTAB) color = swapcolor(color);
-
- uint8_t hi = color >> 8, lo = color;
- *rsport |= rspinmask;
- *csport &= ~cspinmask;
- while (w--) {
- spiwrite(hi);
- spiwrite(lo);
- }
- *csport |= cspinmask;
-}
-
-
-
-void Adafruit_ST7735::fillScreen(uint16_t color) {
- fillRect(0, 0, _width, _height, color);
-}
-
-
-
-// fill a rectangle
-void Adafruit_ST7735::fillRect(int16_t x, int16_t y, int16_t w, int16_t h,
- uint16_t color) {
-
- // rudimentary clipping (drawChar w/big text requires this)
- if((x >= _width) || (y >= _height)) return;
- if((x + w - 1) >= _width) w = _width - x;
- if((y + h - 1) >= _height) h = _height - y;
-
- if (tabcolor == INITR_BLACKTAB) color = swapcolor(color);
-
- setAddrWindow(x, y, x+w-1, y+h-1);
-
- uint8_t hi = color >> 8, lo = color;
- *rsport |= rspinmask;
- *csport &= ~cspinmask;
- for(y=h; y>0; y--) {
- for(x=w; x>0; x--) {
- spiwrite(hi);
- spiwrite(lo);
- }
- }
-
- *csport |= cspinmask;
-}
-
-
-#define MADCTL_MY 0x80
-#define MADCTL_MX 0x40
-#define MADCTL_MV 0x20
-#define MADCTL_ML 0x10
-#define MADCTL_RGB 0x08
-#define MADCTL_MH 0x04
-
-void Adafruit_ST7735::setRotation(uint8_t m) {
-
- writecommand(ST7735_MADCTL);
- rotation = m % 4; // can't be higher than 3
- switch (rotation) {
- case 0:
- writedata(MADCTL_MX | MADCTL_MY | MADCTL_RGB);
- _width = ST7735_TFTWIDTH;
- _height = ST7735_TFTHEIGHT;
- break;
- case 1:
- writedata(MADCTL_MY | MADCTL_MV | MADCTL_RGB);
- _width = ST7735_TFTHEIGHT;
- _height = ST7735_TFTWIDTH;
- break;
- case 2:
- writedata(MADCTL_RGB);
- _width = ST7735_TFTWIDTH;
- _height = ST7735_TFTHEIGHT;
- break;
- case 3:
- writedata(MADCTL_MX | MADCTL_MV | MADCTL_RGB);
- _width = ST7735_TFTHEIGHT;
- _height = ST7735_TFTWIDTH;
- break;
- }
-}
-
-
-void Adafruit_ST7735::invertDisplay(boolean i) {
- writecommand(i ? ST7735_INVON : ST7735_INVOFF);
-}
-
-
-////////// stuff not actively being used, but kept for posterity
-/*
-
- uint8_t Adafruit_ST7735::spiread(void) {
- uint8_t r = 0;
- if (_sid > 0) {
- r = shiftIn(_sid, _sclk, MSBFIRST);
- } else {
- //SID_DDR &= ~_BV(SID);
- //int8_t i;
- //for (i=7; i>=0; i--) {
- // SCLK_PORT &= ~_BV(SCLK);
- // r <<= 1;
- // r |= (SID_PIN >> SID) & 0x1;
- // SCLK_PORT |= _BV(SCLK);
- //}
- //SID_DDR |= _BV(SID);
-
- }
- return r;
- }
-
-
- void Adafruit_ST7735::dummyclock(void) {
-
- if (_sid > 0) {
- digitalWrite(_sclk, LOW);
- digitalWrite(_sclk, HIGH);
- } else {
- // SCLK_PORT &= ~_BV(SCLK);
- //SCLK_PORT |= _BV(SCLK);
- }
- }
- uint8_t Adafruit_ST7735::readdata(void) {
- *portOutputRegister(rsport) |= rspin;
-
- *portOutputRegister(csport) &= ~ cspin;
-
- uint8_t r = spiread();
-
- *portOutputRegister(csport) |= cspin;
-
- return r;
-
- }
-
- uint8_t Adafruit_ST7735::readcommand8(uint8_t c) {
- digitalWrite(_rs, LOW);
-
- *portOutputRegister(csport) &= ~ cspin;
-
- spiwrite(c);
-
- digitalWrite(_rs, HIGH);
- pinMode(_sid, INPUT); // input!
- digitalWrite(_sid, LOW); // low
- spiread();
- uint8_t r = spiread();
-
-
- *portOutputRegister(csport) |= cspin;
-
-
- pinMode(_sid, OUTPUT); // back to output
- return r;
- }
-
-
- uint16_t Adafruit_ST7735::readcommand16(uint8_t c) {
- digitalWrite(_rs, LOW);
- if (_cs)
- digitalWrite(_cs, LOW);
-
- spiwrite(c);
- pinMode(_sid, INPUT); // input!
- uint16_t r = spiread();
- r <<= 8;
- r |= spiread();
- if (_cs)
- digitalWrite(_cs, HIGH);
-
- pinMode(_sid, OUTPUT); // back to output
- return r;
- }
-
- uint32_t Adafruit_ST7735::readcommand32(uint8_t c) {
- digitalWrite(_rs, LOW);
- if (_cs)
- digitalWrite(_cs, LOW);
- spiwrite(c);
- pinMode(_sid, INPUT); // input!
-
- dummyclock();
- dummyclock();
-
- uint32_t r = spiread();
- r <<= 8;
- r |= spiread();
- r <<= 8;
- r |= spiread();
- r <<= 8;
- r |= spiread();
- if (_cs)
- digitalWrite(_cs, HIGH);
-
- pinMode(_sid, OUTPUT); // back to output
- return r;
- }
-
- */
diff --git a/libraries/TFT/utility/Adafruit_ST7735.h b/libraries/TFT/utility/Adafruit_ST7735.h
deleted file mode 100755
index c0d5de0..0000000
--- a/libraries/TFT/utility/Adafruit_ST7735.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/***************************************************
- This is a library for the Adafruit 1.8" SPI display.
- This library works with the Adafruit 1.8" TFT Breakout w/SD card
- ----> http://www.adafruit.com/products/358
- as well as Adafruit raw 1.8" TFT display
- ----> http://www.adafruit.com/products/618
-
- Check out the links above for our tutorials and wiring diagrams
- These displays use SPI to communicate, 4 or 5 pins are required to
- interface (RST is optional)
- Adafruit invests time and resources providing this open source code,
- please support Adafruit and open-source hardware by purchasing
- products from Adafruit!
-
- Written by Limor Fried/Ladyada for Adafruit Industries.
- MIT license, all text above must be included in any redistribution
- ****************************************************/
-
-#ifndef _ADAFRUIT_ST7735H_
-#define _ADAFRUIT_ST7735H_
-
-#if ARDUINO >= 100
- #include "Arduino.h"
- #include "Print.h"
-#else
- #include "WProgram.h"
-#endif
-#include <Adafruit_GFX.h>
-#include <avr/pgmspace.h>
-
-// some flags for initR() :(
-#define INITR_GREENTAB 0x0
-#define INITR_REDTAB 0x1
-#define INITR_BLACKTAB 0x2
-
-#define ST7735_TFTWIDTH 128
-#define ST7735_TFTHEIGHT 160
-
-#define ST7735_NOP 0x00
-#define ST7735_SWRESET 0x01
-#define ST7735_RDDID 0x04
-#define ST7735_RDDST 0x09
-
-#define ST7735_SLPIN 0x10
-#define ST7735_SLPOUT 0x11
-#define ST7735_PTLON 0x12
-#define ST7735_NORON 0x13
-
-#define ST7735_INVOFF 0x20
-#define ST7735_INVON 0x21
-#define ST7735_DISPOFF 0x28
-#define ST7735_DISPON 0x29
-#define ST7735_CASET 0x2A
-#define ST7735_RASET 0x2B
-#define ST7735_RAMWR 0x2C
-#define ST7735_RAMRD 0x2E
-
-#define ST7735_PTLAR 0x30
-#define ST7735_COLMOD 0x3A
-#define ST7735_MADCTL 0x36
-
-#define ST7735_FRMCTR1 0xB1
-#define ST7735_FRMCTR2 0xB2
-#define ST7735_FRMCTR3 0xB3
-#define ST7735_INVCTR 0xB4
-#define ST7735_DISSET5 0xB6
-
-#define ST7735_PWCTR1 0xC0
-#define ST7735_PWCTR2 0xC1
-#define ST7735_PWCTR3 0xC2
-#define ST7735_PWCTR4 0xC3
-#define ST7735_PWCTR5 0xC4
-#define ST7735_VMCTR1 0xC5
-
-#define ST7735_RDID1 0xDA
-#define ST7735_RDID2 0xDB
-#define ST7735_RDID3 0xDC
-#define ST7735_RDID4 0xDD
-
-#define ST7735_PWCTR6 0xFC
-
-#define ST7735_GMCTRP1 0xE0
-#define ST7735_GMCTRN1 0xE1
-
-// Color definitions
-#define ST7735_BLACK 0x0000
-#define ST7735_BLUE 0x001F
-#define ST7735_RED 0xF800
-#define ST7735_GREEN 0x07E0
-#define ST7735_CYAN 0x07FF
-#define ST7735_MAGENTA 0xF81F
-#define ST7735_YELLOW 0xFFE0
-#define ST7735_WHITE 0xFFFF
-
-
-class Adafruit_ST7735 : public Adafruit_GFX {
-
- public:
-
- Adafruit_ST7735(uint8_t CS, uint8_t RS, uint8_t SID, uint8_t SCLK,
- uint8_t RST);
- Adafruit_ST7735(uint8_t CS, uint8_t RS, uint8_t RST);
-
- void initB(void), // for ST7735B displays
- initR(uint8_t options = INITR_GREENTAB), // for ST7735R
- setAddrWindow(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1),
- pushColor(uint16_t color),
- fillScreen(uint16_t color),
- drawPixel(int16_t x, int16_t y, uint16_t color),
- drawFastVLine(int16_t x, int16_t y, int16_t h, uint16_t color),
- drawFastHLine(int16_t x, int16_t y, int16_t w, uint16_t color),
- fillRect(int16_t x, int16_t y, int16_t w, int16_t h,
- uint16_t color),
- setRotation(uint8_t r),
- invertDisplay(boolean i);
- uint16_t Color565(uint8_t r, uint8_t g, uint8_t b) { return newColor(r, g, b);}
-
- /* These are not for current use, 8-bit protocol only!
- uint8_t readdata(void),
- readcommand8(uint8_t);
- uint16_t readcommand16(uint8_t);
- uint32_t readcommand32(uint8_t);
- void dummyclock(void);
- */
-
- private:
- uint8_t tabcolor;
-
- void spiwrite(uint8_t),
- writecommand(uint8_t c),
- writedata(uint8_t d),
- commandList(uint8_t *addr),
- commonInit(uint8_t *cmdList);
-//uint8_t spiread(void);
-
- boolean hwSPI;
- #if defined(ARDUINO_ARCH_SAM)
- volatile uint32_t *dataport, *clkport, *csport, *rsport;
- uint32_t _cs, _rs, _rst, _sid, _sclk,
- datapinmask, clkpinmask, cspinmask, rspinmask,
- colstart, rowstart; // some displays need this changed
- #else
- volatile uint8_t *dataport, *clkport, *csport, *rsport;
- uint8_t _cs, _rs, _rst, _sid, _sclk,
- datapinmask, clkpinmask, cspinmask, rspinmask,
- colstart, rowstart; // some displays need this changed
- #endif
-};
-
-#endif
diff --git a/libraries/TFT/utility/PImage.h b/libraries/TFT/utility/PImage.h
deleted file mode 100644
index d37bf71..0000000
--- a/libraries/TFT/utility/PImage.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-#ifndef _PIMAGE_H
-#define _PIMAGE_H
-
-class Adafruit_GFX;
-
-#if defined(__SD_H__) // Arduino SD library
-
-
-/// This class mimics Processing's PImage, but with fewer
-/// capabilities. It allows an image stored in the SD card to be
-/// drawn to the display.
-/// @author Enrico Gueli <enrico.gueli@gmail.com>
-class PImage {
-public:
- PImage() :
- _valid(false),
- _bmpWidth(0),
- _bmpHeight(0) { }
-
- void draw(Adafruit_GFX & glcd, int16_t x, int16_t y);
-
- static PImage loadImage(const char * fileName);
-
-
- bool isValid() { return _valid; }
-
- int width() { return _bmpWidth; }
- int height() { return _bmpHeight; }
-
-private:
- friend class Adafruit_GFX;
-
- File _bmpFile;
- int _bmpWidth, _bmpHeight; // W+H in pixels
- uint8_t _bmpDepth; // Bit depth (currently must be 24)
- uint32_t _bmpImageoffset; // Start of image data in file
- uint32_t _rowSize; // Not always = bmpWidth; may have padding
- bool _flip;
-
- bool _valid;
-
- PImage(File & bmpFile, int bmpWidth, int bmpHeight, uint8_t bmpDepth, uint32_t bmpImageoffset, uint32_t rowSize, bool flip) :
- _bmpFile(bmpFile),
- _bmpWidth(bmpWidth),
- _bmpHeight(bmpHeight),
- _bmpDepth(bmpDepth),
- _bmpImageoffset(bmpImageoffset),
- _rowSize(rowSize),
- _flip(flip),
- _valid(true) // since Adafruit_GFX is friend, we could just let it write the variables and save some CPU cycles
- { }
-
- static uint16_t read16(File f);
- static uint32_t read32(File f);
-
- // TODO close the file in ~PImage and PImage(const PImage&)
-
-};
-
-#endif
-
-#endif // _PIMAGE_H
diff --git a/libraries/TFT/utility/glcdfont.c b/libraries/TFT/utility/glcdfont.c
deleted file mode 100644
index a325057..0000000
--- a/libraries/TFT/utility/glcdfont.c
+++ /dev/null
@@ -1,268 +0,0 @@
-#ifndef ARDUINO_ARCH_SAM
-#include <avr/io.h>
-#endif
-#include <avr/pgmspace.h>
-
-#ifndef FONT5X7_H
-#define FONT5X7_H
-
-// standard ascii 5x7 font
-
-static unsigned char font[] PROGMEM = {
- 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x3E, 0x5B, 0x4F, 0x5B, 0x3E,
- 0x3E, 0x6B, 0x4F, 0x6B, 0x3E,
- 0x1C, 0x3E, 0x7C, 0x3E, 0x1C,
- 0x18, 0x3C, 0x7E, 0x3C, 0x18,
- 0x1C, 0x57, 0x7D, 0x57, 0x1C,
- 0x1C, 0x5E, 0x7F, 0x5E, 0x1C,
- 0x00, 0x18, 0x3C, 0x18, 0x00,
- 0xFF, 0xE7, 0xC3, 0xE7, 0xFF,
- 0x00, 0x18, 0x24, 0x18, 0x00,
- 0xFF, 0xE7, 0xDB, 0xE7, 0xFF,
- 0x30, 0x48, 0x3A, 0x06, 0x0E,
- 0x26, 0x29, 0x79, 0x29, 0x26,
- 0x40, 0x7F, 0x05, 0x05, 0x07,
- 0x40, 0x7F, 0x05, 0x25, 0x3F,
- 0x5A, 0x3C, 0xE7, 0x3C, 0x5A,
- 0x7F, 0x3E, 0x1C, 0x1C, 0x08,
- 0x08, 0x1C, 0x1C, 0x3E, 0x7F,
- 0x14, 0x22, 0x7F, 0x22, 0x14,
- 0x5F, 0x5F, 0x00, 0x5F, 0x5F,
- 0x06, 0x09, 0x7F, 0x01, 0x7F,
- 0x00, 0x66, 0x89, 0x95, 0x6A,
- 0x60, 0x60, 0x60, 0x60, 0x60,
- 0x94, 0xA2, 0xFF, 0xA2, 0x94,
- 0x08, 0x04, 0x7E, 0x04, 0x08,
- 0x10, 0x20, 0x7E, 0x20, 0x10,
- 0x08, 0x08, 0x2A, 0x1C, 0x08,
- 0x08, 0x1C, 0x2A, 0x08, 0x08,
- 0x1E, 0x10, 0x10, 0x10, 0x10,
- 0x0C, 0x1E, 0x0C, 0x1E, 0x0C,
- 0x30, 0x38, 0x3E, 0x38, 0x30,
- 0x06, 0x0E, 0x3E, 0x0E, 0x06,
- 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x5F, 0x00, 0x00,
- 0x00, 0x07, 0x00, 0x07, 0x00,
- 0x14, 0x7F, 0x14, 0x7F, 0x14,
- 0x24, 0x2A, 0x7F, 0x2A, 0x12,
- 0x23, 0x13, 0x08, 0x64, 0x62,
- 0x36, 0x49, 0x56, 0x20, 0x50,
- 0x00, 0x08, 0x07, 0x03, 0x00,
- 0x00, 0x1C, 0x22, 0x41, 0x00,
- 0x00, 0x41, 0x22, 0x1C, 0x00,
- 0x2A, 0x1C, 0x7F, 0x1C, 0x2A,
- 0x08, 0x08, 0x3E, 0x08, 0x08,
- 0x00, 0x80, 0x70, 0x30, 0x00,
- 0x08, 0x08, 0x08, 0x08, 0x08,
- 0x00, 0x00, 0x60, 0x60, 0x00,
- 0x20, 0x10, 0x08, 0x04, 0x02,
- 0x3E, 0x51, 0x49, 0x45, 0x3E,
- 0x00, 0x42, 0x7F, 0x40, 0x00,
- 0x72, 0x49, 0x49, 0x49, 0x46,
- 0x21, 0x41, 0x49, 0x4D, 0x33,
- 0x18, 0x14, 0x12, 0x7F, 0x10,
- 0x27, 0x45, 0x45, 0x45, 0x39,
- 0x3C, 0x4A, 0x49, 0x49, 0x31,
- 0x41, 0x21, 0x11, 0x09, 0x07,
- 0x36, 0x49, 0x49, 0x49, 0x36,
- 0x46, 0x49, 0x49, 0x29, 0x1E,
- 0x00, 0x00, 0x14, 0x00, 0x00,
- 0x00, 0x40, 0x34, 0x00, 0x00,
- 0x00, 0x08, 0x14, 0x22, 0x41,
- 0x14, 0x14, 0x14, 0x14, 0x14,
- 0x00, 0x41, 0x22, 0x14, 0x08,
- 0x02, 0x01, 0x59, 0x09, 0x06,
- 0x3E, 0x41, 0x5D, 0x59, 0x4E,
- 0x7C, 0x12, 0x11, 0x12, 0x7C,
- 0x7F, 0x49, 0x49, 0x49, 0x36,
- 0x3E, 0x41, 0x41, 0x41, 0x22,
- 0x7F, 0x41, 0x41, 0x41, 0x3E,
- 0x7F, 0x49, 0x49, 0x49, 0x41,
- 0x7F, 0x09, 0x09, 0x09, 0x01,
- 0x3E, 0x41, 0x41, 0x51, 0x73,
- 0x7F, 0x08, 0x08, 0x08, 0x7F,
- 0x00, 0x41, 0x7F, 0x41, 0x00,
- 0x20, 0x40, 0x41, 0x3F, 0x01,
- 0x7F, 0x08, 0x14, 0x22, 0x41,
- 0x7F, 0x40, 0x40, 0x40, 0x40,
- 0x7F, 0x02, 0x1C, 0x02, 0x7F,
- 0x7F, 0x04, 0x08, 0x10, 0x7F,
- 0x3E, 0x41, 0x41, 0x41, 0x3E,
- 0x7F, 0x09, 0x09, 0x09, 0x06,
- 0x3E, 0x41, 0x51, 0x21, 0x5E,
- 0x7F, 0x09, 0x19, 0x29, 0x46,
- 0x26, 0x49, 0x49, 0x49, 0x32,
- 0x03, 0x01, 0x7F, 0x01, 0x03,
- 0x3F, 0x40, 0x40, 0x40, 0x3F,
- 0x1F, 0x20, 0x40, 0x20, 0x1F,
- 0x3F, 0x40, 0x38, 0x40, 0x3F,
- 0x63, 0x14, 0x08, 0x14, 0x63,
- 0x03, 0x04, 0x78, 0x04, 0x03,
- 0x61, 0x59, 0x49, 0x4D, 0x43,
- 0x00, 0x7F, 0x41, 0x41, 0x41,
- 0x02, 0x04, 0x08, 0x10, 0x20,
- 0x00, 0x41, 0x41, 0x41, 0x7F,
- 0x04, 0x02, 0x01, 0x02, 0x04,
- 0x40, 0x40, 0x40, 0x40, 0x40,
- 0x00, 0x03, 0x07, 0x08, 0x00,
- 0x20, 0x54, 0x54, 0x78, 0x40,
- 0x7F, 0x28, 0x44, 0x44, 0x38,
- 0x38, 0x44, 0x44, 0x44, 0x28,
- 0x38, 0x44, 0x44, 0x28, 0x7F,
- 0x38, 0x54, 0x54, 0x54, 0x18,
- 0x00, 0x08, 0x7E, 0x09, 0x02,
- 0x18, 0xA4, 0xA4, 0x9C, 0x78,
- 0x7F, 0x08, 0x04, 0x04, 0x78,
- 0x00, 0x44, 0x7D, 0x40, 0x00,
- 0x20, 0x40, 0x40, 0x3D, 0x00,
- 0x7F, 0x10, 0x28, 0x44, 0x00,
- 0x00, 0x41, 0x7F, 0x40, 0x00,
- 0x7C, 0x04, 0x78, 0x04, 0x78,
- 0x7C, 0x08, 0x04, 0x04, 0x78,
- 0x38, 0x44, 0x44, 0x44, 0x38,
- 0xFC, 0x18, 0x24, 0x24, 0x18,
- 0x18, 0x24, 0x24, 0x18, 0xFC,
- 0x7C, 0x08, 0x04, 0x04, 0x08,
- 0x48, 0x54, 0x54, 0x54, 0x24,
- 0x04, 0x04, 0x3F, 0x44, 0x24,
- 0x3C, 0x40, 0x40, 0x20, 0x7C,
- 0x1C, 0x20, 0x40, 0x20, 0x1C,
- 0x3C, 0x40, 0x30, 0x40, 0x3C,
- 0x44, 0x28, 0x10, 0x28, 0x44,
- 0x4C, 0x90, 0x90, 0x90, 0x7C,
- 0x44, 0x64, 0x54, 0x4C, 0x44,
- 0x00, 0x08, 0x36, 0x41, 0x00,
- 0x00, 0x00, 0x77, 0x00, 0x00,
- 0x00, 0x41, 0x36, 0x08, 0x00,
- 0x02, 0x01, 0x02, 0x04, 0x02,
- 0x3C, 0x26, 0x23, 0x26, 0x3C,
- 0x1E, 0xA1, 0xA1, 0x61, 0x12,
- 0x3A, 0x40, 0x40, 0x20, 0x7A,
- 0x38, 0x54, 0x54, 0x55, 0x59,
- 0x21, 0x55, 0x55, 0x79, 0x41,
- 0x21, 0x54, 0x54, 0x78, 0x41,
- 0x21, 0x55, 0x54, 0x78, 0x40,
- 0x20, 0x54, 0x55, 0x79, 0x40,
- 0x0C, 0x1E, 0x52, 0x72, 0x12,
- 0x39, 0x55, 0x55, 0x55, 0x59,
- 0x39, 0x54, 0x54, 0x54, 0x59,
- 0x39, 0x55, 0x54, 0x54, 0x58,
- 0x00, 0x00, 0x45, 0x7C, 0x41,
- 0x00, 0x02, 0x45, 0x7D, 0x42,
- 0x00, 0x01, 0x45, 0x7C, 0x40,
- 0xF0, 0x29, 0x24, 0x29, 0xF0,
- 0xF0, 0x28, 0x25, 0x28, 0xF0,
- 0x7C, 0x54, 0x55, 0x45, 0x00,
- 0x20, 0x54, 0x54, 0x7C, 0x54,
- 0x7C, 0x0A, 0x09, 0x7F, 0x49,
- 0x32, 0x49, 0x49, 0x49, 0x32,
- 0x32, 0x48, 0x48, 0x48, 0x32,
- 0x32, 0x4A, 0x48, 0x48, 0x30,
- 0x3A, 0x41, 0x41, 0x21, 0x7A,
- 0x3A, 0x42, 0x40, 0x20, 0x78,
- 0x00, 0x9D, 0xA0, 0xA0, 0x7D,
- 0x39, 0x44, 0x44, 0x44, 0x39,
- 0x3D, 0x40, 0x40, 0x40, 0x3D,
- 0x3C, 0x24, 0xFF, 0x24, 0x24,
- 0x48, 0x7E, 0x49, 0x43, 0x66,
- 0x2B, 0x2F, 0xFC, 0x2F, 0x2B,
- 0xFF, 0x09, 0x29, 0xF6, 0x20,
- 0xC0, 0x88, 0x7E, 0x09, 0x03,
- 0x20, 0x54, 0x54, 0x79, 0x41,
- 0x00, 0x00, 0x44, 0x7D, 0x41,
- 0x30, 0x48, 0x48, 0x4A, 0x32,
- 0x38, 0x40, 0x40, 0x22, 0x7A,
- 0x00, 0x7A, 0x0A, 0x0A, 0x72,
- 0x7D, 0x0D, 0x19, 0x31, 0x7D,
- 0x26, 0x29, 0x29, 0x2F, 0x28,
- 0x26, 0x29, 0x29, 0x29, 0x26,
- 0x30, 0x48, 0x4D, 0x40, 0x20,
- 0x38, 0x08, 0x08, 0x08, 0x08,
- 0x08, 0x08, 0x08, 0x08, 0x38,
- 0x2F, 0x10, 0xC8, 0xAC, 0xBA,
- 0x2F, 0x10, 0x28, 0x34, 0xFA,
- 0x00, 0x00, 0x7B, 0x00, 0x00,
- 0x08, 0x14, 0x2A, 0x14, 0x22,
- 0x22, 0x14, 0x2A, 0x14, 0x08,
- 0xAA, 0x00, 0x55, 0x00, 0xAA,
- 0xAA, 0x55, 0xAA, 0x55, 0xAA,
- 0x00, 0x00, 0x00, 0xFF, 0x00,
- 0x10, 0x10, 0x10, 0xFF, 0x00,
- 0x14, 0x14, 0x14, 0xFF, 0x00,
- 0x10, 0x10, 0xFF, 0x00, 0xFF,
- 0x10, 0x10, 0xF0, 0x10, 0xF0,
- 0x14, 0x14, 0x14, 0xFC, 0x00,
- 0x14, 0x14, 0xF7, 0x00, 0xFF,
- 0x00, 0x00, 0xFF, 0x00, 0xFF,
- 0x14, 0x14, 0xF4, 0x04, 0xFC,
- 0x14, 0x14, 0x17, 0x10, 0x1F,
- 0x10, 0x10, 0x1F, 0x10, 0x1F,
- 0x14, 0x14, 0x14, 0x1F, 0x00,
- 0x10, 0x10, 0x10, 0xF0, 0x00,
- 0x00, 0x00, 0x00, 0x1F, 0x10,
- 0x10, 0x10, 0x10, 0x1F, 0x10,
- 0x10, 0x10, 0x10, 0xF0, 0x10,
- 0x00, 0x00, 0x00, 0xFF, 0x10,
- 0x10, 0x10, 0x10, 0x10, 0x10,
- 0x10, 0x10, 0x10, 0xFF, 0x10,
- 0x00, 0x00, 0x00, 0xFF, 0x14,
- 0x00, 0x00, 0xFF, 0x00, 0xFF,
- 0x00, 0x00, 0x1F, 0x10, 0x17,
- 0x00, 0x00, 0xFC, 0x04, 0xF4,
- 0x14, 0x14, 0x17, 0x10, 0x17,
- 0x14, 0x14, 0xF4, 0x04, 0xF4,
- 0x00, 0x00, 0xFF, 0x00, 0xF7,
- 0x14, 0x14, 0x14, 0x14, 0x14,
- 0x14, 0x14, 0xF7, 0x00, 0xF7,
- 0x14, 0x14, 0x14, 0x17, 0x14,
- 0x10, 0x10, 0x1F, 0x10, 0x1F,
- 0x14, 0x14, 0x14, 0xF4, 0x14,
- 0x10, 0x10, 0xF0, 0x10, 0xF0,
- 0x00, 0x00, 0x1F, 0x10, 0x1F,
- 0x00, 0x00, 0x00, 0x1F, 0x14,
- 0x00, 0x00, 0x00, 0xFC, 0x14,
- 0x00, 0x00, 0xF0, 0x10, 0xF0,
- 0x10, 0x10, 0xFF, 0x10, 0xFF,
- 0x14, 0x14, 0x14, 0xFF, 0x14,
- 0x10, 0x10, 0x10, 0x1F, 0x00,
- 0x00, 0x00, 0x00, 0xF0, 0x10,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xF0, 0xF0, 0xF0, 0xF0, 0xF0,
- 0xFF, 0xFF, 0xFF, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0xFF, 0xFF,
- 0x0F, 0x0F, 0x0F, 0x0F, 0x0F,
- 0x38, 0x44, 0x44, 0x38, 0x44,
- 0x7C, 0x2A, 0x2A, 0x3E, 0x14,
- 0x7E, 0x02, 0x02, 0x06, 0x06,
- 0x02, 0x7E, 0x02, 0x7E, 0x02,
- 0x63, 0x55, 0x49, 0x41, 0x63,
- 0x38, 0x44, 0x44, 0x3C, 0x04,
- 0x40, 0x7E, 0x20, 0x1E, 0x20,
- 0x06, 0x02, 0x7E, 0x02, 0x02,
- 0x99, 0xA5, 0xE7, 0xA5, 0x99,
- 0x1C, 0x2A, 0x49, 0x2A, 0x1C,
- 0x4C, 0x72, 0x01, 0x72, 0x4C,
- 0x30, 0x4A, 0x4D, 0x4D, 0x30,
- 0x30, 0x48, 0x78, 0x48, 0x30,
- 0xBC, 0x62, 0x5A, 0x46, 0x3D,
- 0x3E, 0x49, 0x49, 0x49, 0x00,
- 0x7E, 0x01, 0x01, 0x01, 0x7E,
- 0x2A, 0x2A, 0x2A, 0x2A, 0x2A,
- 0x44, 0x44, 0x5F, 0x44, 0x44,
- 0x40, 0x51, 0x4A, 0x44, 0x40,
- 0x40, 0x44, 0x4A, 0x51, 0x40,
- 0x00, 0x00, 0xFF, 0x01, 0x03,
- 0xE0, 0x80, 0xFF, 0x00, 0x00,
- 0x08, 0x08, 0x6B, 0x6B, 0x08,
- 0x36, 0x12, 0x36, 0x24, 0x36,
- 0x06, 0x0F, 0x09, 0x0F, 0x06,
- 0x00, 0x00, 0x18, 0x18, 0x00,
- 0x00, 0x00, 0x10, 0x10, 0x00,
- 0x30, 0x40, 0xFF, 0x01, 0x01,
- 0x00, 0x1F, 0x01, 0x01, 0x1E,
- 0x00, 0x19, 0x1D, 0x17, 0x12,
- 0x00, 0x3C, 0x3C, 0x3C, 0x3C,
- 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-#endif
diff --git a/libraries/TFT/utility/keywords.txt b/libraries/TFT/utility/keywords.txt
deleted file mode 100644
index 9614847..0000000
--- a/libraries/TFT/utility/keywords.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-#######################################
-# Syntax Coloring Map For Adafruit_GFX
-# and Adafruit_ST7735
-#######################################
-
-#######################################
-# Datatypes (KEYWORD1)
-#######################################
-
-Adafruit_GFX KEYWORD1
-Adafruit_ST7735 KEYWORD1
-PImage KEYWORD1
-
-#######################################
-# Methods and Functions (KEYWORD2)
-#######################################
-
-drawPixel KEYWORD2
-invertDisplay KEYWORD2
-drawLine KEYWORD2
-drawFastVLine KEYWORD2
-drawFastHLine KEYWORD2
-drawRect KEYWORD2
-fillRect KEYWORD2
-fillScreen KEYWORD2
-drawCircle KEYWORD2
-drawCircleHelper KEYWORD2
-fillCircle KEYWORD2
-fillCircleHelper KEYWORD2
-drawTriangle KEYWORD2
-fillTriangle KEYWORD2
-drawRoundRect KEYWORD2
-fillRoundRect KEYWORD2
-drawBitmap KEYWORD2
-drawChar KEYWORD2
-setCursor KEYWORD2
-setTextColor KEYWORD2
-setTextSize KEYWORD2
-setTextWrap KEYWORD2
-height KEYWORD2
-width KEYWORD2
-setRotation KEYWORD2
-getRotation KEYWORD2
-
-
-
-newColor KEYWORD2
-background KEYWORD2
-fill KEYWORD2
-noFill KEYWORD2
-stroke KEYWORD2
-noStroke KEYWORD2
-text KEYWORD2
-textWrap KEYWORD2
-textSize KEYWORD2
-circle KEYWORD2
-point KEYWORD2
-quad KEYWORD2
-rect KEYWORD2
-triangle KEYWORD2
-loadImage KEYWORD2
-image KEYWORD2
-
-draw KEYWORD2
-isValid KEYWORD2
-
-#######################################
-# Constants (LITERAL1)
-#######################################
-
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2024-11-22 21:46:38 +0000