Merge pull request #62 from tyeth/bump-version-1.0.4

Update version to 1.0.4

Adafruit_TFTLCD.h

@@ -6,16 +6,10 @@
 #ifndef _ADAFRUIT_TFTLCD_H_
 #define _ADAFRUIT_TFTLCD_H_
 
-#if defined(__AVR__)
-  typedef volatile uint8_t RwReg;
-#elif defined(__arm__)
-  typedef volatile uint32_t RwReg;
-#endif
-
 #if ARDUINO >= 100
- #include "Arduino.h"
+#include "Arduino.h"
 #else
- #include "WProgram.h"
+#include "WProgram.h"
 #endif
 
 #include <Adafruit_GFX.h>
@@ -27,74 +21,73 @@
 
 class Adafruit_TFTLCD : public Adafruit_GFX {
 
- public:
-
+public:
   Adafruit_TFTLCD(uint8_t cs, uint8_t cd, uint8_t wr, uint8_t rd, uint8_t rst);
   Adafruit_TFTLCD(void);
 
-  void     begin(uint16_t id = 0x9325);
-  void     drawPixel(int16_t x, int16_t y, uint16_t color);
-  void     drawFastHLine(int16_t x0, int16_t y0, int16_t w, uint16_t color);
-  void     drawFastVLine(int16_t x0, int16_t y0, int16_t h, uint16_t color);
-  void     fillRect(int16_t x, int16_t y, int16_t w, int16_t h, uint16_t c);
-  void     fillScreen(uint16_t color);
-  void     reset(void);
-  void     setRegisters8(uint8_t *ptr, uint8_t n);
-  void     setRegisters16(uint16_t *ptr, uint8_t n);
-  void     setRotation(uint8_t x);
-       // These methods are public in order for BMP examples to work:
-  void     setAddrWindow(int x1, int y1, int x2, int y2);
-  void     pushColors(uint16_t *data, uint8_t len, boolean first);
+  void begin(uint16_t id = 0x9325);
+  void drawPixel(int16_t x, int16_t y, uint16_t color);
+  void drawFastHLine(int16_t x0, int16_t y0, int16_t w, uint16_t color);
+  void drawFastVLine(int16_t x0, int16_t y0, int16_t h, uint16_t color);
+  void fillRect(int16_t x, int16_t y, int16_t w, int16_t h, uint16_t c);
+  void fillScreen(uint16_t color);
+  void reset(void);
+  void setRegisters8(uint8_t *ptr, uint8_t n);
+  void setRegisters16(uint16_t *ptr, uint8_t n);
+  void setRotation(uint8_t x);
+  // These methods are public in order for BMP examples to work:
+  void setAddrWindow(int x1, int y1, int x2, int y2);
+  void pushColors(uint16_t *data, uint8_t len, boolean first);
 
   uint16_t color565(uint8_t r, uint8_t g, uint8_t b),
-           readPixel(int16_t x, int16_t y),
-           readID(void);
+      readPixel(int16_t x, int16_t y), readID(void);
   uint32_t readReg(uint8_t r);
 
- private:
-
-  void     init(),
-           // These items may have previously been defined as macros
-           // in pin_magic.h.  If not, function versions are declared:
+private:
+  void init(),
+  // These items may have previously been defined as macros
+  // in pin_magic.h.  If not, function versions are declared:
 #ifndef write8
-           write8(uint8_t value),
+      write8(uint8_t value),
 #endif
 #ifndef setWriteDir
-           setWriteDir(void),
+      setWriteDir(void),
 #endif
 #ifndef setReadDir
-           setReadDir(void),
+      setReadDir(void),
 #endif
 #ifndef writeRegister8
-           writeRegister8(uint8_t a, uint8_t d),
+      writeRegister8(uint8_t a, uint8_t d),
 #endif
 #ifndef writeRegister16
-           writeRegister16(uint16_t a, uint16_t d),
+      writeRegister16(uint16_t a, uint16_t d),
 #endif
-    writeRegister24(uint8_t a, uint32_t d),
-    writeRegister32(uint8_t a, uint32_t d),
+      writeRegister24(uint8_t a, uint32_t d),
+      writeRegister32(uint8_t a, uint32_t d),
 #ifndef writeRegisterPair
-           writeRegisterPair(uint8_t aH, uint8_t aL, uint16_t d),
+      writeRegisterPair(uint8_t aH, uint8_t aL, uint16_t d),
 #endif
-           setLR(void),
-           flood(uint16_t color, uint32_t len);
-  uint8_t  driver;
+      setLR(void), flood(uint16_t color, uint32_t len);
+  uint8_t driver;
 
 #ifndef read8
-  uint8_t  read8fn(void);
-  #define  read8isFunctionalized
+  uint8_t read8fn(void);
+#define read8isFunctionalized
 #endif
 
 #ifndef USE_ADAFRUIT_SHIELD_PINOUT
 
-  volatile RwReg *csPort    , *cdPort    , *wrPort    , *rdPort;
-  RwReg           csPinSet  ,  cdPinSet  ,  wrPinSet  ,  rdPinSet  ,
-    csPinUnset,  cdPinUnset,  wrPinUnset,  rdPinUnset,
-    _reset;
+#ifdef __AVR__
+  volatile uint8_t *csPort, *cdPort, *wrPort, *rdPort;
+  uint8_t csPinSet, cdPinSet, wrPinSet, rdPinSet, csPinUnset, cdPinUnset,
+      wrPinUnset, rdPinUnset, _reset;
+#endif
+#if defined(__SAM3X8E__)
+  Pio *csPort, *cdPort, *wrPort, *rdPort;
+  uint32_t csPinSet, cdPinSet, wrPinSet, rdPinSet, csPinUnset, cdPinUnset,
+      wrPinUnset, rdPinUnset, _reset;
+#endif
 
-  #if defined(ADAFRUIT_PYPORTAL) 
-  volatile uint8_t *write_port, *read_port, *dir_port;
-  #endif
 #endif
 };
 

README.md

@@ -0,0 +1,20 @@
+# Adafruit library for 8-bit TFT LCDs such as ILI9325, ILI9328, etc
+
+This is a library for our Adafruit 8-bit TFT LCD breakouts
+
+<a href="https://www.adafruit.com/products/335"><img src="assets/image.jpg" height="300"/></a>
+
+Pick one up today in the adafruit shop!
+  * [https://www.adafruit.com/product/335](https://www.adafruit.com/product/1770)
+  * https://www.adafruit.com/product/376
+  * https://www.adafruit.com/product/335
+
+These displays use 8-bit parallel to communicate, 12 or 13 pins are required to interface (RST is optional). This library supports 8-bit and 16-bit parallel TFT displays on AVR (ATmega328/32u4/1280/2560) and the Arduino Due (SAM3X8E) only. It does not support ESP32, ESP8266, SAMD or RP2040 boards. For parallel displays on ESP32-S3, see the LCD_CAM peripheral and a library that drives it.
+
+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
+
+To install, use the Arduino Library Manager and search for "Adafruit 2.8" TFT display Library" and install the library.

README.txt

@@ -1,21 +0,0 @@
-This is a library for the Adafruit 2.8" TFT display.
-This library works with the Adafruit 2.8" TFT Breakout w/SD card
-  ----> http://www.adafruit.com/products/335
-as well as Adafruit TFT Touch Shield
-  ----> http://www.adafruit.com/products/376
- 
-Check out the links above for our tutorials and wiring diagrams.
-These displays use 8-bit parallel to communicate, 12 or 13 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_TFTLCD. Check that the Adafruit_TFTLCD folder contains Adafruit_TFTLCD.cpp and Adafruit_TFTLCD.
-
-Place the Adafruit_TFT 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. https://github.com/adafruit/Adafruit-GFX-Library

examples/pyportal_graphicstest/pyportal_graphicstest.ino

@@ -1,385 +0,0 @@
-// IMPORTANT: Adafruit_TFTLCD LIBRARY MUST BE SPECIFICALLY
-// CONFIGURED FOR EITHER THE TFT SHIELD OR THE BREAKOUT BOARD.
-// SEE RELEVANT COMMENTS IN Adafruit_TFTLCD.h FOR SETUP.
-
-#include <Adafruit_GFX.h>    // Core graphics library
-#include <Adafruit_TFTLCD.h> // Hardware-specific library
-
-// The control pins for the LCD can be assigned to any digital or
-// analog pins...but we'll use the analog pins as this allows us to
-// double up the pins with the touch screen (see the TFT paint example).
-#define TFT_CS A3 // Chip Select goes to Analog 3
-#define TFT_CD A2 // Command/Data goes to Analog 2
-#define TFT_WR A1 // LCD Write goes to Analog 1
-#define TFT_RD A0 // LCD Read goes to Analog 0
-
-#define LCD_RESET A4 // Can alternately just connect to Arduino's reset pin
-
-// When using the BREAKOUT BOARD only, use these 8 data lines to the LCD:
-// For the Arduino Uno, Duemilanove, Diecimila, etc.:
-//   D0 connects to digital pin 8  (Notice these are
-//   D1 connects to digital pin 9   NOT in order!)
-//   D2 connects to digital pin 2
-//   D3 connects to digital pin 3
-//   D4 connects to digital pin 4
-//   D5 connects to digital pin 5
-//   D6 connects to digital pin 6
-//   D7 connects to digital pin 7
-// For the Arduino Mega, use digital pins 22 through 29
-// (on the 2-row header at the end of the board).
-
-// Assign human-readable names to some common 16-bit color values:
-#define	BLACK   0x0000
-#define	BLUE    0x001F
-#define	RED     0xF800
-#define	GREEN   0x07E0
-#define CYAN    0x07FF
-#define MAGENTA 0xF81F
-#define YELLOW  0xFFE0
-#define WHITE   0xFFFF
-
-Adafruit_TFTLCD tft(TFT_CS, TFT_CD, TFT_WR, TFT_RD, TFT_RESET);
-// If using the shield, all control and data lines are fixed, and
-// a simpler declaration can optionally be used:
-// Adafruit_TFTLCD tft;
-
-void setup(void) {
-  Serial.begin(9600);
-  Serial.println(F("TFT LCD test"));
-
-#ifdef USE_ADAFRUIT_SHIELD_PINOUT
-  Serial.println(F("Using Adafruit 2.8\" TFT Arduino Shield Pinout"));
-#else
-  Serial.println(F("Using Adafruit 2.8\" TFT Breakout Board Pinout"));
-#endif
-
-  Serial.print("TFT size is "); Serial.print(tft.width()); Serial.print("x"); Serial.println(tft.height());
-
-  tft.reset();
-
-  uint16_t identifier = tft.readID();
-
-  if(identifier == 0x9325) {
-    Serial.println(F("Found ILI9325 LCD driver"));
-  } else if(identifier == 0x9328) {
-    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 if(identifier == 0x8357) {
-    Serial.println(F("Found HX8357D LCD driver"));
-  } else {
-    Serial.print(F("Unknown LCD driver chip: "));
-    Serial.println(identifier, HEX);
-    Serial.println(F("If using the Adafruit 2.8\" TFT Arduino shield, the line:"));
-    Serial.println(F("  #define USE_ADAFRUIT_SHIELD_PINOUT"));
-    Serial.println(F("should appear in the library header (Adafruit_TFT.h)."));
-    Serial.println(F("If using the breakout board, it should NOT be #defined!"));
-    Serial.println(F("Also if using the breakout, double-check that all wiring"));
-    Serial.println(F("matches the tutorial."));
-    return;
-  }
-
-  tft.begin(identifier);
-
-  Serial.println(F("Benchmark                Time (microseconds)"));
-
-  Serial.print(F("Screen fill              "));
-  Serial.println(testFillScreen());
-  delay(500);
-
-  Serial.print(F("Text                     "));
-  Serial.println(testText());
-  delay(3000);
-
-  Serial.print(F("Lines                    "));
-  Serial.println(testLines(CYAN));
-  delay(500);
-
-  Serial.print(F("Horiz/Vert Lines         "));
-  Serial.println(testFastLines(RED, BLUE));
-  delay(500);
-
-  Serial.print(F("Rectangles (outline)     "));
-  Serial.println(testRects(GREEN));
-  delay(500);
-
-  Serial.print(F("Rectangles (filled)      "));
-  Serial.println(testFilledRects(YELLOW, MAGENTA));
-  delay(500);
-
-  Serial.print(F("Circles (filled)         "));
-  Serial.println(testFilledCircles(10, MAGENTA));
-
-  Serial.print(F("Circles (outline)        "));
-  Serial.println(testCircles(10, WHITE));
-  delay(500);
-
-  Serial.print(F("Triangles (outline)      "));
-  Serial.println(testTriangles());
-  delay(500);
-
-  Serial.print(F("Triangles (filled)       "));
-  Serial.println(testFilledTriangles());
-  delay(500);
-
-  Serial.print(F("Rounded rects (outline)  "));
-  Serial.println(testRoundRects());
-  delay(500);
-
-  Serial.print(F("Rounded rects (filled)   "));
-  Serial.println(testFilledRoundRects());
-  delay(500);
-
-  Serial.println(F("Done!"));
-}
-
-void loop(void) {
-  for(uint8_t rotation=0; rotation<4; rotation++) {
-    tft.setRotation(rotation);
-    testText();
-    delay(2000);
-  }
-}
-
-unsigned long testFillScreen() {
-  unsigned long start = micros();
-  tft.fillScreen(BLACK);
-  tft.fillScreen(RED);
-  tft.fillScreen(GREEN);
-  tft.fillScreen(BLUE);
-  tft.fillScreen(BLACK);
-  return micros() - start;
-}
-
-unsigned long testText() {
-  tft.fillScreen(BLACK);
-  unsigned long start = micros();
-  tft.setCursor(0, 0);
-  tft.setTextColor(WHITE);  tft.setTextSize(1);
-  tft.println("Hello World!");
-  tft.setTextColor(YELLOW); tft.setTextSize(2);
-  tft.println(1234.56);
-  tft.setTextColor(RED);    tft.setTextSize(3);
-  tft.println(0xDEADBEEF, HEX);
-  tft.println();
-  tft.setTextColor(GREEN);
-  tft.setTextSize(5);
-  tft.println("Groop");
-  tft.setTextSize(2);
-  tft.println("I implore thee,");
-  tft.setTextSize(1);
-  tft.println("my foonting turlingdromes.");
-  tft.println("And hooptiously drangle me");
-  tft.println("with crinkly bindlewurdles,");
-  tft.println("Or I will rend thee");
-  tft.println("in the gobberwarts");
-  tft.println("with my blurglecruncheon,");
-  tft.println("see if I don't!");
-  return micros() - start;
-}
-
-unsigned long testLines(uint16_t color) {
-  unsigned long start, t;
-  int           x1, y1, x2, y2,
-                w = tft.width(),
-                h = tft.height();
-
-  tft.fillScreen(BLACK);
-
-  x1 = y1 = 0;
-  y2    = h - 1;
-  start = micros();
-  for(x2=0; x2<w; x2+=6) tft.drawLine(x1, y1, x2, y2, color);
-  x2    = w - 1;
-  for(y2=0; y2<h; y2+=6) tft.drawLine(x1, y1, x2, y2, color);
-  t     = micros() - start; // fillScreen doesn't count against timing
-
-  tft.fillScreen(BLACK);
-
-  x1    = w - 1;
-  y1    = 0;
-  y2    = h - 1;
-  start = micros();
-  for(x2=0; x2<w; x2+=6) tft.drawLine(x1, y1, x2, y2, color);
-  x2    = 0;
-  for(y2=0; y2<h; y2+=6) tft.drawLine(x1, y1, x2, y2, color);
-  t    += micros() - start;
-
-  tft.fillScreen(BLACK);
-
-  x1    = 0;
-  y1    = h - 1;
-  y2    = 0;
-  start = micros();
-  for(x2=0; x2<w; x2+=6) tft.drawLine(x1, y1, x2, y2, color);
-  x2    = w - 1;
-  for(y2=0; y2<h; y2+=6) tft.drawLine(x1, y1, x2, y2, color);
-  t    += micros() - start;
-
-  tft.fillScreen(BLACK);
-
-  x1    = w - 1;
-  y1    = h - 1;
-  y2    = 0;
-  start = micros();
-  for(x2=0; x2<w; x2+=6) tft.drawLine(x1, y1, x2, y2, color);
-  x2    = 0;
-  for(y2=0; y2<h; y2+=6) tft.drawLine(x1, y1, x2, y2, color);
-
-  return micros() - start;
-}
-
-unsigned long testFastLines(uint16_t color1, uint16_t color2) {
-  unsigned long start;
-  int           x, y, w = tft.width(), h = tft.height();
-
-  tft.fillScreen(BLACK);
-  start = micros();
-  for(y=0; y<h; y+=5) tft.drawFastHLine(0, y, w, color1);
-  for(x=0; x<w; x+=5) tft.drawFastVLine(x, 0, h, color2);
-
-  return micros() - start;
-}
-
-unsigned long testRects(uint16_t color) {
-  unsigned long start;
-  int           n, i, i2,
-                cx = tft.width()  / 2,
-                cy = tft.height() / 2;
-
-  tft.fillScreen(BLACK);
-  n     = min(tft.width(), tft.height());
-  start = micros();
-  for(i=2; i<n; i+=6) {
-    i2 = i / 2;
-    tft.drawRect(cx-i2, cy-i2, i, i, color);
-  }
-
-  return micros() - start;
-}
-
-unsigned long testFilledRects(uint16_t color1, uint16_t color2) {
-  unsigned long start, t = 0;
-  int           n, i, i2,
-                cx = tft.width()  / 2 - 1,
-                cy = tft.height() / 2 - 1;
-
-  tft.fillScreen(BLACK);
-  n = min(tft.width(), tft.height());
-  for(i=n; i>0; i-=6) {
-    i2    = i / 2;
-    start = micros();
-    tft.fillRect(cx-i2, cy-i2, i, i, color1);
-    t    += micros() - start;
-    // Outlines are not included in timing results
-    tft.drawRect(cx-i2, cy-i2, i, i, color2);
-  }
-
-  return t;
-}
-
-unsigned long testFilledCircles(uint8_t radius, uint16_t color) {
-  unsigned long start;
-  int x, y, w = tft.width(), h = tft.height(), r2 = radius * 2;
-
-  tft.fillScreen(BLACK);
-  start = micros();
-  for(x=radius; x<w; x+=r2) {
-    for(y=radius; y<h; y+=r2) {
-      tft.fillCircle(x, y, radius, color);
-    }
-  }
-
-  return micros() - start;
-}
-
-unsigned long testCircles(uint8_t radius, uint16_t color) {
-  unsigned long start;
-  int           x, y, r2 = radius * 2,
-                w = tft.width()  + radius,
-                h = tft.height() + radius;
-
-  // Screen is not cleared for this one -- this is
-  // intentional and does not affect the reported time.
-  start = micros();
-  for(x=0; x<w; x+=r2) {
-    for(y=0; y<h; y+=r2) {
-      tft.drawCircle(x, y, radius, color);
-    }
-  }
-
-  return micros() - start;
-}
-
-unsigned long testTriangles() {
-  unsigned long start;
-  int           n, i, cx = tft.width()  / 2 - 1,
-                      cy = tft.height() / 2 - 1;
-
-  tft.fillScreen(BLACK);
-  n     = min(cx, cy);
-  start = micros();
-  for(i=0; i<n; i+=5) {
-    tft.drawTriangle(
-      cx    , cy - i, // peak
-      cx - i, cy + i, // bottom left
-      cx + i, cy + i, // bottom right
-      tft.color565(0, 0, i));
-  }
-
-  return micros() - start;
-}
-
-unsigned long testFilledTriangles() {
-  unsigned long start, t = 0;
-  int           i, cx = tft.width()  / 2 - 1,
-                   cy = tft.height() / 2 - 1;
-
-  tft.fillScreen(BLACK);
-  start = micros();
-  for(i=min(cx,cy); i>10; i-=5) {
-    start = micros();
-    tft.fillTriangle(cx, cy - i, cx - i, cy + i, cx + i, cy + i,
-      tft.color565(0, i, i));
-    t += micros() - start;
-    tft.drawTriangle(cx, cy - i, cx - i, cy + i, cx + i, cy + i,
-      tft.color565(i, i, 0));
-  }
-
-  return t;
-}
-
-unsigned long testRoundRects() {
-  unsigned long start;
-  int           w, i, i2,
-                cx = tft.width()  / 2 - 1,
-                cy = tft.height() / 2 - 1;
-
-  tft.fillScreen(BLACK);
-  w     = min(tft.width(), tft.height());
-  start = micros();
-  for(i=0; i<w; i+=6) {
-    i2 = i / 2;
-    tft.drawRoundRect(cx-i2, cy-i2, i, i, i/8, tft.color565(i, 0, 0));
-  }
-
-  return micros() - start;
-}
-
-unsigned long testFilledRoundRects() {
-  unsigned long start;
-  int           i, i2,
-                cx = tft.width()  / 2 - 1,
-                cy = tft.height() / 2 - 1;
-
-  tft.fillScreen(BLACK);
-  start = micros();
-  for(i=min(tft.width(), tft.height()); i>20; i-=6) {
-    i2 = i / 2;
-    tft.fillRoundRect(cx-i2, cy-i2, i, i, i/8, tft.color565(0, i, 0));
-  }
-
-  return micros() - start;
-}

library.properties

@@ -0,0 +1,10 @@
+name=Adafruit TFTLCD Library
+version=1.0.4
+author=Adafruit
+maintainer=Adafruit <info@adafruit.com>
+sentence=Adafruit 2.8" TFT display Library
+paragraph=Adafruit 2.8" TFT display Library
+category=Display
+url=https://github.com/adafruit/TFTLCD-Library
+architectures=*
+depends=Adafruit GFX Library

pin_magic.h

@@ -54,319 +54,417 @@
 // This code burns 7 cycles (437.5 nS) doing nothing; the RJMPs are
 // equivalent to two NOPs each, final NOP burns the 7th cycle, and the
 // last line is a radioactive mutant emoticon.
-#define DELAY7        \
-  asm volatile(       \
-    "rjmp .+0" "\n\t" \
-    "rjmp .+0" "\n\t" \
-    "rjmp .+0" "\n\t" \
-    "nop"      "\n"   \
-    ::);
+#define DELAY7                                                                 \
+  asm volatile("rjmp .+0"                                                      \
+               "\n\t"                                                          \
+               "rjmp .+0"                                                      \
+               "\n\t"                                                          \
+               "rjmp .+0"                                                      \
+               "\n\t"                                                          \
+               "nop"                                                           \
+               "\n" ::);
 
-#if defined(__AVR_ATmega168__) || defined(__AVR_ATmega328P__) || defined (__AVR_ATmega328__) || defined(__AVR_ATmega8__)
+#if defined(__AVR_ATmega168__) || defined(__AVR_ATmega328P__) ||               \
+    defined(__AVR_ATmega328__) || defined(__AVR_ATmega8__)
 
- // Arduino Uno, Duemilanove, etc.
+// Arduino Uno, Duemilanove, etc.
 
- #ifdef USE_ADAFRUIT_SHIELD_PINOUT
+#ifdef USE_ADAFRUIT_SHIELD_PINOUT
 
-  // LCD control lines:
-  // RD (read), WR (write), CD (command/data), CS (chip select)
-  #define RD_PORT PORTC				/*pin A0 */
-  #define WR_PORT PORTC				/*pin A1 */
-  #define CD_PORT PORTC				/*pin A2 */
-  #define CS_PORT PORTC				/*pin A3 */
-  #define RD_MASK B00000001
-  #define WR_MASK B00000010
-  #define CD_MASK B00000100
-  #define CS_MASK B00001000
+// LCD control lines:
+// RD (read), WR (write), CD (command/data), CS (chip select)
+#define RD_PORT PORTC /*pin A0 */
+#define WR_PORT PORTC /*pin A1 */
+#define CD_PORT PORTC /*pin A2 */
+#define CS_PORT PORTC /*pin A3 */
+#define RD_MASK B00000001
+#define WR_MASK B00000010
+#define CD_MASK B00000100
+#define CS_MASK B00001000
 
-  // These are macros for I/O operations...
+// These are macros for I/O operations...
 
-  // Write 8-bit value to LCD data lines
-  #define write8inline(d) {                          \
-    PORTD = (PORTD & B00101111) | ((d) & B11010000); \
-    PORTB = (PORTB & B11010000) | ((d) & B00101111); \
-    WR_STROBE; } // STROBEs are defined later
+// Write 8-bit value to LCD data lines
+#define write8inline(d)                                                        \
+  {                                                                            \
+    PORTD = (PORTD & B00101111) | ((d)&B11010000);                             \
+    PORTB = (PORTB & B11010000) | ((d)&B00101111);                             \
+    WR_STROBE;                                                                 \
+  } // STROBEs are defined later
 
-  // Read 8-bit value from LCD data lines.  The signle argument
-  // is a destination variable; this isn't a function and doesn't
-  // return a value in the conventional sense.
-  #define read8inline(result) {                       \
-    RD_ACTIVE;                                        \
-    DELAY7;                                           \
-    result = (PIND & B11010000) | (PINB & B00101111); \
-    RD_IDLE; }
+// Read 8-bit value from LCD data lines.  The signle argument
+// is a destination variable; this isn't a function and doesn't
+// return a value in the conventional sense.
+#define read8inline(result)                                                    \
+  {                                                                            \
+    RD_ACTIVE;                                                                 \
+    DELAY7;                                                                    \
+    result = (PIND & B11010000) | (PINB & B00101111);                          \
+    RD_IDLE;                                                                   \
+  }
 
-  // These set the PORT directions as required before the write and read
-  // operations.  Because write operations are much more common than reads,
-  // the data-reading functions in the library code set the PORT(s) to
-  // input before a read, and restore them back to the write state before
-  // returning.  This avoids having to set it for output inside every
-  // drawing method.  The default state has them initialized for writes.
-  #define setWriteDirInline() { DDRD |=  B11010000; DDRB |=  B00101111; }
-  #define setReadDirInline()  { DDRD &= ~B11010000; DDRB &= ~B00101111; }
+// These set the PORT directions as required before the write and read
+// operations.  Because write operations are much more common than reads,
+// the data-reading functions in the library code set the PORT(s) to
+// input before a read, and restore them back to the write state before
+// returning.  This avoids having to set it for output inside every
+// drawing method.  The default state has them initialized for writes.
+#define setWriteDirInline()                                                    \
+  {                                                                            \
+    DDRD |= B11010000;                                                         \
+    DDRB |= B00101111;                                                         \
+  }
+#define setReadDirInline()                                                     \
+  {                                                                            \
+    DDRD &= ~B11010000;                                                        \
+    DDRB &= ~B00101111;                                                        \
+  }
 
- #else // Uno w/Breakout board
+#else // Uno w/Breakout board
 
-  #define write8inline(d) {                          \
-    PORTD = (PORTD & B00000011) | ((d) & B11111100); \
-    PORTB = (PORTB & B11111100) | ((d) & B00000011); \
-    WR_STROBE; }
-  #define read8inline(result) {                       \
-    RD_ACTIVE;                                        \
-    DELAY7;                                           \
-    result = (PIND & B11111100) | (PINB & B00000011); \
-    RD_IDLE; }
-  #define setWriteDirInline() { DDRD |=  B11111100; DDRB |=  B00000011; }
-  #define setReadDirInline()  { DDRD &= ~B11111100; DDRB &= ~B00000011; }
+#define write8inline(d)                                                        \
+  {                                                                            \
+    PORTD = (PORTD & B00000011) | ((d)&B11111100);                             \
+    PORTB = (PORTB & B11111100) | ((d)&B00000011);                             \
+    WR_STROBE;                                                                 \
+  }
+#define read8inline(result)                                                    \
+  {                                                                            \
+    RD_ACTIVE;                                                                 \
+    DELAY7;                                                                    \
+    result = (PIND & B11111100) | (PINB & B00000011);                          \
+    RD_IDLE;                                                                   \
+  }
+#define setWriteDirInline()                                                    \
+  {                                                                            \
+    DDRD |= B11111100;                                                         \
+    DDRB |= B00000011;                                                         \
+  }
+#define setReadDirInline()                                                     \
+  {                                                                            \
+    DDRD &= ~B11111100;                                                        \
+    DDRB &= ~B00000011;                                                        \
+  }
 
- #endif
+#endif
 
-  // As part of the inline control, macros reference other macros...if any
-  // of these are left undefined, an equivalent function version (non-inline)
-  // is declared later.  The Uno has a moderate amount of program space, so
-  // only write8() is inlined -- that one provides the most performance
-  // benefit, but unfortunately also generates the most bloat.  This is
-  // why only certain cases are inlined for each board.
-  #define write8 write8inline
+// As part of the inline control, macros reference other macros...if any
+// of these are left undefined, an equivalent function version (non-inline)
+// is declared later.  The Uno has a moderate amount of program space, so
+// only write8() is inlined -- that one provides the most performance
+// benefit, but unfortunately also generates the most bloat.  This is
+// why only certain cases are inlined for each board.
+#define write8 write8inline
 
-#elif defined(__AVR_ATmega1281__) || defined(__AVR_ATmega2561__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1280__) 
+#elif defined(__AVR_ATmega1281__) || defined(__AVR_ATmega2561__) ||            \
+    defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1280__)
 
- // Arduino Mega, ADK, etc.
+// Arduino Mega, ADK, etc.
 
- #ifdef USE_ADAFRUIT_SHIELD_PINOUT
+#ifdef USE_ADAFRUIT_SHIELD_PINOUT
 
-  #define RD_PORT PORTF
-  #define WR_PORT PORTF
-  #define CD_PORT PORTF
-  #define CS_PORT PORTF
-  #define RD_MASK B00000001
-  #define WR_MASK B00000010
-  #define CD_MASK B00000100
-  #define CS_MASK B00001000
+#define RD_PORT PORTF
+#define WR_PORT PORTF
+#define CD_PORT PORTF
+#define CS_PORT PORTF
+#define RD_MASK B00000001
+#define WR_MASK B00000010
+#define CD_MASK B00000100
+#define CS_MASK B00001000
 
-  #define write8inline(d) {                                              \
-    PORTH = (PORTH&B10000111)|(((d)&B11000000)>>3)|(((d)&B00000011)<<5); \
-    PORTB = (PORTB&B01001111)|(((d)&B00101100)<<2);                      \
-    PORTG = (PORTG&B11011111)|(((d)&B00010000)<<1);                      \
-    WR_STROBE; }
-  #define read8inline(result) {                                      \
-    RD_ACTIVE;                                                       \
-    DELAY7;                                                          \
-    result = ((PINH & B00011000) << 3) | ((PINB & B10110000) >> 2) | \
-             ((PING & B00100000) >> 1) | ((PINH & B01100000) >> 5);  \
-    RD_IDLE; }
-  #define setWriteDirInline() {                                   \
-    DDRH |=  B01111000; DDRB |=  B10110000; DDRG |=  B00100000; }
-  #define setReadDirInline()  {                                   \
-    DDRH &= ~B01111000; DDRB &= ~B10110000; DDRG &= ~B00100000; }
+#define write8inline(d)                                                        \
+  {                                                                            \
+    PORTH =                                                                    \
+        (PORTH & B10000111) | (((d)&B11000000) >> 3) | (((d)&B00000011) << 5); \
+    PORTB = (PORTB & B01001111) | (((d)&B00101100) << 2);                      \
+    PORTG = (PORTG & B11011111) | (((d)&B00010000) << 1);                      \
+    WR_STROBE;                                                                 \
+  }
+#define read8inline(result)                                                    \
+  {                                                                            \
+    RD_ACTIVE;                                                                 \
+    DELAY7;                                                                    \
+    result = ((PINH & B00011000) << 3) | ((PINB & B10110000) >> 2) |           \
+             ((PING & B00100000) >> 1) | ((PINH & B01100000) >> 5);            \
+    RD_IDLE;                                                                   \
+  }
+#define setWriteDirInline()                                                    \
+  {                                                                            \
+    DDRH |= B01111000;                                                         \
+    DDRB |= B10110000;                                                         \
+    DDRG |= B00100000;                                                         \
+  }
+#define setReadDirInline()                                                     \
+  {                                                                            \
+    DDRH &= ~B01111000;                                                        \
+    DDRB &= ~B10110000;                                                        \
+    DDRG &= ~B00100000;                                                        \
+  }
 
- #else // Mega w/Breakout board
+#else // Mega w/Breakout board
 
-  #define write8inline(d)   { PORTA = (d); WR_STROBE; }
-  #define read8inline(result) { \
-    RD_ACTIVE;                  \
-    DELAY7;                     \
-    result = PINA;              \
-    RD_IDLE; }
-  #define setWriteDirInline() DDRA  = 0xff
-  #define setReadDirInline()  DDRA  = 0
+#define write8inline(d)                                                        \
+  {                                                                            \
+    PORTA = (d);                                                               \
+    WR_STROBE;                                                                 \
+  }
+#define read8inline(result)                                                    \
+  {                                                                            \
+    RD_ACTIVE;                                                                 \
+    DELAY7;                                                                    \
+    result = PINA;                                                             \
+    RD_IDLE;                                                                   \
+  }
+#define setWriteDirInline() DDRA = 0xff
+#define setReadDirInline() DDRA = 0
 
- #endif
+#endif
 
-  // All of the functions are inlined on the Arduino Mega.  When using the
-  // breakout board, the macro versions aren't appreciably larger than the
-  // function equivalents, and they're super simple and fast.  When using
-  // the shield, the macros become pretty complicated...but this board has
-  // so much code space, the macros are used anyway.  If you need to free
-  // up program space, some macros can be removed, at a minor cost in speed.
-  #define write8            write8inline
-  #define read8             read8inline
-  #define setWriteDir       setWriteDirInline
-  #define setReadDir        setReadDirInline
-  #define writeRegister8    writeRegister8inline
-  #define writeRegister16   writeRegister16inline
-  #define writeRegisterPair writeRegisterPairInline
+// All of the functions are inlined on the Arduino Mega.  When using the
+// breakout board, the macro versions aren't appreciably larger than the
+// function equivalents, and they're super simple and fast.  When using
+// the shield, the macros become pretty complicated...but this board has
+// so much code space, the macros are used anyway.  If you need to free
+// up program space, some macros can be removed, at a minor cost in speed.
+#define write8 write8inline
+#define read8 read8inline
+#define setWriteDir setWriteDirInline
+#define setReadDir setReadDirInline
+#define writeRegister8 writeRegister8inline
+#define writeRegister16 writeRegister16inline
+#define writeRegisterPair writeRegisterPairInline
 
 #elif defined(__AVR_ATmega32U4__)
 
- // Arduino Leonardo
+// Arduino Leonardo
 
- #ifdef USE_ADAFRUIT_SHIELD_PINOUT
+#ifdef USE_ADAFRUIT_SHIELD_PINOUT
 
-  #define RD_PORT PORTF
-  #define WR_PORT PORTF
-  #define CD_PORT PORTF
-  #define CS_PORT PORTF
-  #define RD_MASK B10000000
-  #define WR_MASK B01000000
-  #define CD_MASK B00100000
-  #define CS_MASK B00010000
+#define RD_PORT PORTF
+#define WR_PORT PORTF
+#define CD_PORT PORTF
+#define CS_PORT PORTF
+#define RD_MASK B10000000
+#define WR_MASK B01000000
+#define CD_MASK B00100000
+#define CS_MASK B00010000
 
-  #define write8inline(d) {                                                   \
-    PORTE = (PORTE & B10111111) | (((d) & B10000000)>>1);                     \
-    PORTD = (PORTD & B01101111) | (((d) & B01000000)<<1) | ((d) & B00010000); \
-    PORTC = (PORTC & B01111111) | (((d) & B00100000)<<2);                     \
-    PORTB = (PORTB & B00001111) | (((d) & B00001111)<<4);                     \
-    WR_STROBE; }
-  #define read8inline(result) {                                      \
-    RD_ACTIVE;                                                       \
-    DELAY7;                                                          \
-    result = ((PINE & B01000000) << 1) | ((PIND & B10000000) >> 1) | \
-             ((PINC & B10000000) >> 2) | ((PINB & B11110000) >> 4) | \
-              (PIND & B00010000);                                    \
-    RD_IDLE; }
-  #define setWriteDirInline() {               \
-    DDRE |=  B01000000; DDRD |=  B10010000;   \
-    DDRC |=  B10000000; DDRB |=  B11110000; }
-  #define setReadDirInline() {                \
-    DDRE &= ~B01000000; DDRD &= ~B10010000;   \
-    DDRC &= ~B10000000; DDRB &= ~B11110000; }
+#define write8inline(d)                                                        \
+  {                                                                            \
+    PORTE = (PORTE & B10111111) | (((d)&B10000000) >> 1);                      \
+    PORTD = (PORTD & B01101111) | (((d)&B01000000) << 1) | ((d)&B00010000);    \
+    PORTC = (PORTC & B01111111) | (((d)&B00100000) << 2);                      \
+    PORTB = (PORTB & B00001111) | (((d)&B00001111) << 4);                      \
+    WR_STROBE;                                                                 \
+  }
+#define read8inline(result)                                                    \
+  {                                                                            \
+    RD_ACTIVE;                                                                 \
+    DELAY7;                                                                    \
+    result = ((PINE & B01000000) << 1) | ((PIND & B10000000) >> 1) |           \
+             ((PINC & B10000000) >> 2) | ((PINB & B11110000) >> 4) |           \
+             (PIND & B00010000);                                               \
+    RD_IDLE;                                                                   \
+  }
+#define setWriteDirInline()                                                    \
+  {                                                                            \
+    DDRE |= B01000000;                                                         \
+    DDRD |= B10010000;                                                         \
+    DDRC |= B10000000;                                                         \
+    DDRB |= B11110000;                                                         \
+  }
+#define setReadDirInline()                                                     \
+  {                                                                            \
+    DDRE &= ~B01000000;                                                        \
+    DDRD &= ~B10010000;                                                        \
+    DDRC &= ~B10000000;                                                        \
+    DDRB &= ~B11110000;                                                        \
+  }
 
- #else // Leonardo w/Breakout board
+#else // Leonardo w/Breakout board
 
-  #define write8inline(d) {                                                   \
-    uint8_t dr1 = (d) >> 1, dl1 = (d) << 1;                                   \
-    PORTE = (PORTE & B10111111) | (dr1 & B01000000);                          \
-    PORTD = (PORTD & B01101100) | (dl1 & B10000000) | (((d) & B00001000)>>3) |\
-                                  (dr1 & B00000010) |  ((d) & B00010000);     \
-    PORTC = (PORTC & B10111111) | (dl1 & B01000000);                          \
-    PORTB = (PORTB & B11001111) |(((d) & B00000011)<<4);                      \
-    WR_STROBE; }
-  #define read8inline(result) {                                       \
-    RD_ACTIVE;                                                        \
-    DELAY7;                                                           \
-    result = (((PINE & B01000000) | (PIND & B00000010)) << 1) |       \
-             (((PINC & B01000000) | (PIND & B10000000)) >> 1) |       \
-              ((PIND & B00000001) << 3) | ((PINB & B00110000) >> 4) | \
-               (PIND & B00010000);                                    \
-    RD_IDLE; }
-  #define setWriteDirInline() {               \
-    DDRE |=  B01000000; DDRD |=  B10010011;   \
-    DDRC |=  B01000000; DDRB |=  B00110000; }
-  #define setReadDirInline() {                \
-    DDRE &= ~B01000000; DDRD &= ~B10010011;   \
-    DDRC &= ~B01000000; DDRB &= ~B00110000; }
+#define write8inline(d)                                                        \
+  {                                                                            \
+    uint8_t dr1 = (d) >> 1, dl1 = (d) << 1;                                    \
+    PORTE = (PORTE & B10111111) | (dr1 & B01000000);                           \
+    PORTD = (PORTD & B01101100) | (dl1 & B10000000) | (((d)&B00001000) >> 3) | \
+            (dr1 & B00000010) | ((d)&B00010000);                               \
+    PORTC = (PORTC & B10111111) | (dl1 & B01000000);                           \
+    PORTB = (PORTB & B11001111) | (((d)&B00000011) << 4);                      \
+    WR_STROBE;                                                                 \
+  }
+#define read8inline(result)                                                    \
+  {                                                                            \
+    RD_ACTIVE;                                                                 \
+    DELAY7;                                                                    \
+    result = (((PINE & B01000000) | (PIND & B00000010)) << 1) |                \
+             (((PINC & B01000000) | (PIND & B10000000)) >> 1) |                \
+             ((PIND & B00000001) << 3) | ((PINB & B00110000) >> 4) |           \
+             (PIND & B00010000);                                               \
+    RD_IDLE;                                                                   \
+  }
+#define setWriteDirInline()                                                    \
+  {                                                                            \
+    DDRE |= B01000000;                                                         \
+    DDRD |= B10010011;                                                         \
+    DDRC |= B01000000;                                                         \
+    DDRB |= B00110000;                                                         \
+  }
+#define setReadDirInline()                                                     \
+  {                                                                            \
+    DDRE &= ~B01000000;                                                        \
+    DDRD &= ~B10010011;                                                        \
+    DDRC &= ~B01000000;                                                        \
+    DDRB &= ~B00110000;                                                        \
+  }
 
- #endif
+#endif
 
-  // On the Leonardo, only the write8() macro is used -- though even that
-  // might be excessive given the code size and available program space
-  // on this board.  You may need to disable this to get any sizable
-  // program to compile.
-  #define write8 write8inline
+// On the Leonardo, only the write8() macro is used -- though even that
+// might be excessive given the code size and available program space
+// on this board.  You may need to disable this to get any sizable
+// program to compile.
+#define write8 write8inline
 
 #elif defined(__SAM3X8E__)
 
 // Arduino Due
 
- #ifdef USE_ADAFRUIT_SHIELD_PINOUT
+#ifdef USE_ADAFRUIT_SHIELD_PINOUT
 
-  #define RD_PORT PIOA				/*pin A0 */	
-  #define WR_PORT PIOA				/*pin A1 */
-  #define CD_PORT PIOA				/*pin A2 */
-  #define CS_PORT PIOA				/*pin A3 */
-  #define RD_MASK 0x00010000
-  #define WR_MASK 0x01000000
-  #define CD_MASK 0x00800000
-  #define CS_MASK 0x00400000
+#define RD_PORT PIOA /*pin A0 */
+#define WR_PORT PIOA /*pin A1 */
+#define CD_PORT PIOA /*pin A2 */
+#define CS_PORT PIOA /*pin A3 */
+#define RD_MASK 0x00010000
+#define WR_MASK 0x01000000
+#define CD_MASK 0x00800000
+#define CS_MASK 0x00400000
 
-  #define write8inline(d) { \
-   PIO_Set(PIOD, (((d) & 0x08)<<(7-3))); \
-   PIO_Clear(PIOD, (((~d) & 0x08)<<(7-3))); \
-   PIO_Set(PIOC, (((d) & 0x01)<<(22-0)) | (((d) & 0x02)<<(21-1))| (((d) & 0x04)<<(29-2))| (((d) & 0x10)<<(26-4))| (((d) & 0x40)<<(24-6))| (((d) & 0x80)<<(23-7))); \
-   PIO_Clear(PIOC, (((~d) & 0x01)<<(22-0)) | (((~d) & 0x02)<<(21-1))| (((~d) & 0x04)<<(29-2))| (((~d) & 0x10)<<(26-4))| (((~d) & 0x40)<<(24-6))| (((~d) & 0x80)<<(23-7))); \
-   PIO_Set(PIOB, (((d) & 0x20)<<(27-5))); \
-   PIO_Clear(PIOB, (((~d) & 0x20)<<(27-5))); \
-   WR_STROBE; }
+#define write8inline(d)                                                        \
+  {                                                                            \
+    PIO_Set(PIOD, (((d)&0x08) << (7 - 3)));                                    \
+    PIO_Clear(PIOD, (((~d) & 0x08) << (7 - 3)));                               \
+    PIO_Set(PIOC, (((d)&0x01) << (22 - 0)) | (((d)&0x02) << (21 - 1)) |        \
+                      (((d)&0x04) << (29 - 2)) | (((d)&0x10) << (26 - 4)) |    \
+                      (((d)&0x40) << (24 - 6)) | (((d)&0x80) << (23 - 7)));    \
+    PIO_Clear(PIOC,                                                            \
+              (((~d) & 0x01) << (22 - 0)) | (((~d) & 0x02) << (21 - 1)) |      \
+                  (((~d) & 0x04) << (29 - 2)) | (((~d) & 0x10) << (26 - 4)) |  \
+                  (((~d) & 0x40) << (24 - 6)) | (((~d) & 0x80) << (23 - 7)));  \
+    PIO_Set(PIOB, (((d)&0x20) << (27 - 5)));                                   \
+    PIO_Clear(PIOB, (((~d) & 0x20) << (27 - 5)));                              \
+    WR_STROBE;                                                                 \
+  }
 
-  #define read8inline(result) { \    
-   RD_ACTIVE;   \
-   delayMicroseconds(1);      \
-   result = (((PIOC->PIO_PDSR & (1<<23)) >> (23-7)) | ((PIOC->PIO_PDSR & (1<<24)) >> (24-6)) | \
-             ((PIOB->PIO_PDSR & (1<<27)) >> (27-5)) | ((PIOC->PIO_PDSR & (1<<26)) >> (26-4)) | \
-             ((PIOD->PIO_PDSR & (1<< 7)) >> ( 7-3)) | ((PIOC->PIO_PDSR & (1<<29)) >> (29-2)) | \
-             ((PIOC->PIO_PDSR & (1<<21)) >> (21-1)) | ((PIOC->PIO_PDSR & (1<<22)) >> (22-0))); \
-   RD_IDLE;}
+#define read8inline(result)                                                    \
+  {                                                                            \
+                                                                               \
+    RD_ACTIVE;                                                                 \
+    delayMicroseconds(1);                                                      \
+    result = (((PIOC->PIO_PDSR & (1 << 23)) >> (23 - 7)) |                     \
+              ((PIOC->PIO_PDSR & (1 << 24)) >> (24 - 6)) |                     \
+              ((PIOB->PIO_PDSR & (1 << 27)) >> (27 - 5)) |                     \
+              ((PIOC->PIO_PDSR & (1 << 26)) >> (26 - 4)) |                     \
+              ((PIOD->PIO_PDSR & (1 << 7)) >> (7 - 3)) |                       \
+              ((PIOC->PIO_PDSR & (1 << 29)) >> (29 - 2)) |                     \
+              ((PIOC->PIO_PDSR & (1 << 21)) >> (21 - 1)) |                     \
+              ((PIOC->PIO_PDSR & (1 << 22)) >> (22 - 0)));                     \
+    RD_IDLE;                                                                   \
+  }
 
-  #define setWriteDirInline() { \
-   PIOD->PIO_MDDR |=  0x00000080; /*PIOD->PIO_SODR =  0x00000080;*/ PIOD->PIO_OER |=  0x00000080; PIOD->PIO_PER |=  0x00000080; \
-   PIOC->PIO_MDDR |=  0x25E00000; /*PIOC->PIO_SODR =  0x25E00000;*/ PIOC->PIO_OER |=  0x25E00000; PIOC->PIO_PER |=  0x25E00000; \
-   PIOB->PIO_MDDR |=  0x08000000; /*PIOB->PIO_SODR =  0x08000000;*/ PIOB->PIO_OER |=  0x08000000; PIOB->PIO_PER |=  0x08000000; }
+#define setWriteDirInline()                                                    \
+  {                                                                            \
+    PIOD->PIO_MDDR |= 0x00000080; /*PIOD->PIO_SODR =  0x00000080;*/            \
+    PIOD->PIO_OER |= 0x00000080;                                               \
+    PIOD->PIO_PER |= 0x00000080;                                               \
+    PIOC->PIO_MDDR |= 0x25E00000; /*PIOC->PIO_SODR =  0x25E00000;*/            \
+    PIOC->PIO_OER |= 0x25E00000;                                               \
+    PIOC->PIO_PER |= 0x25E00000;                                               \
+    PIOB->PIO_MDDR |= 0x08000000; /*PIOB->PIO_SODR =  0x08000000;*/            \
+    PIOB->PIO_OER |= 0x08000000;                                               \
+    PIOB->PIO_PER |= 0x08000000;                                               \
+  }
 
-  #define setReadDirInline() { \
-	  pmc_enable_periph_clk( ID_PIOD ) ;	  pmc_enable_periph_clk( ID_PIOC ) ;	  pmc_enable_periph_clk( ID_PIOB ) ; \
-   PIOD->PIO_PUDR |=  0x00000080; PIOD->PIO_IFDR |=  0x00000080; PIOD->PIO_ODR |=  0x00000080; PIOD->PIO_PER |=  0x00000080; \
-   PIOC->PIO_PUDR |=  0x25E00000; PIOC->PIO_IFDR |=  0x25E00000; PIOC->PIO_ODR |=  0x25E00000; PIOC->PIO_PER |=  0x25E00000; \
-   PIOB->PIO_PUDR |=  0x08000000; PIOB->PIO_IFDR |=  0x08000000; PIOB->PIO_ODR |=  0x08000000; PIOB->PIO_PER |=  0x08000000; }
-
-   // Control signals are ACTIVE LOW (idle is HIGH)
-   // Command/Data: LOW = command, HIGH = data
-   // These are single-instruction operations and always inline
-   #define RD_ACTIVE  RD_PORT->PIO_CODR |= RD_MASK
-   #define RD_IDLE    RD_PORT->PIO_SODR |= RD_MASK
-   #define WR_ACTIVE  WR_PORT->PIO_CODR |= WR_MASK
-   #define WR_IDLE    WR_PORT->PIO_SODR |= WR_MASK
-   #define CD_COMMAND CD_PORT->PIO_CODR |= CD_MASK
-   #define CD_DATA    CD_PORT->PIO_SODR |= CD_MASK
-   #define CS_ACTIVE  CS_PORT->PIO_CODR |= CS_MASK
-   #define CS_IDLE    CS_PORT->PIO_SODR |= CS_MASK
+#define setReadDirInline()                                                     \
+  {                                                                            \
+    pmc_enable_periph_clk(ID_PIOD);                                            \
+    pmc_enable_periph_clk(ID_PIOC);                                            \
+    pmc_enable_periph_clk(ID_PIOB);                                            \
+    PIOD->PIO_PUDR |= 0x00000080;                                              \
+    PIOD->PIO_IFDR |= 0x00000080;                                              \
+    PIOD->PIO_ODR |= 0x00000080;                                               \
+    PIOD->PIO_PER |= 0x00000080;                                               \
+    PIOC->PIO_PUDR |= 0x25E00000;                                              \
+    PIOC->PIO_IFDR |= 0x25E00000;                                              \
+    PIOC->PIO_ODR |= 0x25E00000;                                               \
+    PIOC->PIO_PER |= 0x25E00000;                                               \
+    PIOB->PIO_PUDR |= 0x08000000;                                              \
+    PIOB->PIO_IFDR |= 0x08000000;                                              \
+    PIOB->PIO_ODR |= 0x08000000;                                               \
+    PIOB->PIO_PER |= 0x08000000;                                               \
+  }
 
+// Control signals are ACTIVE LOW (idle is HIGH)
+// Command/Data: LOW = command, HIGH = data
+// These are single-instruction operations and always inline
+#define RD_ACTIVE RD_PORT->PIO_CODR |= RD_MASK
+#define RD_IDLE RD_PORT->PIO_SODR |= RD_MASK
+#define WR_ACTIVE WR_PORT->PIO_CODR |= WR_MASK
+#define WR_IDLE WR_PORT->PIO_SODR |= WR_MASK
+#define CD_COMMAND CD_PORT->PIO_CODR |= CD_MASK
+#define CD_DATA CD_PORT->PIO_SODR |= CD_MASK
+#define CS_ACTIVE CS_PORT->PIO_CODR |= CS_MASK
+#define CS_IDLE CS_PORT->PIO_SODR |= CS_MASK
 
 #else // Due w/Breakout board
 
-    #define write8inline(d) { \
-		PIO_Set(PIOC, (((d) & 0xFF)<<1)); \
-		PIO_Clear(PIOC, (((~d) & 0xFF)<<1)); \
-		WR_STROBE; }
+#define write8inline(d)                                                        \
+  {                                                                            \
+    PIO_Set(PIOC, (((d)&0xFF) << 1));                                          \
+    PIO_Clear(PIOC, (((~d) & 0xFF) << 1));                                     \
+    WR_STROBE;                                                                 \
+  }
 
-    #define read8inline(result) { \
-		RD_ACTIVE;   \
-		delayMicroseconds(1);      \
-		result = ((PIOC->PIO_PDSR & 0x1FE) >> 1); \
-		RD_IDLE;}
+#define read8inline(result)                                                    \
+  {                                                                            \
+    RD_ACTIVE;                                                                 \
+    delayMicroseconds(1);                                                      \
+    result = ((PIOC->PIO_PDSR & 0x1FE) >> 1);                                  \
+    RD_IDLE;                                                                   \
+  }
 
-    #define setWriteDirInline() { \
-	    PIOC->PIO_MDDR |=  0x000001FE; /*PIOC->PIO_SODR |=  0x000001FE;*/ PIOC->PIO_OER |=  0x000001FE; PIOC->PIO_PER |=  0x000001FE; }
+#define setWriteDirInline()                                                    \
+  {                                                                            \
+    PIOC->PIO_MDDR |= 0x000001FE; /*PIOC->PIO_SODR |=  0x000001FE;*/           \
+    PIOC->PIO_OER |= 0x000001FE;                                               \
+    PIOC->PIO_PER |= 0x000001FE;                                               \
+  }
 
-    #define setReadDirInline() { \
-		pmc_enable_periph_clk( ID_PIOC ) ; \
-		PIOC->PIO_PUDR |=  0x000001FE; PIOC->PIO_IFDR |=  0x000001FE; PIOC->PIO_ODR |=  0x000001FE; PIOC->PIO_PER |=  0x000001FE; }
+#define setReadDirInline()                                                     \
+  {                                                                            \
+    pmc_enable_periph_clk(ID_PIOC);                                            \
+    PIOC->PIO_PUDR |= 0x000001FE;                                              \
+    PIOC->PIO_IFDR |= 0x000001FE;                                              \
+    PIOC->PIO_ODR |= 0x000001FE;                                               \
+    PIOC->PIO_PER |= 0x000001FE;                                               \
+  }
 
-    // When using the TFT breakout board, control pins are configurable.
-    #define RD_ACTIVE	rdPort->PIO_CODR |= rdPinSet		//PIO_Clear(rdPort, rdPinSet)
-    #define RD_IDLE		rdPort->PIO_SODR |= rdPinSet		//PIO_Set(rdPort, rdPinSet)	
-    #define WR_ACTIVE	wrPort->PIO_CODR |= wrPinSet		//PIO_Clear(wrPort, wrPinSet)
-    #define WR_IDLE		wrPort->PIO_SODR |= wrPinSet		//PIO_Set(wrPort, wrPinSet)
-    #define CD_COMMAND	cdPort->PIO_CODR |= cdPinSet		//PIO_Clear(cdPort, cdPinSet)
-    #define CD_DATA		cdPort->PIO_SODR |= cdPinSet		//PIO_Set(cdPort, cdPinSet)
-    #define CS_ACTIVE	csPort->PIO_CODR |= csPinSet		//PIO_Clear(csPort, csPinSet)
-    #define CS_IDLE		csPort->PIO_SODR |= csPinSet		//PIO_Set(csPort, csPinSet)
+// When using the TFT breakout board, control pins are configurable.
+#define RD_ACTIVE rdPort->PIO_CODR |= rdPinSet  // PIO_Clear(rdPort, rdPinSet)
+#define RD_IDLE rdPort->PIO_SODR |= rdPinSet    // PIO_Set(rdPort, rdPinSet)
+#define WR_ACTIVE wrPort->PIO_CODR |= wrPinSet  // PIO_Clear(wrPort, wrPinSet)
+#define WR_IDLE wrPort->PIO_SODR |= wrPinSet    // PIO_Set(wrPort, wrPinSet)
+#define CD_COMMAND cdPort->PIO_CODR |= cdPinSet // PIO_Clear(cdPort, cdPinSet)
+#define CD_DATA cdPort->PIO_SODR |= cdPinSet    // PIO_Set(cdPort, cdPinSet)
+#define CS_ACTIVE csPort->PIO_CODR |= csPinSet  // PIO_Clear(csPort, csPinSet)
+#define CS_IDLE csPort->PIO_SODR |= csPinSet    // PIO_Set(csPort, csPinSet)
 
- #endif
-
-
-#elif defined(ADAFRUIT_PYPORTAL)
-  #define RD_ACTIVE  *rdPort &=  rdPinUnset
-  #define RD_IDLE    *rdPort |=  rdPinSet
-  #define WR_ACTIVE  *wrPort &=  wrPinUnset
-  #define WR_IDLE    *wrPort |=  wrPinSet
-  #define CD_COMMAND *cdPort &=  cdPinUnset
-  #define CD_DATA    *cdPort |=  cdPinSet
-  #define CS_ACTIVE  *csPort &=  csPinUnset
-  #define CS_IDLE    *csPort |=  csPinSet
-
-  #define write8inline(d) { *write_port = d; WR_STROBE; }
-  #define read8inline(result) { \
-		RD_ACTIVE;   \
-		delayMicroseconds(1);      \
-		result = *read_port; \
-		RD_IDLE;}
-  #define setWriteDirInline() { *dir_port = 0xFF; }
-  #define setReadDirInline() { *dir_port = 0x00; }
+#endif
 
 #else
 
- #error "Board type unsupported / not recognized"
+#error "Board type unsupported / not recognized"
 
 #endif
 
@@ -375,54 +473,81 @@
 
 #ifdef USE_ADAFRUIT_SHIELD_PINOUT
 
- // Control signals are ACTIVE LOW (idle is HIGH)
- // Command/Data: LOW = command, HIGH = data
- // These are single-instruction operations and always inline
- #define RD_ACTIVE  RD_PORT &= ~RD_MASK
- #define RD_IDLE    RD_PORT |=  RD_MASK
- #define WR_ACTIVE  WR_PORT &= ~WR_MASK
- #define WR_IDLE    WR_PORT |=  WR_MASK
- #define CD_COMMAND CD_PORT &= ~CD_MASK
- #define CD_DATA    CD_PORT |=  CD_MASK
- #define CS_ACTIVE  CS_PORT &= ~CS_MASK
- #define CS_IDLE    CS_PORT |=  CS_MASK
+// Control signals are ACTIVE LOW (idle is HIGH)
+// Command/Data: LOW = command, HIGH = data
+// These are single-instruction operations and always inline
+#define RD_ACTIVE RD_PORT &= ~RD_MASK
+#define RD_IDLE RD_PORT |= RD_MASK
+#define WR_ACTIVE WR_PORT &= ~WR_MASK
+#define WR_IDLE WR_PORT |= WR_MASK
+#define CD_COMMAND CD_PORT &= ~CD_MASK
+#define CD_DATA CD_PORT |= CD_MASK
+#define CS_ACTIVE CS_PORT &= ~CS_MASK
+#define CS_IDLE CS_PORT |= CS_MASK
 
 #else // Breakout board
 
- // When using the TFT breakout board, control pins are configurable.
- #define RD_ACTIVE  *rdPort &=  rdPinUnset
- #define RD_IDLE    *rdPort |=  rdPinSet
- #define WR_ACTIVE  *wrPort &=  wrPinUnset
- #define WR_IDLE    *wrPort |=  wrPinSet
- #define CD_COMMAND *cdPort &=  cdPinUnset
- #define CD_DATA    *cdPort |=  cdPinSet
- #define CS_ACTIVE  *csPort &=  csPinUnset
- #define CS_IDLE    *csPort |=  csPinSet
+// When using the TFT breakout board, control pins are configurable.
+#define RD_ACTIVE *rdPort &= rdPinUnset
+#define RD_IDLE *rdPort |= rdPinSet
+#define WR_ACTIVE *wrPort &= wrPinUnset
+#define WR_IDLE *wrPort |= wrPinSet
+#define CD_COMMAND *cdPort &= cdPinUnset
+#define CD_DATA *cdPort |= cdPinSet
+#define CS_ACTIVE *csPort &= csPinUnset
+#define CS_IDLE *csPort |= csPinSet
 
 #endif
 #endif
 
 // Data write strobe, ~2 instructions and always inline
-#define WR_STROBE { WR_ACTIVE; WR_IDLE; }
+#define WR_STROBE                                                              \
+  {                                                                            \
+    WR_ACTIVE;                                                                 \
+    WR_IDLE;                                                                   \
+  }
 
 // These higher-level operations are usually functionalized,
 // except on Mega where's there's gobs and gobs of program space.
 
 // Set value of TFT register: 8-bit address, 8-bit value
-#define writeRegister8inline(a, d) { \
-  CD_COMMAND; write8(a); CD_DATA; write8(d); }
+#define writeRegister8inline(a, d)                                             \
+  {                                                                            \
+    CD_COMMAND;                                                                \
+    write8(a);                                                                 \
+    CD_DATA;                                                                   \
+    write8(d);                                                                 \
+  }
 
 // Set value of TFT register: 16-bit address, 16-bit value
 // See notes at top about macro expansion, hence hi & lo temp vars
-#define writeRegister16inline(a, d) { \
-  uint8_t hi, lo; \
-  hi = (a) >> 8; lo = (a); CD_COMMAND; write8(hi); write8(lo); \
-  hi = (d) >> 8; lo = (d); CD_DATA   ; write8(hi); write8(lo); }
+#define writeRegister16inline(a, d)                                            \
+  {                                                                            \
+    uint8_t hi, lo;                                                            \
+    hi = (a) >> 8;                                                             \
+    lo = (a);                                                                  \
+    CD_COMMAND;                                                                \
+    write8(hi);                                                                \
+    write8(lo);                                                                \
+    hi = (d) >> 8;                                                             \
+    lo = (d);                                                                  \
+    CD_DATA;                                                                   \
+    write8(hi);                                                                \
+    write8(lo);                                                                \
+  }
 
 // Set value of 2 TFT registers: Two 8-bit addresses (hi & lo), 16-bit value
-#define writeRegisterPairInline(aH, aL, d) { \
-  uint8_t hi = (d) >> 8, lo = (d); \
-  CD_COMMAND; write8(aH); CD_DATA; write8(hi); \
-  CD_COMMAND; write8(aL); CD_DATA; write8(lo); }
+#define writeRegisterPairInline(aH, aL, d)                                     \
+  {                                                                            \
+    uint8_t hi = (d) >> 8, lo = (d);                                           \
+    CD_COMMAND;                                                                \
+    write8(aH);                                                                \
+    CD_DATA;                                                                   \
+    write8(hi);                                                                \
+    CD_COMMAND;                                                                \
+    write8(aL);                                                                \
+    CD_DATA;                                                                   \
+    write8(lo);                                                                \
+  }
 
 #endif // _pin_magic_

registers.h

@@ -1,172 +1,167 @@
 // Register names from Peter Barrett's Microtouch code
-#define ILI932X_START_OSC          0x00
-#define ILI932X_DRIV_OUT_CTRL      0x01
-#define ILI932X_DRIV_WAV_CTRL      0x02
-#define ILI932X_ENTRY_MOD          0x03
-#define ILI932X_RESIZE_CTRL        0x04
-#define ILI932X_DISP_CTRL1         0x07
-#define ILI932X_DISP_CTRL2         0x08
-#define ILI932X_DISP_CTRL3         0x09
-#define ILI932X_DISP_CTRL4         0x0A
-#define ILI932X_RGB_DISP_IF_CTRL1  0x0C
-#define ILI932X_FRM_MARKER_POS     0x0D
-#define ILI932X_RGB_DISP_IF_CTRL2  0x0F
-#define ILI932X_POW_CTRL1          0x10
-#define ILI932X_POW_CTRL2          0x11
-#define ILI932X_POW_CTRL3          0x12
-#define ILI932X_POW_CTRL4          0x13
-#define ILI932X_GRAM_HOR_AD        0x20
-#define ILI932X_GRAM_VER_AD        0x21
-#define ILI932X_RW_GRAM            0x22
-#define ILI932X_POW_CTRL7          0x29
-#define ILI932X_FRM_RATE_COL_CTRL  0x2B
-#define ILI932X_GAMMA_CTRL1        0x30
-#define ILI932X_GAMMA_CTRL2        0x31
-#define ILI932X_GAMMA_CTRL3        0x32
-#define ILI932X_GAMMA_CTRL4        0x35
-#define ILI932X_GAMMA_CTRL5        0x36
-#define ILI932X_GAMMA_CTRL6        0x37
-#define ILI932X_GAMMA_CTRL7        0x38
-#define ILI932X_GAMMA_CTRL8        0x39
-#define ILI932X_GAMMA_CTRL9        0x3C
-#define ILI932X_GAMMA_CTRL10       0x3D
-#define ILI932X_HOR_START_AD       0x50
-#define ILI932X_HOR_END_AD         0x51
-#define ILI932X_VER_START_AD       0x52
-#define ILI932X_VER_END_AD         0x53
-#define ILI932X_GATE_SCAN_CTRL1    0x60
-#define ILI932X_GATE_SCAN_CTRL2    0x61
-#define ILI932X_GATE_SCAN_CTRL3    0x6A
+#define ILI932X_START_OSC 0x00
+#define ILI932X_DRIV_OUT_CTRL 0x01
+#define ILI932X_DRIV_WAV_CTRL 0x02
+#define ILI932X_ENTRY_MOD 0x03
+#define ILI932X_RESIZE_CTRL 0x04
+#define ILI932X_DISP_CTRL1 0x07
+#define ILI932X_DISP_CTRL2 0x08
+#define ILI932X_DISP_CTRL3 0x09
+#define ILI932X_DISP_CTRL4 0x0A
+#define ILI932X_RGB_DISP_IF_CTRL1 0x0C
+#define ILI932X_FRM_MARKER_POS 0x0D
+#define ILI932X_RGB_DISP_IF_CTRL2 0x0F
+#define ILI932X_POW_CTRL1 0x10
+#define ILI932X_POW_CTRL2 0x11
+#define ILI932X_POW_CTRL3 0x12
+#define ILI932X_POW_CTRL4 0x13
+#define ILI932X_GRAM_HOR_AD 0x20
+#define ILI932X_GRAM_VER_AD 0x21
+#define ILI932X_RW_GRAM 0x22
+#define ILI932X_POW_CTRL7 0x29
+#define ILI932X_FRM_RATE_COL_CTRL 0x2B
+#define ILI932X_GAMMA_CTRL1 0x30
+#define ILI932X_GAMMA_CTRL2 0x31
+#define ILI932X_GAMMA_CTRL3 0x32
+#define ILI932X_GAMMA_CTRL4 0x35
+#define ILI932X_GAMMA_CTRL5 0x36
+#define ILI932X_GAMMA_CTRL6 0x37
+#define ILI932X_GAMMA_CTRL7 0x38
+#define ILI932X_GAMMA_CTRL8 0x39
+#define ILI932X_GAMMA_CTRL9 0x3C
+#define ILI932X_GAMMA_CTRL10 0x3D
+#define ILI932X_HOR_START_AD 0x50
+#define ILI932X_HOR_END_AD 0x51
+#define ILI932X_VER_START_AD 0x52
+#define ILI932X_VER_END_AD 0x53
+#define ILI932X_GATE_SCAN_CTRL1 0x60
+#define ILI932X_GATE_SCAN_CTRL2 0x61
+#define ILI932X_GATE_SCAN_CTRL3 0x6A
 #define ILI932X_PART_IMG1_DISP_POS 0x80
 #define ILI932X_PART_IMG1_START_AD 0x81
-#define ILI932X_PART_IMG1_END_AD   0x82
+#define ILI932X_PART_IMG1_END_AD 0x82
 #define ILI932X_PART_IMG2_DISP_POS 0x83
 #define ILI932X_PART_IMG2_START_AD 0x84
-#define ILI932X_PART_IMG2_END_AD   0x85
-#define ILI932X_PANEL_IF_CTRL1     0x90
-#define ILI932X_PANEL_IF_CTRL2     0x92
-#define ILI932X_PANEL_IF_CTRL3     0x93
-#define ILI932X_PANEL_IF_CTRL4     0x95
-#define ILI932X_PANEL_IF_CTRL5     0x97
-#define ILI932X_PANEL_IF_CTRL6     0x98
+#define ILI932X_PART_IMG2_END_AD 0x85
+#define ILI932X_PANEL_IF_CTRL1 0x90
+#define ILI932X_PANEL_IF_CTRL2 0x92
+#define ILI932X_PANEL_IF_CTRL3 0x93
+#define ILI932X_PANEL_IF_CTRL4 0x95
+#define ILI932X_PANEL_IF_CTRL5 0x97
+#define ILI932X_PANEL_IF_CTRL6 0x98
 
-#define HX8347G_COLADDRSTART_HI    0x02
-#define HX8347G_COLADDRSTART_LO    0x03
-#define HX8347G_COLADDREND_HI      0x04
-#define HX8347G_COLADDREND_LO      0x05
-#define HX8347G_ROWADDRSTART_HI    0x06
-#define HX8347G_ROWADDRSTART_LO    0x07
-#define HX8347G_ROWADDREND_HI      0x08
-#define HX8347G_ROWADDREND_LO      0x09
-#define HX8347G_MEMACCESS          0x16
+#define HX8347G_COLADDRSTART_HI 0x02
+#define HX8347G_COLADDRSTART_LO 0x03
+#define HX8347G_COLADDREND_HI 0x04
+#define HX8347G_COLADDREND_LO 0x05
+#define HX8347G_ROWADDRSTART_HI 0x06
+#define HX8347G_ROWADDRSTART_LO 0x07
+#define HX8347G_ROWADDREND_HI 0x08
+#define HX8347G_ROWADDREND_LO 0x09
+#define HX8347G_MEMACCESS 0x16
 
+#define ILI9341_SOFTRESET 0x01
+#define ILI9341_SLEEPIN 0x10
+#define ILI9341_SLEEPOUT 0x11
+#define ILI9341_NORMALDISP 0x13
+#define ILI9341_INVERTOFF 0x20
+#define ILI9341_INVERTON 0x21
+#define ILI9341_GAMMASET 0x26
+#define ILI9341_DISPLAYOFF 0x28
+#define ILI9341_DISPLAYON 0x29
+#define ILI9341_COLADDRSET 0x2A
+#define ILI9341_PAGEADDRSET 0x2B
+#define ILI9341_MEMORYWRITE 0x2C
+#define ILI9341_PIXELFORMAT 0x3A
+#define ILI9341_FRAMECONTROL 0xB1
+#define ILI9341_DISPLAYFUNC 0xB6
+#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_SOFTRESET          0x01
-#define ILI9341_SLEEPIN            0x10
-#define ILI9341_SLEEPOUT           0x11
-#define ILI9341_NORMALDISP         0x13
-#define ILI9341_INVERTOFF          0x20
-#define ILI9341_INVERTON           0x21
-#define ILI9341_GAMMASET           0x26
-#define ILI9341_DISPLAYOFF         0x28
-#define ILI9341_DISPLAYON          0x29
-#define ILI9341_COLADDRSET         0x2A
-#define ILI9341_PAGEADDRSET        0x2B
-#define ILI9341_MEMORYWRITE        0x2C
-#define ILI9341_PIXELFORMAT        0x3A
-#define ILI9341_FRAMECONTROL       0xB1
-#define ILI9341_DISPLAYFUNC        0xB6
-#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_MADCTL_MY  0x80
-#define ILI9341_MADCTL_MX  0x40
-#define ILI9341_MADCTL_MV  0x20
-#define ILI9341_MADCTL_ML  0x10
+#define ILI9341_MADCTL_MY 0x80
+#define ILI9341_MADCTL_MX 0x40
+#define ILI9341_MADCTL_MV 0x20
+#define ILI9341_MADCTL_ML 0x10
 #define ILI9341_MADCTL_RGB 0x00
 #define ILI9341_MADCTL_BGR 0x08
-#define ILI9341_MADCTL_MH  0x04
+#define ILI9341_MADCTL_MH 0x04
 
-
-
-#define HX8357_NOP     0x00
+#define HX8357_NOP 0x00
 #define HX8357_SWRESET 0x01
-#define HX8357_RDDID   0x04
-#define HX8357_RDDST   0x09
+#define HX8357_RDDID 0x04
+#define HX8357_RDDST 0x09
 
-#define HX8357B_RDPOWMODE  0x0A
-#define HX8357B_RDMADCTL  0x0B
-#define HX8357B_RDCOLMOD  0x0C
-#define HX8357B_RDDIM  0x0D
-#define HX8357B_RDDSDR  0x0F
+#define HX8357B_RDPOWMODE 0x0A
+#define HX8357B_RDMADCTL 0x0B
+#define HX8357B_RDCOLMOD 0x0C
+#define HX8357B_RDDIM 0x0D
+#define HX8357B_RDDSDR 0x0F
 
-#define HX8357_SLPIN   0x10
-#define HX8357_SLPOUT  0x11
-#define HX8357B_PTLON   0x12
-#define HX8357B_NORON   0x13
+#define HX8357_SLPIN 0x10
+#define HX8357_SLPOUT 0x11
+#define HX8357B_PTLON 0x12
+#define HX8357B_NORON 0x13
 
-#define HX8357_INVOFF  0x20
-#define HX8357_INVON   0x21
+#define HX8357_INVOFF 0x20
+#define HX8357_INVON 0x21
 #define HX8357_DISPOFF 0x28
-#define HX8357_DISPON  0x29
+#define HX8357_DISPON 0x29
 
-#define HX8357_CASET   0x2A
-#define HX8357_PASET   0x2B
-#define HX8357_RAMWR   0x2C
-#define HX8357_RAMRD   0x2E
+#define HX8357_CASET 0x2A
+#define HX8357_PASET 0x2B
+#define HX8357_RAMWR 0x2C
+#define HX8357_RAMRD 0x2E
 
-#define HX8357B_PTLAR   0x30
-#define HX8357_TEON  0x35
-#define HX8357_TEARLINE  0x44
-#define HX8357_MADCTL  0x36
-#define HX8357_COLMOD  0x3A
+#define HX8357B_PTLAR 0x30
+#define HX8357_TEON 0x35
+#define HX8357_TEARLINE 0x44
+#define HX8357_MADCTL 0x36
+#define HX8357_COLMOD 0x3A
 
 #define HX8357_SETOSC 0xB0
 #define HX8357_SETPWR1 0xB1
 #define HX8357B_SETDISPLAY 0xB2
 #define HX8357_SETRGB 0xB3
-#define HX8357D_SETCOM  0xB6
+#define HX8357D_SETCOM 0xB6
 
-#define HX8357B_SETDISPMODE  0xB4
-#define HX8357D_SETCYC  0xB4
+#define HX8357B_SETDISPMODE 0xB4
+#define HX8357D_SETCYC 0xB4
 #define HX8357B_SETOTP 0xB7
 #define HX8357D_SETC 0xB9
 
 #define HX8357B_SET_PANEL_DRIVING 0xC0
 #define HX8357D_SETSTBA 0xC0
-#define HX8357B_SETDGC  0xC1
-#define HX8357B_SETID  0xC3
-#define HX8357B_SETDDB  0xC4
+#define HX8357B_SETDGC 0xC1
+#define HX8357B_SETID 0xC3
+#define HX8357B_SETDDB 0xC4
 #define HX8357B_SETDISPLAYFRAME 0xC5
 #define HX8357B_GAMMASET 0xC8
-#define HX8357B_SETCABC  0xC9
-#define HX8357_SETPANEL  0xCC
-
+#define HX8357B_SETCABC 0xC9
+#define HX8357_SETPANEL 0xCC
 
 #define HX8357B_SETPOWER 0xD0
 #define HX8357B_SETVCOM 0xD1
 #define HX8357B_SETPWRNORMAL 0xD2
 
-#define HX8357B_RDID1   0xDA
-#define HX8357B_RDID2   0xDB
-#define HX8357B_RDID3   0xDC
-#define HX8357B_RDID4   0xDD
+#define HX8357B_RDID1 0xDA
+#define HX8357B_RDID2 0xDB
+#define HX8357B_RDID3 0xDC
+#define HX8357B_RDID4 0xDD
 
 #define HX8357D_SETGAMMA 0xE0
 
 #define HX8357B_SETGAMMA 0xC8
-#define HX8357B_SETPANELRELATED  0xE9
+#define HX8357B_SETPANELRELATED 0xE9
 
-#define HX8357B_MADCTL_MY  0x80
-#define HX8357B_MADCTL_MX  0x40
-#define HX8357B_MADCTL_MV  0x20
-#define HX8357B_MADCTL_ML  0x10
+#define HX8357B_MADCTL_MY 0x80
+#define HX8357B_MADCTL_MX 0x40
+#define HX8357B_MADCTL_MV 0x20
+#define HX8357B_MADCTL_ML 0x10
 #define HX8357B_MADCTL_RGB 0x00
 #define HX8357B_MADCTL_BGR 0x08
-#define HX8357B_MADCTL_MH  0x04
+#define HX8357B_MADCTL_MH 0x04