From 416680a9d9ae8e0db8f6ab41acfa07a848ac5bf3 Mon Sep 17 00:00:00 2001
From: KTOWN <contact@microbuilder.eu>
Date: Mon, 14 Oct 2013 14:20:17 +0200
Subject: [PATCH] HW accelerated triangles

---
 Adafruit_RA8875.cpp | 75 +++++++++++++++++++++++++++++++++++++++++++--
 Adafruit_RA8875.h   |  6 +++-
 2 files changed, 78 insertions(+), 3 deletions(-)

diff --git a/Adafruit_RA8875.cpp b/Adafruit_RA8875.cpp
index 68e6782..2620bc4 100644
--- a/Adafruit_RA8875.cpp
+++ b/Adafruit_RA8875.cpp
@@ -2,7 +2,7 @@
 #include <SPI.h>
 #include "Adafruit_RA8875.h"
 
-Adafruit_RA8875::Adafruit_RA8875(uint8_t CS, uint8_t RST) : Adafruit_GFX(480, 272) {
+Adafruit_RA8875::Adafruit_RA8875(uint8_t CS, uint8_t RST) : Adafruit_GFX(800, 480) {
   _cs = CS;
   _rst = RST;
 }
@@ -277,6 +277,16 @@ void Adafruit_RA8875::fillCircle(int16_t x0, int16_t y0, int16_t r, uint16_t col
   circleHelper(x0, y0, r, color, true);
 }
 
+void Adafruit_RA8875::drawTriangle(int16_t x0, int16_t y0, int16_t x1, int16_t y1, int16_t x2, int16_t y2, uint16_t color)
+{
+  triangleHelper(x0, y0, x1, y1, x2, y2, color, false);
+}
+
+void Adafruit_RA8875::fillTriangle(int16_t x0, int16_t y0, int16_t x1, int16_t y1, int16_t x2, int16_t y2, uint16_t color)
+{
+  triangleHelper(x0, y0, x1, y1, x2, y2, color, true);
+}
+
 void Adafruit_RA8875::circleHelper(int16_t x0, int16_t y0, int16_t r, uint16_t color, bool filled)
 {
   /* Set X */
@@ -379,6 +389,67 @@ void Adafruit_RA8875::rectHelper(int16_t x, int16_t y, int16_t w, int16_t h, uin
   }  
 }
 
+void Adafruit_RA8875::triangleHelper(int16_t x0, int16_t y0, int16_t x1, int16_t y1, int16_t x2, int16_t y2, uint16_t color, bool filled)
+{
+  /* Set Point 0 */
+  writeCommand(0x91);
+  writeData(x0);
+  writeCommand(0x92);
+  writeData(x0 >> 8);
+  writeCommand(0x93);
+  writeData(y0); 
+  writeCommand(0x94);
+  writeData(y0 >> 8);
+
+  /* Set Point 1 */
+  writeCommand(0x95);
+  writeData(x1);
+  writeCommand(0x96);
+  writeData(x1 >> 8);
+  writeCommand(0x97);
+  writeData(y1); 
+  writeCommand(0x98);
+  writeData(y1 >> 8);
+
+  /* Set Point 2 */
+  writeCommand(0xA9);
+  writeData(x2);
+  writeCommand(0xAA);
+  writeData(x2 >> 8);
+  writeCommand(0xAB);
+  writeData(y2); 
+  writeCommand(0xAC);
+  writeData(y2 >> 8);
+  
+  /* Set Color */
+  writeCommand(0x63);
+  writeData((color & 0xf800) >> 11);
+  writeCommand(0x64);
+  writeData((color & 0x07e0) >> 5);
+  writeCommand(0x65);
+  writeData((color & 0x001f));
+  
+  /* Draw! */
+  writeCommand(RA8875_DCR);
+  if (filled)
+  {
+    writeData(0xA1);
+  }
+  else
+  {
+    writeData(0x81);
+  }
+  
+  /* Wait for the command to finish */
+  bool finished = false;
+  while (!finished)
+  {
+    uint8_t temp = readReg(RA8875_DCR);
+    if (!(temp & RA8875_DCR_LINESQUTRI_STATUS))
+      finished = true;
+  }
+}
+
 /************************* Mid Level ***********************************/
 
 void Adafruit_RA8875::GPIOX(boolean on) {
@@ -423,7 +494,7 @@ void Adafruit_RA8875::touchEnable(boolean on)
                            RA8875_TPCR0_ADCCLK_DIV4); // 10mhz max!
     /* Set Auto Mode      (Reg 0x71) */
     writeReg(RA8875_TPCR1, RA8875_TPCR1_AUTO    | 
-                           RA8875_TPCR1_VREFEXT | 
+                           // RA8875_TPCR1_VREFEXT | 
                            RA8875_TPCR1_DEBOUNCE);
     /* Enable TP INT */
     writeReg(RA8875_INTC1, readReg(RA8875_INTC1) | RA8875_INTC1_TP);
diff --git a/Adafruit_RA8875.h b/Adafruit_RA8875.h
index 2ea2be3..4f79ec0 100644
--- a/Adafruit_RA8875.h
+++ b/Adafruit_RA8875.h
@@ -58,7 +58,9 @@ class Adafruit_RA8875 : public Adafruit_GFX {
   /* HW accelerated wrapper functions (override Adafruit_GFX prototypes) */
   void    drawCircle(int16_t x0, int16_t y0, int16_t r, uint16_t color);
   void    fillCircle(int16_t x0, int16_t y0, int16_t r, 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);
+  
   /* Backlight */
   void    GPIOX(boolean on);
   void    PWM1config(boolean on, uint8_t clock);
@@ -89,6 +91,7 @@ class Adafruit_RA8875 : public Adafruit_GFX {
   /* GFX Helper Functions */
   void circleHelper(int16_t x0, int16_t y0, int16_t r, uint16_t color, bool filled);
   void rectHelper  (int16_t x, int16_t y, int16_t w, int16_t h, uint16_t color, bool filled);
+  void triangleHelper(int16_t x0, int16_t y0, int16_t x1, int16_t y1, int16_t x2, int16_t y2, uint16_t color, bool filled);
 
   uint8_t _cs, _rst;
   uint16_t _width, _height;
@@ -200,6 +203,7 @@ class Adafruit_RA8875 : public Adafruit_GFX {
 #define RA8875_DCR_FILL               0x20
 #define RA8875_DCR_NOFILL             0x00
 #define RA8875_DCR_DRAWLINE           0x00
+#define RA8875_DCR_DRAWTRIANGLE       0x01
 #define RA8875_DCR_DRAWSQUARE         0x10
 
 #define RA8875_MWCR0            0x40