.github/ISSUE_TEMPLATE/issue-template.md

@@ -7,8 +7,6 @@ assignees: ''
 
 ---
 
-Only raise issues for problems with the library and/or provided examples. Post questions, comments and useful tips etc in the "Discussions" section.
-
 To minimise effort to resolve issues the following should be provided as a minimum:
 1. A description of the problem and the conditions that cause it to occur
 2. IDE (e.g. Arduino or PlatformIO)
@@ -24,11 +22,9 @@ Plus further information as appropriate to the problem:
 3. A zip file  containing a simple and complete example sketch that demonstrates the problem but needs no special hardware sensors or libraries.
 4. Screen shot pictures showing the problem  (just drag and drop in message window)
 
-The idea is to provide sufficient information so I can setup the exact same (or sufficiently similar) scenario to investigate and resolve the issue without having a tedious ping-pong of Q&A.
+The idea is to provide sufficient information so I can setup the exact same (or sufficiently similar) scenario to investigate and resolve the issue.
 
-DO NOT paste code directly into the issue. To correctly format code put three ticks ( ` character on key next to "1" key) at the start and end of short pasted code segments to avoid format/markup anomolies. [See here:](https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#quoting-code)
+Put three ticks ( ` character on key next to "1" key) at the start and end of short pasted code segments to avoid format/markup anomolies and to use a monspaced font. Example:
-
-Example output:
 
 ```
   Serial.begin(115200);

.gitignore

@@ -17,11 +17,6 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 
-# Arduino debug
-debug.cfg
-debug_custom.json
-*.svd
-
 # =========================
 # Operating System Files
 # =========================

Extensions/Button.cpp

@@ -8,8 +8,6 @@ TFT_eSPI_Button::TFT_eSPI_Button(void) {
   _yd        = 0;
   _textdatum = MC_DATUM;
   _label[9]  = '\0';
-  currstate = false;
-  laststate = false;
 }
 
 // Classic initButton() function: pass center & size

Extensions/Sprite.cpp

@@ -1257,8 +1257,8 @@ void  TFT_eSprite::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const u
 // Intentionally not constrained to viewport area, does not manage 1bpp rotations
 void TFT_eSprite::setWindow(int32_t x0, int32_t y0, int32_t x1, int32_t y1)
 {
-  if (x0 > x1) transpose(x0, x1);
+  if (x0 > x1) swap_coord(x0, x1);
-  if (y0 > y1) transpose(y0, y1);
+  if (y0 > y1) swap_coord(y0, y1);
   
   int32_t w = width();
   int32_t h = height();
@@ -1700,13 +1700,13 @@ void TFT_eSprite::drawLine(int32_t x0, int32_t y0, int32_t x1, int32_t y1, uint3
 
   bool steep = abs(y1 - y0) > abs(x1 - x0);
   if (steep) {
-    transpose(x0, y0);
+    swap_coord(x0, y0);
-    transpose(x1, y1);
+    swap_coord(x1, y1);
   }
 
   if (x0 > x1) {
-    transpose(x0, x1);
+    swap_coord(x0, x1);
-    transpose(y0, y1);
+    swap_coord(y0, y1);
   }
 
   int32_t dx = x1 - x0, dy = abs(y1 - y0);;
@@ -2417,8 +2417,6 @@ void TFT_eSprite::drawGlyph(uint16_t code)
 {
   uint16_t fg = textcolor;
   uint16_t bg = textbgcolor;
-  bool getBG  = false;
-  if (fg == bg) getBG = true;
 
   // Check if cursor has moved
   if (last_cursor_x != cursor_x)
@@ -2553,7 +2551,7 @@ void TFT_eSprite::drawGlyph(uint16_t code)
               else drawFastHLine( fxs, y + cy, fl, fg);
               fl = 0;
             }
-            if (getBG) bg = readPixel(x + cx, y + cy);
+            if (getColor) bg = getColor(x + cx, y + cy);
             drawPixel(x + cx, y + cy, alphaBlend(pixel, fg, bg));
           }
           else

Extensions/Touch.cpp

@@ -107,8 +107,6 @@ uint16_t TFT_eSPI::getTouchRawZ(void){
 
   end_touch_read_write();
 
-  if (tz == 4095) tz = 0;
-
   return (uint16_t)tz;
 }
 

Kconfig

@@ -212,21 +212,6 @@ menu "TFT_eSPI"
 
     menu "Display SPI config"
         depends on !TFT_PARALLEL_8_BIT
-    
-        choice TFT_SPI_PORT
-            prompt "SPI port"
-            default TFT_VSPI_PORT
-            help
-                The ESP32 has 2 free SPI ports i.e. VSPI (SPI2) and HSPI (SPI3),
-                the VSPI is the default. If the VSPI port is in use and pins are
-                not accessible (e.g. TTGO T-Beam) then use the HSPI port for the
-                TFT display.
-            config TFT_VSPI_PORT
-                bool "VSPI (SPI2)"
-            config TFT_HSPI_PORT
-                bool "HSPI (SPI3)"
-        endchoice
-
         config TFT_MISO
             int "TFT MISO pin"
             default -1

Processors/TFT_eSPI_ESP32.c

@@ -64,35 +64,29 @@
 ////////////////////////////////////////////////////////////////////////////////////////
 
 /***************************************************************************************
-** Function name:           beginSDA - VSPI port only, FPSI port only for S2
+** Function name:           beginSDA
-** Description:             Detach MOSI and attach MISO to SDA for reads
+** Description:             Detach SPI from pin to permit software SPI
 ***************************************************************************************/
 void TFT_eSPI::begin_SDA_Read(void)
 {
-  gpio_set_direction((gpio_num_t)TFT_MOSI, GPIO_MODE_INPUT);
+  pinMatrixOutDetach(TFT_MOSI, false, false);
-  #ifdef CONFIG_IDF_TARGET_ESP32
+  pinMode(TFT_MOSI, INPUT);
-    pinMatrixInAttach(TFT_MOSI, VSPIQ_IN_IDX, false);
+  pinMatrixInAttach(TFT_MOSI, VSPIQ_IN_IDX, false);
-  #else // S2
-    pinMatrixInAttach(TFT_MOSI, FSPIQ_IN_IDX, false);
-  #endif
   SET_BUS_READ_MODE;
 }
 
 /***************************************************************************************
-** Function name:           endSDA - VSPI port only, FPSI port only for S2
+** Function name:           endSDA
-** Description:             Attach MOSI to SDA and detach MISO for writes
+** Description:             Attach SPI pins after software SPI
 ***************************************************************************************/
 void TFT_eSPI::end_SDA_Read(void)
 {
-  gpio_set_direction((gpio_num_t)TFT_MOSI, GPIO_MODE_OUTPUT);
+  pinMode(TFT_MOSI, OUTPUT);
-  #ifdef CONFIG_IDF_TARGET_ESP32
+  pinMatrixOutAttach(TFT_MOSI, VSPID_OUT_IDX, false, false);
-    pinMatrixOutAttach(TFT_MOSI, VSPID_OUT_IDX, false, false);
+  pinMode(TFT_MISO, INPUT);
-  #else // S2
+  pinMatrixInAttach(TFT_MISO, VSPIQ_IN_IDX, false);
-    pinMatrixOutAttach(TFT_MOSI, FSPID_OUT_IDX, false, false);
-  #endif
   SET_BUS_WRITE_MODE;
 }
-
 ////////////////////////////////////////////////////////////////////////////////////////
 #endif // #if defined (TFT_SDA_READ)
 ////////////////////////////////////////////////////////////////////////////////////////

Processors/TFT_eSPI_ESP32.h

@@ -139,7 +139,6 @@ SPI3_HOST = 2
   #define FONT_FS_AVAILABLE
 #endif
 
-
 ////////////////////////////////////////////////////////////////////////////////////////
 // Define the DC (TFT Data/Command or Register Select (RS))pin drive code
 ////////////////////////////////////////////////////////////////////////////////////////
@@ -152,9 +151,6 @@ SPI3_HOST = 2
     #if (TFT_DC >= 0) &&  (TFT_DC < 32)
       #define DC_C GPIO.out_w1tc = (1 << TFT_DC)
       #define DC_D GPIO.out_w1ts = (1 << TFT_DC)
-    #elif (TFT_DC >= 32)
-      #define DC_C GPIO.out1_w1tc.val = (1 << (TFT_DC- 32))
-      #define DC_D GPIO.out1_w1ts.val = (1 << (TFT_DC- 32))
     #else
       #define DC_C
       #define DC_D
@@ -354,16 +350,16 @@ SPI3_HOST = 2
   }                                                \
 
   // Mask for the 8 data bits to set pin directions
-  #define GPIO_DIR_MASK ((1 << TFT_D0) | (1 << TFT_D1) | (1 << TFT_D2) | (1 << TFT_D3) | (1 << TFT_D4) | (1 << TFT_D5) | (1 << TFT_D6) | (1 << TFT_D7))
+  #define dir_mask ((1 << TFT_D0) | (1 << TFT_D1) | (1 << TFT_D2) | (1 << TFT_D3) | (1 << TFT_D4) | (1 << TFT_D5) | (1 << TFT_D6) | (1 << TFT_D7))
 
   #if (TFT_WR >= 32)
     // Data bits and the write line are cleared sequentially
-    #define GPIO_OUT_CLR_MASK (GPIO_DIR_MASK); WR_L
+    #define clr_mask (dir_mask); WR_L
   #elif (TFT_WR >= 0)
     // Data bits and the write line are cleared to 0 in one step (1.25x faster)
-    #define GPIO_OUT_CLR_MASK (GPIO_DIR_MASK | (1 << TFT_WR))
+    #define clr_mask (dir_mask | (1 << TFT_WR))
   #else
-    #define GPIO_OUT_CLR_MASK
+    #define clr_mask
   #endif
 
   // A lookup table is used to set the different bit patterns, this uses 1kByte of RAM
@@ -375,14 +371,14 @@ SPI3_HOST = 2
   //*/
 
   // Write 8 bits to TFT
-  #define tft_Write_8(C)  GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t)(C)); WR_H
+  #define tft_Write_8(C)  GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t)(C)); WR_H
 
   #if defined (SSD1963_DRIVER)
 
     // Write 18 bit color to TFT
-    #define tft_Write_16(C) GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) (((C) & 0xF800)>> 8)); WR_H; \
+    #define tft_Write_16(C) GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) (((C) & 0xF800)>> 8)); WR_H; \
-                            GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) (((C) & 0x07E0)>> 3)); WR_H; \
+                            GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) (((C) & 0x07E0)>> 3)); WR_H; \
-                            GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) (((C) & 0x001F)<< 3)); WR_H
+                            GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) (((C) & 0x001F)<< 3)); WR_H
 
     // 18 bit color write with swapped bytes
     #define tft_Write_16S(C) Cswap = ((C) >>8 | (C) << 8); tft_Write_16(Cswap)
@@ -391,37 +387,37 @@ SPI3_HOST = 2
 
     #ifdef PSEUDO_16_BIT
       // One write strobe for both bytes
-      #define tft_Write_16(C)  GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 0)); WR_H
+      #define tft_Write_16(C)  GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 0)); WR_H
-      #define tft_Write_16S(C) GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 8)); WR_H
+      #define tft_Write_16S(C) GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 8)); WR_H
     #else
       // Write 16 bits to TFT
-      #define tft_Write_16(C) GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 8)); WR_H; \
+      #define tft_Write_16(C) GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 8)); WR_H; \
-                              GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 0)); WR_H
+                              GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 0)); WR_H
 
       // 16 bit write with swapped bytes
-      #define tft_Write_16S(C) GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 0)); WR_H; \
+      #define tft_Write_16S(C) GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 0)); WR_H; \
-                               GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 8)); WR_H
+                               GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 8)); WR_H
     #endif
 
   #endif
 
   // Write 32 bits to TFT
-  #define tft_Write_32(C) GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 24)); WR_H; \
+  #define tft_Write_32(C) GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 24)); WR_H; \
-                          GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 16)); WR_H; \
+                          GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 16)); WR_H; \
-                          GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) ((C) >>  8)); WR_H; \
+                          GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >>  8)); WR_H; \
-                          GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) ((C) >>  0)); WR_H
+                          GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >>  0)); WR_H
 
   // Write two concatenated 16 bit values to TFT
-  #define tft_Write_32C(C,D) GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 8)); WR_H; \
+  #define tft_Write_32C(C,D) GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 8)); WR_H; \
-                             GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 0)); WR_H; \
+                             GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 0)); WR_H; \
-                             GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) ((D) >> 8)); WR_H; \
+                             GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((D) >> 8)); WR_H; \
-                             GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) ((D) >> 0)); WR_H
+                             GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((D) >> 0)); WR_H
 
   // Write 16 bit value twice to TFT - used by drawPixel()
-  #define tft_Write_32D(C) GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 8)); WR_H; \
+  #define tft_Write_32D(C) GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 8)); WR_H; \
-                           GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 0)); WR_H; \
+                           GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 0)); WR_H; \
-                           GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 8)); WR_H; \
+                           GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 8)); WR_H; \
-                           GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 0)); WR_H
+                           GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 0)); WR_H
 
    // Read pin
   #ifdef TFT_RD

Processors/TFT_eSPI_ESP32_C3.c

@@ -66,24 +66,27 @@
 ////////////////////////////////////////////////////////////////////////////////////////
 
 /***************************************************************************************
-** Function name:           beginSDA - FPSI port only
+** Function name:           beginSDA
-** Description:             Detach MOSI and attach MISO to SDA for reads
+** Description:             Detach SPI from pin to permit software SPI
 ***************************************************************************************/
 void TFT_eSPI::begin_SDA_Read(void)
 {
-  gpio_set_direction((gpio_num_t)TFT_MOSI, GPIO_MODE_INPUT);
+  pinMatrixOutDetach(TFT_MOSI, false, false);
-  pinMatrixInAttach(TFT_MOSI, FSPIQ_IN_IDX, false);
+  pinMode(TFT_MOSI, INPUT);
+  pinMatrixInAttach(TFT_MOSI, VSPIQ_IN_IDX, false);
   SET_BUS_READ_MODE;
 }
 
 /***************************************************************************************
-** Function name:           endSDA - FPSI port only
+** Function name:           endSDA
-** Description:             Attach MOSI to SDA and detach MISO for writes
+** Description:             Attach SPI pins after software SPI
 ***************************************************************************************/
 void TFT_eSPI::end_SDA_Read(void)
 {
-  gpio_set_direction((gpio_num_t)TFT_MOSI, GPIO_MODE_OUTPUT);
+  pinMode(TFT_MOSI, OUTPUT);
-  pinMatrixOutAttach(TFT_MOSI, FSPID_OUT_IDX, false, false);
+  pinMatrixOutAttach(TFT_MOSI, VSPID_OUT_IDX, false, false);
+  pinMode(TFT_MISO, INPUT);
+  pinMatrixInAttach(TFT_MISO, VSPIQ_IN_IDX, false);
   SET_BUS_WRITE_MODE;
 }
 ////////////////////////////////////////////////////////////////////////////////////////

Processors/TFT_eSPI_ESP32_C3.h

@@ -143,9 +143,6 @@ SPI3_HOST = 2
     #if (TFT_DC >= 0) &&  (TFT_DC < 32)
       #define DC_C GPIO.out_w1tc.val = (1 << TFT_DC)
       #define DC_D GPIO.out_w1ts.val = (1 << TFT_DC)
-    #elif (TFT_DC >= 32)
-      #define DC_C GPIO.out_w1tc.val = (1 << (TFT_DC- 32))
-      #define DC_D GPIO.out_w1ts.val = (1 << (TFT_DC- 32))
     #else
       #define DC_C
       #define DC_D
@@ -345,16 +342,16 @@ SPI3_HOST = 2
   }                                                \
 
   // Mask for the 8 data bits to set pin directions
-  #define GPIO_DIR_MASK ((1 << TFT_D0) | (1 << TFT_D1) | (1 << TFT_D2) | (1 << TFT_D3) | (1 << TFT_D4) | (1 << TFT_D5) | (1 << TFT_D6) | (1 << TFT_D7))
+  #define dir_mask ((1 << TFT_D0) | (1 << TFT_D1) | (1 << TFT_D2) | (1 << TFT_D3) | (1 << TFT_D4) | (1 << TFT_D5) | (1 << TFT_D6) | (1 << TFT_D7))
 
   #if (TFT_WR >= 32)
     // Data bits and the write line are cleared sequentially
-    #define GPIO_OUT_CLR_MASK (GPIO_DIR_MASK); WR_L
+    #define clr_mask (dir_mask); WR_L
   #elif (TFT_WR >= 0)
     // Data bits and the write line are cleared to 0 in one step (1.25x faster)
-    #define GPIO_OUT_CLR_MASK (GPIO_DIR_MASK | (1 << TFT_WR))
+    #define clr_mask (dir_mask | (1 << TFT_WR))
   #else
-    #define GPIO_OUT_CLR_MASK
+    #define clr_mask
   #endif
 
   // A lookup table is used to set the different bit patterns, this uses 1kByte of RAM
@@ -366,14 +363,14 @@ SPI3_HOST = 2
   //*/
 
   // Write 8 bits to TFT
-  #define tft_Write_8(C)  GPIO.out_w1tc.val = GPIO_OUT_CLR_MASK; GPIO.out_w1ts.val = set_mask((uint8_t)(C)); WR_H
+  #define tft_Write_8(C)  GPIO.out_w1tc.val = clr_mask; GPIO.out_w1ts.val = set_mask((uint8_t)(C)); WR_H
 
   #if defined (SSD1963_DRIVER)
 
     // Write 18 bit color to TFT
-    #define tft_Write_16(C) GPIO.out_w1tc.val = GPIO_OUT_CLR_MASK; GPIO.out_w1ts.val = set_mask((uint8_t) (((C) & 0xF800)>> 8)); WR_H; \
+    #define tft_Write_16(C) GPIO.out_w1tc.val = clr_mask; GPIO.out_w1ts.val = set_mask((uint8_t) (((C) & 0xF800)>> 8)); WR_H; \
-                            GPIO.out_w1tc.val = GPIO_OUT_CLR_MASK; GPIO.out_w1ts.val = set_mask((uint8_t) (((C) & 0x07E0)>> 3)); WR_H; \
+                            GPIO.out_w1tc.val = clr_mask; GPIO.out_w1ts.val = set_mask((uint8_t) (((C) & 0x07E0)>> 3)); WR_H; \
-                            GPIO.out_w1tc.val = GPIO_OUT_CLR_MASK; GPIO.out_w1ts.val = set_mask((uint8_t) (((C) & 0x001F)<< 3)); WR_H
+                            GPIO.out_w1tc.val = clr_mask; GPIO.out_w1ts.val = set_mask((uint8_t) (((C) & 0x001F)<< 3)); WR_H
 
     // 18 bit color write with swapped bytes
     #define tft_Write_16S(C) Cswap = ((C) >>8 | (C) << 8); tft_Write_16(Cswap)
@@ -382,37 +379,37 @@ SPI3_HOST = 2
 
     #ifdef PSEUDO_16_BIT
       // One write strobe for both bytes
-      #define tft_Write_16(C)  GPIO.out_w1tc.val = GPIO_OUT_CLR_MASK; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 0)); WR_H
+      #define tft_Write_16(C)  GPIO.out_w1tc.val = clr_mask; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 0)); WR_H
-      #define tft_Write_16S(C) GPIO.out_w1tc.val = GPIO_OUT_CLR_MASK; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 8)); WR_H
+      #define tft_Write_16S(C) GPIO.out_w1tc.val = clr_mask; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 8)); WR_H
     #else
       // Write 16 bits to TFT
-      #define tft_Write_16(C) GPIO.out_w1tc.val = GPIO_OUT_CLR_MASK; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 8)); WR_H; \
+      #define tft_Write_16(C) GPIO.out_w1tc.val = clr_mask; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 8)); WR_H; \
-                              GPIO.out_w1tc.val = GPIO_OUT_CLR_MASK; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 0)); WR_H
+                              GPIO.out_w1tc.val = clr_mask; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 0)); WR_H
 
       // 16 bit write with swapped bytes
-      #define tft_Write_16S(C) GPIO.out_w1tc.val = GPIO_OUT_CLR_MASK; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 0)); WR_H; \
+      #define tft_Write_16S(C) GPIO.out_w1tc.val = clr_mask; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 0)); WR_H; \
-                               GPIO.out_w1tc.val = GPIO_OUT_CLR_MASK; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 8)); WR_H
+                               GPIO.out_w1tc.val = clr_mask; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 8)); WR_H
     #endif
 
   #endif
 
   // Write 32 bits to TFT
-  #define tft_Write_32(C) GPIO.out_w1tc.val = GPIO_OUT_CLR_MASK; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 24)); WR_H; \
+  #define tft_Write_32(C) GPIO.out_w1tc.val = clr_mask; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 24)); WR_H; \
-                          GPIO.out_w1tc.val = GPIO_OUT_CLR_MASK; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 16)); WR_H; \
+                          GPIO.out_w1tc.val = clr_mask; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 16)); WR_H; \
-                          GPIO.out_w1tc.val = GPIO_OUT_CLR_MASK; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >>  8)); WR_H; \
+                          GPIO.out_w1tc.val = clr_mask; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >>  8)); WR_H; \
-                          GPIO.out_w1tc.val = GPIO_OUT_CLR_MASK; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >>  0)); WR_H
+                          GPIO.out_w1tc.val = clr_mask; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >>  0)); WR_H
 
   // Write two concatenated 16 bit values to TFT
-  #define tft_Write_32C(C,D) GPIO.out_w1tc.val = GPIO_OUT_CLR_MASK; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 8)); WR_H; \
+  #define tft_Write_32C(C,D) GPIO.out_w1tc.val = clr_mask; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 8)); WR_H; \
-                             GPIO.out_w1tc.val = GPIO_OUT_CLR_MASK; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 0)); WR_H; \
+                             GPIO.out_w1tc.val = clr_mask; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 0)); WR_H; \
-                             GPIO.out_w1tc.val = GPIO_OUT_CLR_MASK; GPIO.out_w1ts.val = set_mask((uint8_t) ((D) >> 8)); WR_H; \
+                             GPIO.out_w1tc.val = clr_mask; GPIO.out_w1ts.val = set_mask((uint8_t) ((D) >> 8)); WR_H; \
-                             GPIO.out_w1tc.val = GPIO_OUT_CLR_MASK; GPIO.out_w1ts.val = set_mask((uint8_t) ((D) >> 0)); WR_H
+                             GPIO.out_w1tc.val = clr_mask; GPIO.out_w1ts.val = set_mask((uint8_t) ((D) >> 0)); WR_H
 
   // Write 16 bit value twice to TFT - used by drawPixel()
-  #define tft_Write_32D(C) GPIO.out_w1tc.val = GPIO_OUT_CLR_MASK; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 8)); WR_H; \
+  #define tft_Write_32D(C) GPIO.out_w1tc.val = clr_mask; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 8)); WR_H; \
-                           GPIO.out_w1tc.val = GPIO_OUT_CLR_MASK; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 0)); WR_H; \
+                           GPIO.out_w1tc.val = clr_mask; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 0)); WR_H; \
-                           GPIO.out_w1tc.val = GPIO_OUT_CLR_MASK; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 8)); WR_H; \
+                           GPIO.out_w1tc.val = clr_mask; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 8)); WR_H; \
-                           GPIO.out_w1tc.val = GPIO_OUT_CLR_MASK; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 0)); WR_H
+                           GPIO.out_w1tc.val = clr_mask; GPIO.out_w1ts.val = set_mask((uint8_t) ((C) >> 0)); WR_H
 
    // Read pin
   #ifdef TFT_RD

Processors/TFT_eSPI_ESP32_S3.c

@@ -43,38 +43,50 @@
     #endif
   #else
     #ifdef USE_HSPI_PORT
-      #define DMA_CHANNEL SPI_DMA_CH_AUTO
+      #define DMA_CHANNEL 2
-      spi_host_device_t spi_host = SPI3_HOST;
+      spi_host_device_t spi_host = (spi_host_device_t) DMA_CHANNEL; // Draws once then freezes
     #else // use FSPI port
-      #define DMA_CHANNEL SPI_DMA_CH_AUTO
+      #define DMA_CHANNEL 1
-      spi_host_device_t spi_host = SPI2_HOST;
+      spi_host_device_t spi_host = (spi_host_device_t) DMA_CHANNEL; // Draws once then freezes
     #endif
   #endif
 #endif
 
+#if !defined (TFT_PARALLEL_8_BIT)
+  // Volatile for register reads:
+  volatile uint32_t* _spi_cmd       = (volatile uint32_t*)(SPI_CMD_REG(SPI_PORT));
+  volatile uint32_t* _spi_user      = (volatile uint32_t*)(SPI_USER_REG(SPI_PORT));
+  // Register writes only:
+  volatile uint32_t* _spi_mosi_dlen = (volatile uint32_t*)(SPI_MOSI_DLEN_REG(SPI_PORT));
+  volatile uint32_t* _spi_w         = (volatile uint32_t*)(SPI_W0_REG(SPI_PORT));
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////////////
 #if defined (TFT_SDA_READ) && !defined (TFT_PARALLEL_8_BIT)
 ////////////////////////////////////////////////////////////////////////////////////////
 
 /***************************************************************************************
-** Function name:           beginSDA - FPSI port only
+** Function name:           beginSDA
-** Description:             Detach MOSI and attach MISO to SDA for reads
+** Description:             Detach SPI from pin to permit software SPI
 ***************************************************************************************/
 void TFT_eSPI::begin_SDA_Read(void)
 {
-  gpio_set_direction((gpio_num_t)TFT_MOSI, GPIO_MODE_INPUT);
+  pinMatrixOutDetach(TFT_MOSI, false, false);
-  pinMatrixInAttach(TFT_MOSI, FSPIQ_IN_IDX, false);
+  pinMode(TFT_MOSI, INPUT);
+  pinMatrixInAttach(TFT_MOSI, VSPIQ_IN_IDX, false);
   SET_BUS_READ_MODE;
 }
 
 /***************************************************************************************
-** Function name:           endSDA - FPSI port only
+** Function name:           endSDA
-** Description:             Attach MOSI to SDA and detach MISO for writes
+** Description:             Attach SPI pins after software SPI
 ***************************************************************************************/
 void TFT_eSPI::end_SDA_Read(void)
 {
-  gpio_set_direction((gpio_num_t)TFT_MOSI, GPIO_MODE_OUTPUT);
+  pinMode(TFT_MOSI, OUTPUT);
-  pinMatrixOutAttach(TFT_MOSI, FSPID_OUT_IDX, false, false);
+  pinMatrixOutAttach(TFT_MOSI, VSPID_OUT_IDX, false, false);
+  pinMode(TFT_MISO, INPUT);
+  pinMatrixInAttach(TFT_MISO, VSPIQ_IN_IDX, false);
   SET_BUS_WRITE_MODE;
 }
 ////////////////////////////////////////////////////////////////////////////////////////
@@ -93,20 +105,21 @@ uint8_t TFT_eSPI::readByte(void)
 
 #if defined (TFT_PARALLEL_8_BIT)
   RD_L;
-  b  = gpio_get_level((gpio_num_t)(TFT_D0-MASK_OFFSET)); // Read three times to allow for bus access time
+  uint32_t reg;           // Read all GPIO pins 0-31
-  b  = gpio_get_level((gpio_num_t)(TFT_D0-MASK_OFFSET));
+  reg = gpio_input_get(); // Read three times to allow for bus access time
-  b  = gpio_get_level((gpio_num_t)(TFT_D0-MASK_OFFSET)); // Data should be stable now
+  reg = gpio_input_get();
+  reg = gpio_input_get(); // Data should be stable now
   RD_H;
 
   // Check GPIO bits used and build value
-  b  = (gpio_get_level((gpio_num_t)(TFT_D0-MASK_OFFSET)) << 0);
+  b  = (((reg>>TFT_D0)&1) << 0);
-  b |= (gpio_get_level((gpio_num_t)(TFT_D1-MASK_OFFSET)) << 1);
+  b |= (((reg>>TFT_D1)&1) << 1);
-  b |= (gpio_get_level((gpio_num_t)(TFT_D2-MASK_OFFSET)) << 2);
+  b |= (((reg>>TFT_D2)&1) << 2);
-  b |= (gpio_get_level((gpio_num_t)(TFT_D3-MASK_OFFSET)) << 3);
+  b |= (((reg>>TFT_D3)&1) << 3);
-  b |= (gpio_get_level((gpio_num_t)(TFT_D4-MASK_OFFSET)) << 4);
+  b |= (((reg>>TFT_D4)&1) << 4);
-  b |= (gpio_get_level((gpio_num_t)(TFT_D5-MASK_OFFSET)) << 5);
+  b |= (((reg>>TFT_D5)&1) << 5);
-  b |= (gpio_get_level((gpio_num_t)(TFT_D6-MASK_OFFSET)) << 6);
+  b |= (((reg>>TFT_D6)&1) << 6);
-  b |= (gpio_get_level((gpio_num_t)(TFT_D7-MASK_OFFSET)) << 7);
+  b |= (((reg>>TFT_D7)&1) << 7);
 #endif
 
   return b;
@@ -640,15 +653,6 @@ void TFT_eSPI::pushPixelsDMA(uint16_t* image, uint32_t len)
     for (uint32_t i = 0; i < len; i++) (image[i] = image[i] << 8 | image[i] >> 8);
   }
 
-  // DMA byte count for transmit is 64Kbytes maximum, so to avoid this constraint
-  // small transfers are performed using a blocking call until DMA capacity is reached.
-  // User sketch can prevent blocking by managing pixel count and splitting into blocks
-  // of 32768 pixels maximum. (equivalent to an area of ~320 x 100 pixels)
-  while(len>0x4000) { // Transfer 16 bit pixels in blocks if len*2 over 65536 bytes
-    pushPixels(image, 0x400);
-    len -= 0x400; image+= 0x400; // Arbitrarily send 1K pixel blocks (2Kbytes)
-  }
-
   esp_err_t ret;
   static spi_transaction_t trans;
 
@@ -675,20 +679,11 @@ void TFT_eSPI::pushImageDMA(int32_t x, int32_t y, int32_t w, int32_t h, uint16_t
 {
   if ((w == 0) || (h == 0) || (!DMA_Enabled)) return;
 
-  uint16_t *buffer = (uint16_t*)image;
   uint32_t len = w*h;
 
   dmaWait();
 
   setAddrWindow(x, y, w, h);
-  // DMA byte count for transmit is 64Kbytes maximum, so to avoid this constraint
-  // small transfers are performed using a blocking call until DMA capacity is reached.
-  // User sketch can prevent blocking by managing pixel count and splitting into blocks
-  // of 32768 pixels maximum. (equivalent to an area of ~320 x 100 pixels)
-  while(len>0x4000) { // Transfer 16 bit pixels in blocks if len*2 over 65536 bytes
-    pushPixels(buffer, 0x400);
-    len -= 0x400; buffer+= 0x400; // Arbitrarily send 1K pixel blocks (2Kbytes)
-  }
 
   esp_err_t ret;
   static spi_transaction_t trans;
@@ -696,7 +691,7 @@ void TFT_eSPI::pushImageDMA(int32_t x, int32_t y, int32_t w, int32_t h, uint16_t
   memset(&trans, 0, sizeof(spi_transaction_t));
 
   trans.user = (void *)1;
-  trans.tx_buffer = buffer;   //Data pointer
+  trans.tx_buffer = image;   //Data pointer
   trans.length = len * 16;   //Data length, in bits
   trans.flags = 0;           //SPI_TRANS_USE_TXDATA flag
 
@@ -766,15 +761,6 @@ void TFT_eSPI::pushImageDMA(int32_t x, int32_t y, int32_t w, int32_t h, uint16_t
 
   setAddrWindow(x, y, dw, dh);
 
-  // DMA byte count for transmit is 64Kbytes maximum, so to avoid this constraint
-  // small transfers are performed using a blocking call until DMA capacity is reached.
-  // User sketch can prevent blocking by managing pixel count and splitting into blocks
-  // of 32768 pixels maximum. (equivalent to an area of ~320 x 100 pixels)
-  while(len>0x4000) { // Transfer 16 bit pixels in blocks if len*2 over 65536 bytes
-    pushPixels(buffer, 0x400);
-    len -= 0x400; buffer+= 0x400; // Arbitrarily send 1K pixel blocks (2Kbytes)
-  }
-
   esp_err_t ret;
   static spi_transaction_t trans;
 
@@ -798,7 +784,7 @@ void TFT_eSPI::pushImageDMA(int32_t x, int32_t y, int32_t w, int32_t h, uint16_t
 // The DMA functions here work with SPI only (not parallel)
 /***************************************************************************************
 ** Function name:           dc_callback
-** Description:             Toggles DC line during transaction (not used)
+** Description:             Toggles DC line during transaction
 ***************************************************************************************/
 extern "C" void dc_callback();
 
@@ -808,17 +794,6 @@ void IRAM_ATTR dc_callback(spi_transaction_t *spi_tx)
   else {DC_C;}
 }
 
-/***************************************************************************************
-** Function name:           dma_end_callback
-** Description:             Clear DMA run flag to stop retransmission loop
-***************************************************************************************/
-extern "C" void dma_end_callback();
-
-void IRAM_ATTR dma_end_callback(spi_transaction_t *spi_tx)
-{
-  WRITE_PERI_REG(SPI_DMA_CONF_REG(spi_host), 0);
-}
-
 /***************************************************************************************
 ** Function name:           initDMA
 ** Description:             Initialise the DMA engine - returns true if init OK
@@ -834,7 +809,7 @@ bool TFT_eSPI::initDMA(bool ctrl_cs)
     .sclk_io_num = TFT_SCLK,
     .quadwp_io_num = -1,
     .quadhd_io_num = -1,
-    .max_transfer_sz = 65536, // ESP32 S3 max size is 64Kbytes
+    .max_transfer_sz = TFT_WIDTH * TFT_HEIGHT * 2 + 8, // TFT screen size
     .flags = 0,
     .intr_flags = 0
   };
@@ -854,9 +829,9 @@ bool TFT_eSPI::initDMA(bool ctrl_cs)
     .input_delay_ns = 0,
     .spics_io_num = pin,
     .flags = SPI_DEVICE_NO_DUMMY, //0,
-    .queue_size = 1,            // Not using queues
+    .queue_size = 1,
-    .pre_cb = 0, //dc_callback, //Callback to handle D/C line (not used)
+    .pre_cb = 0, //dc_callback, //Callback to handle D/C line
-    .post_cb = dma_end_callback //Callback to end transmission
+    .post_cb = 0
   };
   ret = spi_bus_initialize(spi_host, &buscfg, DMA_CHANNEL);
   ESP_ERROR_CHECK(ret);

Processors/TFT_eSPI_ESP32_S3.h

@@ -7,6 +7,10 @@
 #ifndef _TFT_eSPI_ESP32H_
 #define _TFT_eSPI_ESP32H_
 
+#if !defined(DISABLE_ALL_LIBRARY_WARNINGS)
+ #warning >>>>------>> DMA is not supported on the ESP32 S3 (possible future update)
+#endif
+
 // Processor ID reported by getSetup()
 #define PROCESSOR_ID 0x32
 
@@ -106,17 +110,8 @@ SPI3_HOST = 2
   #endif
 #endif
 
-#if !defined(DISABLE_ALL_LIBRARY_WARNINGS) && defined (ESP32_PARALLEL)
- #warning >>>>------>> DMA is not supported in parallel mode
-#endif
-
 // Processor specific code used by SPI bus transaction startWrite and endWrite functions
 #if !defined (ESP32_PARALLEL)
-  #define _spi_cmd       (volatile uint32_t*)(SPI_CMD_REG(SPI_PORT))
-  #define _spi_user      (volatile uint32_t*)(SPI_USER_REG(SPI_PORT))
-  #define _spi_mosi_dlen (volatile uint32_t*)(SPI_MOSI_DLEN_REG(SPI_PORT))
-  #define _spi_w         (volatile uint32_t*)(SPI_W0_REG(SPI_PORT))
-
   #if (TFT_SPI_MODE == SPI_MODE1) || (TFT_SPI_MODE == SPI_MODE2)
     #define SET_BUS_WRITE_MODE *_spi_user = SPI_USR_MOSI | SPI_CK_OUT_EDGE
     #define SET_BUS_READ_MODE  *_spi_user = SPI_USR_MOSI | SPI_USR_MISO | SPI_DOUTDIN | SPI_CK_OUT_EDGE
@@ -166,9 +161,6 @@ SPI3_HOST = 2
     #if (TFT_DC >= 0) &&  (TFT_DC < 32)
       #define DC_C GPIO.out_w1tc = (1 << TFT_DC)
       #define DC_D GPIO.out_w1ts = (1 << TFT_DC)
-    #elif (TFT_DC >= 32)
-      #define DC_C GPIO.out1_w1tc.val = (1 << (TFT_DC- 32))
-      #define DC_D GPIO.out1_w1ts.val = (1 << (TFT_DC- 32))
     #else
       #define DC_C
       #define DC_D
@@ -351,53 +343,33 @@ SPI3_HOST = 2
 ////////////////////////////////////////////////////////////////////////////////////////
 #if defined (TFT_PARALLEL_8_BIT)
 
-  #if (TFT_D0 >= 32) // If D0 is a high GPIO assume all other data bits are high GPIO
-    #define MASK_OFFSET 32
-    #define GPIO_CLR_REG GPIO.out1_w1tc.val
-    #define GPIO_SET_REG GPIO.out1_w1ts.val
-  #else
-    #define MASK_OFFSET 0
-    #define GPIO_CLR_REG GPIO.out_w1tc
-    #define GPIO_SET_REG GPIO.out_w1ts
-  #endif
-
   // Create a bit set lookup table for data bus - wastes 1kbyte of RAM but speeds things up dramatically
   // can then use e.g. GPIO.out_w1ts = set_mask(0xFF); to set data bus to 0xFF
   #define PARALLEL_INIT_TFT_DATA_BUS               \
   for (int32_t c = 0; c<256; c++)                  \
   {                                                \
     xset_mask[c] = 0;                              \
-    if ( c & 0x01 ) xset_mask[c] |= (1 << (TFT_D0-MASK_OFFSET)); \
+    if ( c & 0x01 ) xset_mask[c] |= (1 << TFT_D0); \
-    if ( c & 0x02 ) xset_mask[c] |= (1 << (TFT_D1-MASK_OFFSET)); \
+    if ( c & 0x02 ) xset_mask[c] |= (1 << TFT_D1); \
-    if ( c & 0x04 ) xset_mask[c] |= (1 << (TFT_D2-MASK_OFFSET)); \
+    if ( c & 0x04 ) xset_mask[c] |= (1 << TFT_D2); \
-    if ( c & 0x08 ) xset_mask[c] |= (1 << (TFT_D3-MASK_OFFSET)); \
+    if ( c & 0x08 ) xset_mask[c] |= (1 << TFT_D3); \
-    if ( c & 0x10 ) xset_mask[c] |= (1 << (TFT_D4-MASK_OFFSET)); \
+    if ( c & 0x10 ) xset_mask[c] |= (1 << TFT_D4); \
-    if ( c & 0x20 ) xset_mask[c] |= (1 << (TFT_D5-MASK_OFFSET)); \
+    if ( c & 0x20 ) xset_mask[c] |= (1 << TFT_D5); \
-    if ( c & 0x40 ) xset_mask[c] |= (1 << (TFT_D6-MASK_OFFSET)); \
+    if ( c & 0x40 ) xset_mask[c] |= (1 << TFT_D6); \
-    if ( c & 0x80 ) xset_mask[c] |= (1 << (TFT_D7-MASK_OFFSET)); \
+    if ( c & 0x80 ) xset_mask[c] |= (1 << TFT_D7); \
-  }                                                              \
+  }                                                \
 
   // Mask for the 8 data bits to set pin directions
-  #define GPIO_DIR_MASK ((1 << (TFT_D0-MASK_OFFSET)) | (1 << (TFT_D1-MASK_OFFSET)) | (1 << (TFT_D2-MASK_OFFSET)) | (1 << (TFT_D3-MASK_OFFSET)) | (1 << (TFT_D4-MASK_OFFSET)) | (1 << (TFT_D5-MASK_OFFSET)) | (1 << (TFT_D6-MASK_OFFSET)) | (1 << (TFT_D7-MASK_OFFSET)))
+  #define dir_mask ((1 << TFT_D0) | (1 << TFT_D1) | (1 << TFT_D2) | (1 << TFT_D3) | (1 << TFT_D4) | (1 << TFT_D5) | (1 << TFT_D6) | (1 << TFT_D7))
 
   #if (TFT_WR >= 32)
-    #if (TFT_D0 >= 32)
+    // Data bits and the write line are cleared sequentially
-      // Data bits and the write line are cleared to 0 in one step (1.25x faster)
+    #define clr_mask (dir_mask); WR_L
-      #define GPIO_OUT_CLR_MASK (GPIO_DIR_MASK | (1 << (TFT_WR-32)))
-    #elif (TFT_D0 >= 0)
-      // Data bits and the write line are cleared sequentially
-      #define GPIO_OUT_CLR_MASK (GPIO_DIR_MASK); WR_L
-    #endif
   #elif (TFT_WR >= 0)
-    #if (TFT_D0 >= 32)
+    // Data bits and the write line are cleared to 0 in one step (1.25x faster)
-      // Data bits and the write line are cleared sequentially
+    #define clr_mask (dir_mask | (1 << TFT_WR))
-      #define GPIO_OUT_CLR_MASK (GPIO_DIR_MASK); WR_L
-    #elif (TFT_D0 >= 0)
-      // Data bits and the write line are cleared to 0 in one step (1.25x faster)
-      #define GPIO_OUT_CLR_MASK (GPIO_DIR_MASK | (1 << TFT_WR))
-    #endif
   #else
-    #define GPIO_OUT_CLR_MASK
+    #define clr_mask
   #endif
 
   // A lookup table is used to set the different bit patterns, this uses 1kByte of RAM
@@ -409,14 +381,14 @@ SPI3_HOST = 2
   //*/
 
   // Write 8 bits to TFT
-  #define tft_Write_8(C)  GPIO_CLR_REG =  GPIO_OUT_CLR_MASK; GPIO_SET_REG = set_mask((uint8_t)(C)); WR_H
+  #define tft_Write_8(C)  GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t)(C)); WR_H
 
   #if defined (SSD1963_DRIVER)
 
     // Write 18 bit color to TFT
-    #define tft_Write_16(C) GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) (((C) & 0xF800)>> 8)); WR_H; \
+    #define tft_Write_16(C) GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) (((C) & 0xF800)>> 8)); WR_H; \
-                            GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) (((C) & 0x07E0)>> 3)); WR_H; \
+                            GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) (((C) & 0x07E0)>> 3)); WR_H; \
-                            GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) (((C) & 0x001F)<< 3)); WR_H
+                            GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) (((C) & 0x001F)<< 3)); WR_H
 
     // 18 bit color write with swapped bytes
     #define tft_Write_16S(C) Cswap = ((C) >>8 | (C) << 8); tft_Write_16(Cswap)
@@ -425,37 +397,37 @@ SPI3_HOST = 2
 
     #ifdef PSEUDO_16_BIT
       // One write strobe for both bytes
-      #define tft_Write_16(C)  GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 0)); WR_H
+      #define tft_Write_16(C)  GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 0)); WR_H
-      #define tft_Write_16S(C) GPIO.out_w1tc = GPIO_OUT_CLR_MASK; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 8)); WR_H
+      #define tft_Write_16S(C) GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 8)); WR_H
     #else
       // Write 16 bits to TFT
-      #define tft_Write_16(C) GPIO_CLR_REG = GPIO_OUT_CLR_MASK; GPIO_SET_REG = set_mask((uint8_t) ((C) >> 8)); WR_H; \
+      #define tft_Write_16(C) GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 8)); WR_H; \
-                              GPIO_CLR_REG = GPIO_OUT_CLR_MASK; GPIO_SET_REG = set_mask((uint8_t) ((C) >> 0)); WR_H
+                              GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 0)); WR_H
 
       // 16 bit write with swapped bytes
-      #define tft_Write_16S(C) GPIO_CLR_REG = GPIO_OUT_CLR_MASK; GPIO_SET_REG = set_mask((uint8_t) ((C) >> 0)); WR_H; \
+      #define tft_Write_16S(C) GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 0)); WR_H; \
-                               GPIO_CLR_REG = GPIO_OUT_CLR_MASK; GPIO_SET_REG = set_mask((uint8_t) ((C) >> 8)); WR_H
+                               GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 8)); WR_H
     #endif
 
   #endif
 
   // Write 32 bits to TFT
-  #define tft_Write_32(C) GPIO_CLR_REG = GPIO_OUT_CLR_MASK; GPIO_SET_REG = set_mask((uint8_t) ((C) >> 24)); WR_H; \
+  #define tft_Write_32(C) GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 24)); WR_H; \
-                          GPIO_CLR_REG = GPIO_OUT_CLR_MASK; GPIO_SET_REG = set_mask((uint8_t) ((C) >> 16)); WR_H; \
+                          GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 16)); WR_H; \
-                          GPIO_CLR_REG = GPIO_OUT_CLR_MASK; GPIO_SET_REG = set_mask((uint8_t) ((C) >>  8)); WR_H; \
+                          GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >>  8)); WR_H; \
-                          GPIO_CLR_REG = GPIO_OUT_CLR_MASK; GPIO_SET_REG = set_mask((uint8_t) ((C) >>  0)); WR_H
+                          GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >>  0)); WR_H
 
   // Write two concatenated 16 bit values to TFT
-  #define tft_Write_32C(C,D) GPIO_CLR_REG = GPIO_OUT_CLR_MASK; GPIO_SET_REG = set_mask((uint8_t) ((C) >> 8)); WR_H; \
+  #define tft_Write_32C(C,D) GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 8)); WR_H; \
-                             GPIO_CLR_REG = GPIO_OUT_CLR_MASK; GPIO_SET_REG = set_mask((uint8_t) ((C) >> 0)); WR_H; \
+                             GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 0)); WR_H; \
-                             GPIO_CLR_REG = GPIO_OUT_CLR_MASK; GPIO_SET_REG = set_mask((uint8_t) ((D) >> 8)); WR_H; \
+                             GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((D) >> 8)); WR_H; \
-                             GPIO_CLR_REG = GPIO_OUT_CLR_MASK; GPIO_SET_REG = set_mask((uint8_t) ((D) >> 0)); WR_H
+                             GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((D) >> 0)); WR_H
 
   // Write 16 bit value twice to TFT - used by drawPixel()
-  #define tft_Write_32D(C) GPIO_CLR_REG = GPIO_OUT_CLR_MASK; GPIO_SET_REG = set_mask((uint8_t) ((C) >> 8)); WR_H; \
+  #define tft_Write_32D(C) GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 8)); WR_H; \
-                           GPIO_CLR_REG = GPIO_OUT_CLR_MASK; GPIO_SET_REG = set_mask((uint8_t) ((C) >> 0)); WR_H; \
+                           GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 0)); WR_H; \
-                           GPIO_CLR_REG = GPIO_OUT_CLR_MASK; GPIO_SET_REG = set_mask((uint8_t) ((C) >> 8)); WR_H; \
+                           GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 8)); WR_H; \
-                           GPIO_CLR_REG = GPIO_OUT_CLR_MASK; GPIO_SET_REG = set_mask((uint8_t) ((C) >> 0)); WR_H
+                           GPIO.out_w1tc = clr_mask; GPIO.out_w1ts = set_mask((uint8_t) ((C) >> 0)); WR_H
 
    // Read pin
   #ifdef TFT_RD

Processors/TFT_eSPI_ESP8266.h

@@ -19,7 +19,7 @@
 #define DMA_BUSY_CHECK // DMA not available, leave blank
 
 // Initialise processor specific SPI functions, used by init()
-#if (!defined (SUPPORT_TRANSACTIONS) && defined (ARDUINO_ARCH_ESP8266))
+#if (!defined (SUPPORT_TRANSACTIONS) && defined (ESP8266))
   #define INIT_TFT_DATA_BUS \
     spi.setBitOrder(MSBFIRST); \
     spi.setDataMode(TFT_SPI_MODE); \

Processors/TFT_eSPI_RP2040.c

@@ -29,15 +29,10 @@
       #include "pio_SPI.pio.h"
     #endif
   #elif defined (TFT_PARALLEL_8_BIT)
-    #if defined (SSD1963_DRIVER)
+    // SPI PIO code for 8 bit parallel interface (16 bit colour)
-      // PIO code for 8 bit parallel interface (18 bit colour)
+    #include "pio_8bit_parallel.pio.h"
-      #include "pio_8bit_parallel_18bpp.pio.h"
-    #else
-      // PIO code for 8 bit parallel interface (16 bit colour)
-      #include "pio_8bit_parallel.pio.h"
-    #endif
   #else // must be TFT_PARALLEL_16_BIT
-    // PIO code for 16 bit parallel interface (16 bit colour)
+    // SPI PIO code for 16 bit parallel interface (16 bit colour)
     #include "pio_16bit_parallel.pio.h"
   #endif
 
@@ -284,7 +279,7 @@ void pioinit(uint16_t clock_div, uint16_t fract_div) {
 // PIO handles pixel block fill writes
 void TFT_eSPI::pushBlock(uint16_t color, uint32_t len)
 {
-#if  defined (SPI_18BIT_DRIVER) || (defined (SSD1963_DRIVER) && defined (TFT_PARALLEL_8_BIT))
+#if  defined (SPI_18BIT_DRIVER)
   uint32_t col = ((color & 0xF800)<<8) | ((color & 0x07E0)<<5) | ((color & 0x001F)<<3);
   if (len) {
     WAIT_FOR_STALL;
@@ -332,7 +327,7 @@ void TFT_eSPI::pushBlock(uint16_t color, uint32_t len){
 ** Description:             Write a sequence of pixels
 ***************************************************************************************/
 void TFT_eSPI::pushPixels(const void* data_in, uint32_t len){
-#if  defined (SPI_18BIT_DRIVER) || (defined (SSD1963_DRIVER) && defined (TFT_PARALLEL_8_BIT))
+#if  defined (SPI_18BIT_DRIVER)
   uint16_t *data = (uint16_t*)data_in;
   if (_swapBytes) {
     while ( len-- ) {
@@ -582,7 +577,7 @@ void TFT_eSPI::pushPixels(const void* data_in, uint32_t len){
 
 
 ////////////////////////////////////////////////////////////////////////////////////////
-#ifdef RP2040_DMA // DMA functions for 16 bit SPI and 8/16 bit parallel displays
+#ifdef RP2040_DMA // DMA functions for 16 bit SPI and 8 bit parallel displays
 ////////////////////////////////////////////////////////////////////////////////////////
 /*
 These are created in header file:

Processors/TFT_eSPI_RP2040.h

@@ -65,20 +65,9 @@
   #define DMA_BUSY_CHECK
 #endif
 
-// Handle high performance MHS RPi display type
-#if  defined (MHS_DISPLAY_TYPE)  && !defined (RPI_DISPLAY_TYPE)
-  #define RPI_DISPLAY_TYPE
-#endif
-
 #if !defined (RP2040_PIO_INTERFACE) // SPI
-
+  // Initialise processor specific SPI functions, used by init()
-  #if  defined (MHS_DISPLAY_TYPE) // High speed RPi TFT type always needs 16 bit transfers
+  #define INIT_TFT_DATA_BUS  // Not used
-    // This swaps to 16 bit mode, used for commands so wait avoids clash with DC timing
-    #define INIT_TFT_DATA_BUS hw_write_masked(&spi_get_hw(SPI_X)->cr0, (16 - 1) << SPI_SSPCR0_DSS_LSB, SPI_SSPCR0_DSS_BITS)
-  #else
-    // Initialise processor specific SPI functions, used by init()
-    #define INIT_TFT_DATA_BUS  // Not used
-  #endif
 
   // Wait for tx to end, flush rx FIFO, clear rx overrun
   #define SPI_BUSY_CHECK while (spi_get_hw(SPI_X)->sr & SPI_SSPSR_BSY_BITS) {};     \
@@ -93,18 +82,9 @@
 
   // Different controllers have different minimum write cycle periods, so the PIO clock is changed accordingly
   // The PIO clock is a division of the CPU clock so scales when the processor is overclocked
-  // PIO write frequency = (CPU clock/(4 * RP2040_PIO_CLK_DIV))
+  // PIO write frequency = (CPU clock/(4 * DIV_UNITS))
-  // The write cycle periods below assume a 125MHz CPU clock speed
+  #if defined (TFT_PARALLEL_8_BIT) || defined (TFT_PARALLEL_16_BIT) || defined (RP2040_PIO_SPI)
-  #if defined (TFT_PARALLEL_8_BIT) || defined (TFT_PARALLEL_16_BIT)
+    #if defined (TFT_PARALLEL_16_BIT)
-    #if defined (RP2040_PIO_CLK_DIV)
-      #if (RP2040_PIO_CLK_DIV > 0)
-        #define DIV_UNITS RP2040_PIO_CLK_DIV
-        #define DIV_FRACT 0
-      #else
-        #define DIV_UNITS 3
-        #define DIV_FRACT 0
-      #endif
-    #elif defined (TFT_PARALLEL_16_BIT)
       // Different display drivers have different minimum write cycle times
       #if defined (HX8357C_DRIVER) || defined (SSD1963_DRIVER)
         #define DIV_UNITS 1 // 32ns write cycle time SSD1963, HX8357C (maybe HX8357D?)
@@ -114,9 +94,14 @@
         #define DIV_UNITS 3 // 96ns write cycle time
       #endif
       #define DIV_FRACT 0
-    #else // 8 bit parallel mode default 64ns write cycle time
+    #else // 8 bit parallel mode
-      #define DIV_UNITS 2
+      #ifdef ILI9481_DRIVER
-      #define DIV_FRACT 0 // Note: Fractional values done with clock period dithering
+        #define DIV_UNITS 1
+        #define DIV_FRACT 160 // Note: Fractional values done with clock period dithering
+      #else
+        #define DIV_UNITS 1
+        #define DIV_FRACT 0
+      #endif
     #endif
   #endif
 
@@ -152,7 +137,7 @@
   #if !defined (RP2040_PIO_INTERFACE)// SPI
     //#define DC_C sio_hw->gpio_clr = (1ul << TFT_DC)
     //#define DC_D sio_hw->gpio_set = (1ul << TFT_DC)
-    #if  defined (RPI_DISPLAY_TYPE) && !defined (MHS_DISPLAY_TYPE)
+    #if  defined (RPI_DISPLAY_TYPE)
       #define DC_C digitalWrite(TFT_DC, LOW);
       #define DC_D digitalWrite(TFT_DC, HIGH);
     #else
@@ -178,7 +163,7 @@
   #define CS_H // No macro allocated so it generates no code
 #else
   #if !defined (RP2040_PIO_INTERFACE) // SPI
-    #if  defined (RPI_DISPLAY_TYPE) && !defined (MHS_DISPLAY_TYPE)
+    #if  defined (RPI_DISPLAY_TYPE)
       #define CS_L digitalWrite(TFT_CS, LOW);
       #define CS_H digitalWrite(TFT_CS, HIGH);
     #else
@@ -298,28 +283,7 @@
   // Macros to write commands/pixel colour data to other displays
   ////////////////////////////////////////////////////////////////////////////////////////
   #else
-    #if  defined (MHS_DISPLAY_TYPE) // High speed RPi TFT type always needs 16 bit transfers
+    #if  defined (RPI_DISPLAY_TYPE) // RPi TFT type always needs 16 bit transfers
-      // This swaps to 16 bit mode, used for commands so wait avoids clash with DC timing
-      #define tft_Write_8(C)      while (spi_get_hw(SPI_X)->sr & SPI_SSPSR_BSY_BITS) {}; \
-                                  hw_write_masked(&spi_get_hw(SPI_X)->cr0, (16 - 1) << SPI_SSPCR0_DSS_LSB, SPI_SSPCR0_DSS_BITS); \
-                                  spi_get_hw(SPI_X)->dr = (uint32_t)((C) | ((C)<<8)); \
-                                  while (spi_get_hw(SPI_X)->sr & SPI_SSPSR_BSY_BITS) {}; \
-
-      // Note: the following macros do not wait for the end of transmission
-
-      #define tft_Write_16(C)     while (!spi_is_writable(SPI_X)){}; spi_get_hw(SPI_X)->dr = (uint32_t)(C)
-
-      #define tft_Write_16N(C)    while (!spi_is_writable(SPI_X)){}; spi_get_hw(SPI_X)->dr = (uint32_t)(C)
-
-      #define tft_Write_16S(C)    while (!spi_is_writable(SPI_X)){}; spi_get_hw(SPI_X)->dr = (uint32_t)(C)<<8 | (C)>>8
-
-      #define tft_Write_32(C)     spi_get_hw(SPI_X)->dr = (uint32_t)((C)>>16); spi_get_hw(SPI_X)->dr = (uint32_t)(C)
-
-      #define tft_Write_32C(C,D)  spi_get_hw(SPI_X)->dr = (uint32_t)(C); spi_get_hw(SPI_X)->dr = (uint32_t)(D)
-
-      #define tft_Write_32D(C)    spi_get_hw(SPI_X)->dr = (uint32_t)(C); spi_get_hw(SPI_X)->dr = (uint32_t)(C)
-
-    #elif  defined (RPI_DISPLAY_TYPE) // RPi TFT type always needs 16 bit transfers
       #define tft_Write_8(C)   spi.transfer(C); spi.transfer(C)
       #define tft_Write_16(C)  spi.transfer((uint8_t)((C)>>8));spi.transfer((uint8_t)((C)>>0))
       #define tft_Write_16N(C) spi.transfer((uint8_t)((C)>>8));spi.transfer((uint8_t)((C)>>0))
@@ -406,9 +370,9 @@
   #define TX_FIFO  tft_pio->txf[pio_sm]
 
   // Temporary - to be deleted
-  #define GPIO_DIR_MASK 0
+  #define dir_mask 0
 
-  #if  defined (SPI_18BIT_DRIVER)  || defined (SSD1963_DRIVER) // 18 bit colour (3 bytes)
+  #if  defined (SPI_18BIT_DRIVER) // SPI 18 bit colour
       // This writes 8 bits, then switches back to 16 bit mode automatically
       // Have already waited for pio stalled (last data write complete) when DC switched to command mode
       // The wait for stall allows DC to be changed immediately afterwards

Processors/TFT_eSPI_STM32.h

@@ -306,7 +306,7 @@
 #if defined (TFT_PARALLEL_8_BIT)
 
   // Mask for the 8 data bits to set pin directions (not used)
-  #define GPIO_DIR_MASK 0
+  #define dir_mask 0
 
   #define PARALLEL_INIT_TFT_DATA_BUS // None
 

Processors/pio_16bit_parallel.pio

@@ -0,0 +1,76 @@
+// Raspberry Pi Pico PIO program to output data to a TFT
+// controller via a 16 bit 8080 style data path.
+
+// Original sourced from:
+// https://github.com/zapta/pio_tft
+
+// Side set: 1 output pin, TFT_WR. Active low.
+// Data set: 16 consecutive output pins, TFT_D0 .. TFT_D15
+
+.program tft_io
+.side_set 1 opt ;  The TFT_WR output.
+
+// The C++ code switches between the different SM routines
+// by waiting for the SM to be idle and setting its PC.
+// The default SM routine is a 16 bit transfer
+
+// Do a block fill of N+1 pixels.
+public block_fill:
+   // Fetch colour value.
+   pull side 1
+   // Move colour to x.
+   mov x, osr
+   // Fetch pixel count N (sends N+1 pixels).
+   pull
+   // Move pixel count to y.
+   mov y, osr
+next:
+   // Copy colour value into osr, colour in LS 16 bits.
+   mov osr, x side 1
+   // Output colour 16 bits, unwanted top 16 bits shifted through.
+   out pins, 32 side 0 [1]
+   // Decrement pixel count and loop.
+   jmp y--, next side 1
+
+.wrap_target
+// Transmit an 8 bit value (LS 8 bits of 32 bits).
+public start_8:
+// Transmit a 16 bit value (LS 16 bits of 32 bits).
+public start_tx:
+   // Fetch the next 32 bit value from the TX FIFO and set TFT_WR high.
+   pull side 1
+   // Write the 16 bits and set WR low. This also
+   // shifts the unused top 16 bits through.
+   out pins, 32 side 0 [1]       
+   // Set WR high and jump back to start.
+   jmp start_tx side 1
+
+// Transmit a set window command sequence.
+public set_addr_window:
+   // Loop count in x (to send caset, paset and ramwr commands).
+   set x, 2 side 1
+pull_cmd:
+   // Set TFT_DC low.
+   set pins, 0
+   // Fetch caset, paset or ramwr.
+   pull
+   // Output LS byte (caset, paset or ramwr), discarding top 16 bits, set TFT_WR low.
+   out pins, 32 side 0
+   // Jump to end if 3rd cmd byte ramwr sent (x == 0)
+   jmp !x, end_set_addr
+   // pull next start and end coordinates, TFT_WR high.
+   pull side 1
+   // Set TFT_DC high.
+   set pins, 1
+send_xy:
+   // Output byte, TFT_WR low.
+   out pins, 8 side 0 [1]
+   // Loop until 4 bytes sent, TFT_WR high.
+   jmp !osre, send_xy side 1 [1]
+end_set_addr: // Jump here since delay needed before DC change
+   // Loop back for next command and write last command.
+   jmp x--, pull_cmd side 1
+   // Set DC high.
+   set pins, 1
+   // Auto-wrap back to start_tx.
+.wrap

Processors/pio_16bit_parallel.pio.h

@@ -1,6 +1,5 @@
 // -------------------------------------------------- //
 // This file is autogenerated by pioasm; do not edit! //
-// 16 bit parallel                                    //
 // -------------------------------------------------- //
 
 #pragma once
@@ -15,6 +14,7 @@
 
 #define tft_io_wrap_target 7
 #define tft_io_wrap 20
+
 #define tft_io_offset_block_fill 0u
 #define tft_io_offset_start_8 7u
 #define tft_io_offset_start_tx 7u

Processors/pio_8bit_parallel.pio

@@ -0,0 +1,92 @@
+// Raspberry Pi Pico PIO program to output data to a TFT
+// controller via a 8 bit 8080 style data path.
+
+// Original sourced from:
+// https://github.com/zapta/pio_tft
+
+// Side set: 1 output pin, TFT_WR. Active low.
+// Data set: 8 consecutive output pins, TFT_D0 .. TFT_D7
+
+.program tft_io
+.side_set 1 opt ;  The TFT_WR output.
+
+// The C++ code switches between the different SM routines
+// by waiting for the SM to be idle and setting its PC.
+// The default SM routine is a 16 bit transfer
+
+// Do a block fill of N+1 pixels.
+public block_fill:
+   // Fetch colour value.
+   pull side 1
+   // Move colour to x.
+   mov x, osr
+   // Fetch pixel count N (sends N+1 pixels).
+   pull
+   // Move pixel count to y.
+   mov y, osr
+next:
+   // Copy colour value into osr, colour in LS 16 bits.
+   mov osr, x side 1
+   // Output colour 8 MS bits, unwanted top 16 bits shifted through.
+   out pins, 24 side 0 [1]
+   // Write first colour byte.
+   nop side 1 [1]
+   // Write second colour byte.
+   out pins, 8 side 0 [1]
+   // Decrement pixel count and loop.
+   jmp y--, next side 1
+
+.wrap_target
+// Transmit a 16 bit value (LS 16 bits of 32 bits).
+public start_tx:
+   // Fetch the next 32 bit value from the TX FIFO and set TFT_WR high.
+   pull side 1
+   // Write the first byte (MSB) and set WR low. This also
+   // shifts the unused top 16 bits through.
+   out pins, 24 side 0 [1]       
+   // Set WR high and delay to next byte.
+   nop side 1 [1]
+   // Output the second byte and set TFT_WRITE low.
+   out pins, 8 side 0 [1]
+   // Set WR high and jump back to start.
+   jmp start_tx side 1
+
+// Transmit an 8 bit value (LS 8 bits of 32 bits).
+public start_8:
+   // Fetch the next 32 bit value from the TX FIFO and set TFT_WR high.
+   pull side 1
+   // Write the first byte (LSB) and sets WR low. This also 
+   // shifts the unused top 24 bits through.
+   out pins, 32 side 0 [1]     
+   // Jump to start
+   jmp start_tx side 1
+
+// Transmit a set window command sequence.
+public set_addr_window:
+   // Loop count in x (to send caset, paset and ramwr commands).
+   set x, 2 side 1
+pull_cmd:
+   // Set TFT_DC low.
+   set pins, 0
+   // Fetch caset, paset or ramwr.
+   pull
+   // Output LS byte (caset, paset or ramwr), discarding top 24 bits, set TFT_WR low.
+   out pins, 32 side 0
+   // Jump to end if 3rd cmd byte ramwr sent (x == 0)
+   jmp !x, end_set_addr
+   // pull next start and end coordinates, TFT_WR high.
+   pull side 1
+   // Set TFT_DC high.
+   set pins, 1
+send_xy:
+   // Output byte, TFT_WR low.
+   out pins, 8 side 0 [1]
+   // Loop until 4 bytes sent, TFT_WR high.
+   jmp !osre, send_xy side 1 [1]
+end_set_addr:
+   // Loop back for next command and write last command.
+   jmp x--, pull_cmd side 1
+   // Set DC high.
+   set pins, 1
+   // Auto-wrap back to start_tx.
+.wrap

Processors/pio_8bit_parallel.pio.h

@@ -1,6 +1,5 @@
 // -------------------------------------------------- //
 // This file is autogenerated by pioasm; do not edit! //
-// 8 bit parallel                                     //
 // -------------------------------------------------- //
 
 #pragma once

Processors/pio_8bit_parallel_18bpp.pio.h

@@ -1,73 +0,0 @@
-// -------------------------------------------------- //
-// This file is autogenerated by pioasm; do not edit! //
-// -------------------------------------------------- //
-
-#pragma once
-
-#if !PICO_NO_HARDWARE
-#include "hardware/pio.h"
-#endif
-
-// ------ //
-// tft_io //
-// ------ //
-
-#define tft_io_wrap_target 11
-#define tft_io_wrap 31
-
-#define tft_io_offset_block_fill 0u
-#define tft_io_offset_start_tx 11u
-#define tft_io_offset_start_8 18u
-#define tft_io_offset_set_addr_window 21u
-
-static const uint16_t tft_io_program_instructions[] = {
-    0x98a0, //  0: pull   block           side 1     
-    0xa027, //  1: mov    x, osr                     
-    0x80a0, //  2: pull   block                      
-    0xa047, //  3: mov    y, osr                     
-    0xb8e1, //  4: mov    osr, x          side 1     
-    0x7110, //  5: out    pins, 16        side 0 [1] 
-    0xb942, //  6: nop                    side 1 [1] 
-    0x7108, //  7: out    pins, 8         side 0 [1] 
-    0xb942, //  8: nop                    side 1 [1] 
-    0x7108, //  9: out    pins, 8         side 0 [1] 
-    0x1884, // 10: jmp    y--, 4          side 1     
-            //     .wrap_target
-    0x98a0, // 11: pull   block           side 1     
-    0x7110, // 12: out    pins, 16        side 0 [1] 
-    0xb942, // 13: nop                    side 1 [1] 
-    0x7108, // 14: out    pins, 8         side 0 [1] 
-    0xb942, // 15: nop                    side 1 [1] 
-    0x7108, // 16: out    pins, 8         side 0 [1] 
-    0x180b, // 17: jmp    11              side 1     
-    0x98a0, // 18: pull   block           side 1     
-    0x7100, // 19: out    pins, 32        side 0 [1] 
-    0x180b, // 20: jmp    11              side 1     
-    0xf822, // 21: set    x, 2            side 1     
-    0xe000, // 22: set    pins, 0                    
-    0x80a0, // 23: pull   block                      
-    0x7000, // 24: out    pins, 32        side 0     
-    0x003e, // 25: jmp    !x, 30                     
-    0x98a0, // 26: pull   block           side 1     
-    0xe001, // 27: set    pins, 1                    
-    0x7108, // 28: out    pins, 8         side 0 [1] 
-    0x19fc, // 29: jmp    !osre, 28       side 1 [1] 
-    0x1856, // 30: jmp    x--, 22         side 1     
-    0xe001, // 31: set    pins, 1                    
-            //     .wrap
-};
-
-#if !PICO_NO_HARDWARE
-static const struct pio_program tft_io_program = {
-    .instructions = tft_io_program_instructions,
-    .length = 32,
-    .origin = -1,
-};
-
-static inline pio_sm_config tft_io_program_get_default_config(uint offset) {
-    pio_sm_config c = pio_get_default_sm_config();
-    sm_config_set_wrap(&c, offset + tft_io_wrap_target, offset + tft_io_wrap);
-    sm_config_set_sideset(&c, 2, true, false);
-    return c;
-}
-#endif

Processors/pio_SPI.pio

@@ -0,0 +1,89 @@
+// Raspberry Pi Pico PIO program to output data to a TFT
+// controller via a SPI output data path.
+
+//"Set" set: 1 output pin, TFT_DC
+// Side set: 1 output pin, TFT_SCLK
+// Data set: 1 output pin, TFT_MOSI
+
+.program tft_io
+.side_set 1 opt ;  The TFT_SCLK output.
+
+// The C++ code switches between the 8 bits and 16 bits loops
+// by waiting for the SM to be idle and setting its PC.
+//
+
+// 8 bit transfer
+public start_8:
+   // Pull the next 32 bit value from the TX FIFO. 
+   pull side 0
+   // Lose the top 24 bits, send 1st bit
+   out pins, 25
+   // Now send remaining bits
+   jmp spi_out side 1
+
+public set_addr_window:
+   // Loop count in x for caset, paset and ramwr
+   set x, 2 side 0
+pull_cmd:
+   // Set DC low
+   set pins, 0
+   // Fetch and output LS byte (caset, paset or ramwr), discarding top 24 bits, set WR low
+   pull side 0
+   out pins, 25
+   nop side 1
+next_cmd_bit:
+   out pins, 1 side 0
+   jmp !osre, next_cmd_bit side 1
+   // Set DC high
+   set pins, 1 side 0
+   // Finish if 3rd cmd byte ramwr sent (x == 0)
+   jmp !x, start_tx
+   pull
+next_xy:
+   // send 32 bit start and end coordinates
+   out pins, 1 side 0
+   jmp !osre, next_xy side 1
+   // Loop back for next command
+   jmp x--, pull_cmd side 0
+   // End
+   jmp start_tx
+
+public block_fill:
+   // Fetch colour value
+   pull side 0
+   // Move colour to x
+   mov x, osr
+   // Fetch pixel count
+   pull
+   // Move pixel count to y
+   mov y, osr
+next_16:
+   // Copy colour value back into osr
+   mov osr, x side 0
+   // Lose the top 16 bits, send 1st bit
+   out pins, 17 side 0
+   nop side 1
+next_bit:
+   // Output next 15 colour bits
+   out pins, 1 side 0
+   // Set TFT_SCLK high and jump for next bit
+   jmp !osre, next_bit side 1
+   // Decrement count and loop
+   jmp y--, next_16 side 0
+   // Now drop back to 16 bit output
+
+.wrap_target
+public start_tx:
+   // Pull the next 32 bit value from the TX FIFO. 
+   // Send the bottom 16 bits
+   pull side 0
+   // Drop the first 16 bits, write first bit
+   out pins, 17 side 0
+   nop side 1
+spi_out:
+   // Output the next 15 bits
+   out pins, 1 side 0
+   // Set TFT_SCLK high and jump for next bit
+   jmp !osre, spi_out side 1
+   // Return to start
+.wrap

Processors/pio_SPI.pio.h

@@ -1,6 +1,5 @@
 // -------------------------------------------------- //
 // This file is autogenerated by pioasm; do not edit! //
-// 8 + 16 bit SPI - no auto colour conversion         //
 // -------------------------------------------------- //
 
 #pragma once

Processors/pio_SPI_18bit.pio

@@ -0,0 +1,89 @@
+// Raspberry Pi Pico PIO program to output 18 bit data to a TFT
+// controller via a SPI output data path.
+
+//"Set" set: 1 output pin, TFT_DC
+// Side set: 1 output pin, TFT_SCLK
+// Data set: 1 output pin, TFT_MOSI
+
+.program tft_io
+.side_set 1 opt ;  The TFT_SCLK output.
+
+// The C++ code switches between the 8 bits and 16 bits loops
+// by waiting for the SM to be idle and setting its PC.
+//
+
+// 8 bit transfer
+public start_8:
+   // Pull the next 32 bit value from the TX FIFO. 
+   pull side 0
+   // Lose the top 24 bits, send 1st bit
+   out pins, 25
+   // Now send remaining bits
+   jmp spi_out side 1
+
+public set_addr_window:
+   // Loop count in x for caset, paset and ramwr
+   set x, 2 side 0
+pull_cmd:
+   // Set DC low
+   set pins, 0
+   // Fetch and output LS byte (caset, paset or ramwr), discarding top 24 bits, set WR low
+   pull side 0
+   out pins, 25
+   nop side 1
+next_cmd_bit:
+   out pins, 1 side 0
+   jmp !osre, next_cmd_bit side 1
+   // Set DC high
+   set pins, 1 side 0
+   // Finish if 3rd cmd byte ramwr sent (x == 0)
+   jmp !x, start_tx
+   pull
+next_xy:
+   // send 32 bit start and end coordinates
+   out pins, 1 side 0
+   jmp !osre, next_xy side 1
+   // Loop back for next command
+   jmp x--, pull_cmd side 0
+   // End
+   jmp start_tx
+
+public block_fill:
+   // Fetch colour value
+   pull side 0
+   // Move colour to x
+   mov x, osr
+   // Fetch pixel count
+   pull
+   // Move pixel count to y
+   mov y, osr
+next_16:
+   // Copy colour value back into osr
+   mov osr, x side 0
+   // Lose the top 8 bits, send 1st bit
+   out pins, 9 side 0
+   nop side 1
+next_bit:
+   // Output next remaining bits
+   out pins, 1 side 0
+   // Set TFT_SCLK high and jump for next bit
+   jmp !osre, next_bit side 1
+   // Decrement count and loop
+   jmp y--, next_16 side 0
+   // Now drop back to 16 bit output
+
+.wrap_target
+public start_tx:
+   // Pull the next 32 bit value from the TX FIFO. 
+   // Send the bottom 24 bits
+   pull side 0
+   // Drop the first 8 bits, write first bit
+   out pins, 9 side 0
+   nop side 1
+spi_out:
+   // Output the remaining bits
+   out pins, 1 side 0
+   // Set TFT_SCLK high and jump for next bit
+   jmp !osre, spi_out side 1
+   // Return to start
+.wrap

Processors/pio_SPI_18bit.pio.h

@@ -1,6 +1,5 @@
 // -------------------------------------------------- //
 // This file is autogenerated by pioasm; do not edit! //
-// 8 + 18 bit SPI - no auto colour conversion         //
 // -------------------------------------------------- //
 
 #pragma once

README.md

@@ -1,24 +1,10 @@
 A ["Discussions"](https://github.com/Bodmer/TFT_eSPI/discussions) facility has been added for Q&A etc. Use the ["Issues"](https://github.com/Bodmer/TFT_eSPI/issues) tab only for problems with the library. Thanks!
 # News
-1. New functions have been added to draw smooth (antialiased) arcs, circles, and rounded rectangle outlines. New sketches are provided in the "Smooth Graphics" examples folder. Arcs can be drawn with or without anti-aliasing (which will then render faster). The arc ends can be straight or rounded. The arc drawing algorithm uses an optimised fixed point sqrt() function to improve performance on processors that do not have a hardware Floating Point Unit (e.g. RP2040). Here are two demo images, on the left smooth (anti-aliased) arcs with rounded ends, the image to the right is the same resolution (grabbed from the same 240x240 TFT) with the smoothing diasbled (no anti-aliasing):
+1. Support has been added in v2.4.70 for the RP2040 with 16 bit parallel displays. This has been tested and the screen update performance is very good (4ms to clear 320 x 480 screen with HC8357C). The use of the RP2040 PIO makes it easy to change the write cycle timing for different displays. DMA with 16 bit transfers is also supported.
 
-      ![arcs](https://github.com/Bodmer/Github-images/blob/main/aa_arc_240x240.png)  ![pixelated_arcs](https://github.com/Bodmer/Github-images/blob/main/no_aa_arc_240x240.png)
+2. Support for HX8357B and HX8357C screens has been added (only tested with RP2040 and 16 bit parallel interface)
 
-      Here the smooth arcs have been used to create anti-aliased meter gauges on a 320x240 TFT:
+3. Support for the ESP32-S2, ESP32-S3 and ESP32-C3 has been added (DMA not supported at the moment). Tested with v2.0.3 RC1 of the ESP32 board package. Example setups:
- 
-      ![arcs](https://github.com/Bodmer/Github-images/blob/main/xarc_meters_320x240.png)
-
-2. An excellent new compatible library is available which can render TrueType fonts on a TFT screen (or into a sprite). This has been developed by [takkaO](https://github.com/takkaO/OpenFontRender), I have created a branch with some bug fixes [here](https://github.com/Bodmer/OpenFontRender). The library provides access to compact font files, with fully scaleable anti-aliased glyphs. Left, middle and right justified text can also be printed to the screen. I have added TFT_eSPI specific examples to the OpenFontRender library and tested on RP2040 and ESP32 processors, the ESP8266 does not have sufficient RAM due to the glyph render complexity. Here is a demo screen where a single 12kbyte font file binary was used to render fully anti-aliased glyphs of gradually increasing size on a 320x480 TFT screen:
-
-      ![ttf_font_demo](https://i.imgur.com/bKkilIb.png)
-
-3. New GUI examples have been added for sliders, buttons, graphs and meters. These examples require a new support library here:
-
-   [TFT_eWidget](https://github.com/Bodmer/TFT_eWidget)
-
-4. Support has been added in v2.4.70 for the RP2040 with 16 bit parallel displays. This has been tested and the screen update performance is very good (4ms to clear 320 x 480 screen with HC8357C). The use of the RP2040 PIO makes it easy to change the write cycle timing for different displays. DMA with 16 bit transfers is also supported.
-
-5. Support for the ESP32-S2, ESP32-S3 and ESP32-C3 has been added (DMA only on ESP32 S3 at the moment). Tested with v2.0.3 RC1 of the ESP32 board package. Example setups:
 
       [Setup70_ESP32_S2_ILI9341.h](https://github.com/Bodmer/TFT_eSPI/blob/master/User_Setups/Setup70_ESP32_S2_ILI9341.h)
       
@@ -28,20 +14,20 @@ A ["Discussions"](https://github.com/Bodmer/TFT_eSPI/discussions) facility has b
 
       [Setup70d_ILI9488_S3_Parallel.h](https://github.com/Bodmer/TFT_eSPI/blob/master/User_Setups/Setup70d_ILI9488_S3_Parallel.h)
 
-6. Smooth fonts can now be rendered direct to the TFT with very little flicker for quickly changing values. This is achieved by a line-by-line and block-by-block update of the glyph area without drawing pixels twice. This is a "breaking" change for some sketches because a new true/false parameter is needed to render the background. The default is false if the parameter is missing, Examples:
+4. Smooth fonts can now be rendered direct to the TFT with very little flicker for quickly changing values. This is achieved by a line-by-line and block-by-block update of the glyph area without drawing pixels twice. This is a "breaking" change for some sketches because a new true/false parameter is needed to render the background. The default is false if the parameter is missing, Examples:
 
       tft.setTextColor(TFT_WHITE, TFT_BLUE, true);
       spr.setTextColor(TFT_BLUE, TFT_BLACK, true);
 
 Note: background rendering for Smooth fonts is also now available when using the print stream e.g. with: tft.println("Hello World");
 
-7. New anti-aliased graphics functions to draw lines, wedge shaped lines, circles and rounded rectangles. [Examples are included](https://github.com/Bodmer/TFT_eSPI/tree/master/examples/Smooth%20Graphics). Examples have also been added to [display PNG compressed images](https://github.com/Bodmer/TFT_eSPI/tree/master/examples/PNG%20Images) (note: requires ~40kbytes RAM).
+5. New anti-aliased graphics functions to draw lines, wedge shaped lines, circles and rounded rectangles. [Examples are included](https://github.com/Bodmer/TFT_eSPI/tree/master/examples/Smooth%20Graphics). Examples have also been added to [display PNG compressed images](https://github.com/Bodmer/TFT_eSPI/tree/master/examples/PNG%20Images) (note: requires ~40kbytes RAM).
 
-8. Frank Boesing has created an extension library for TFT_eSPI that allows a large range of ready-built fonts to be used. Frank's library (adapted to permit rendering in sprites as well as TFT) can be [downloaded here](https://github.com/Bodmer/TFT_eSPI_ext). More than 3300 additional Fonts are [available here](https://github.com/FrankBoesing/fonts/tree/master/ofl). The TFT_eSPI_ext library contains examples that demonstrate the use of the fonts.
+6. Frank Boesing has created an extension library for TFT_eSPI that allows a large range of ready-built fonts to be used. Frank's library (adapted to permit rendering in sprites as well as TFT) can be [downloaded here](https://github.com/Bodmer/TFT_eSPI_ext). More than 3300 additional Fonts are [available here](https://github.com/FrankBoesing/fonts/tree/master/ofl). The TFT_eSPI_ext library contains examples that demonstrate the use of the fonts.
 
-9. Users of PowerPoint experienced with running macros may be interested in the [pptm sketch generator here](https://github.com/Bodmer/PowerPoint_to_sketch), this converts graphics and tables drawn in PowerPoint slides into an Arduino sketch that renders the graphics on a 480x320 TFT. This is based on VB macros [created by Kris Kasprzak here](https://github.com/KrisKasprzak/Powerpoint-ILI9341_t3).
+7. Users of PowerPoint experienced with running macros may be interested in the [pptm sketch generator here](https://github.com/Bodmer/PowerPoint_to_sketch), this converts graphics and tables drawn in PowerPoint slides into an Arduino sketch that renders the graphics on a 480x320 TFT. This is based on VB macros [created by Kris Kasprzak here](https://github.com/KrisKasprzak/Powerpoint-ILI9341_t3).
 
-10. The library contains two new functions for rectangles filled with a horizontal or vertical coloured gradient:
+8. The library contains two new functions for rectangles filled with a horizontal or vertical coloured gradient:
 
       tft.fillRectHGradient(x, y, w, h, color1, color2);
   
@@ -49,28 +35,34 @@ Note: background rendering for Smooth fonts is also now available when using the
       
       ![Gradient](https://i.imgur.com/atR0DmP.png)
 
-11. The RP2040 8 bit parallel interface uses the PIO. The PIO now manages the "setWindow" and "block fill" actions, releasing the processor for other tasks when areas of the screen are being filled with a colour. The PIO can optionally be used for SPI interface displays if #define RP2040_PIO_SPI is put in the setup file. Touch screens and pixel read operations are not supported when the PIO interface is used.
+9. The RP2040 8 bit parallel interface uses the PIO. The PIO now manages the "setWindow" and "block fill" actions, releasing the processor for other tasks when areas of the screen are being filled with a colour. The PIO can optionally be used for SPI interface displays if #define RP2040_PIO_SPI is put in the setup file. Touch screens and pixel read operations are not supported when the PIO interface is used.
 The RP2040 PIO features only work with [Earle Philhower's board package](https://github.com/earlephilhower/arduino-pico), NOT the Arduino Mbed version.
 
 The use of PIO for SPI allows the RP2040 to be over-clocked (up to 250MHz works on my boards) in Earle's board package whilst still maintaining high SPI clock rates.
 
-12. DMA can now be used with the Raspberry Pi Pico (RP2040) when used with 8/16 bit parallel and 16 bit colour SPI displays. See "Bouncy_Circles" sketch.
+10. DMA can now be used with the Raspberry Pi Pico (RP2040) when used with both 8 bit parallel and 16 bit colour SPI displays. See "Bouncy_Circles" sketch.
 
       ["Bouncing circles"](https://www.youtube.com/watch?v=njFXIzCTQ_Q&lc=UgymaUIwOIuihvYh-Qt4AaABAg)
 
+11. The library now supports the Raspberry Pi Pico with both the [official Arduino board package](https://github.com/arduino/ArduinoCore-mbed) and the one provided by [Earle Philhower](https://github.com/earlephilhower/arduino-pico). The setup file "Setup60_RP2040_ILI9341.h" has been used for tests with an ILI9341 display. At the moment only SPI interface displays have been tested. SPI port 0 is the default but SPI port 1 can be specifed in the setup file if those SPI pins are used.
+
+      ["Rotating cube demo"](https://www.youtube.com/watch?v=4fPxEN9ImVE)
+
+12. The library now provides a "viewport" capability. See "Viewport_Demo" and "Viewport_graphicstest" examples. When a viewport is defined graphics will only appear within that window.  The coordinate datum by default moves to the top left corner of the viewport, but can optionally remain at top left corner of TFT. The GUIslice library will make use of this feature to speed up the rendering of GUI objects ([see #769](https://github.com/Bodmer/TFT_eSPI/issues/769)).
+
 
 # TFT_eSPI
 
-An Arduino IDE compatible graphics and fonts library for 32 bit processors. The library is targeted at 32 bit processors, it  has been performance optimised for RP2040, STM32, ESP8266 and ESP32 types, other processors may be used but will use the slower generic Arduino interface calls. The library can be loaded using the Arduino IDE's Library Manager. Direct Memory Access (DMA) can be used with the ESP32, RP2040 and STM32 processors with SPI interface displays to improve rendering performance. DMA with a parallel interface (8 and 16 bit parallel) is only supported with the RP2040.
+An Arduino IDE compatible graphics and fonts library for 32 bit processors. The library is targeted at 32 bit processors, it  has been performance optimised for STM32, ESP8266 and ESP32 types. The library can be loaded using the Arduino IDE's Library Manager. Direct Memory Access (DMA) can be used with the ESP32, RP2040 and STM32 processors with SPI interface displays to improve rendering performance. DMA with a parallel interface is only supported with the RP2040.
 
-Optimised drivers have been tested with the following processors:
+Optimised drivers are incorporated for the following processors:
 
 * RP2040, e.g. Raspberry Pi Pico
 * ESP32 and ESP32-S2, ESP32-C3, ESP32-S3
 * ESP8266
 * STM32F1xx, STM32F2xx, STM32F4xx, STM32F767 (higher RAM processors recommended)
 
-For other processors only SPI interface displays are supported and the slower Arduino SPI library functions are used by the library. Higher clock speed processors such as used for the Teensy 3.x and 4.x boards will still provide a very good performance with the generic Arduino SPI functions.
+Generic (non-optimised Arduino function calls) are used by the library for other processors.
 
 "Four wire" SPI and 8 bit parallel interfaces are supported. Due to lack of GPIO pins the 8 bit parallel interface is NOT supported on the ESP8266. 8 bit parallel interface TFTs  (e.g. UNO format mcufriend shields) can used with the STM32 Nucleo 64/144 range or the UNO format ESP32 (see below for ESP32).
 
@@ -99,9 +91,9 @@ Displays using the following controllers are supported:
 
 ILI9341 and ST7796 SPI based displays are recommended as starting point for experimenting with this library.
 
-The library supports some TFT displays designed for the Raspberry Pi (RPi) that are based on a ILI9486 or ST7796 driver chip with a 480 x 320 pixel screen. The ILI9486 RPi display must be of the Waveshare design and use a 16 bit serial interface based on the 74HC04, 74HC4040 and 2 x 74HC4094 logic chips. Note that due to design variations between these displays not all RPi displays will work with this library, so purchasing a RPi display of these types solely for use with this library is NOT recommended.
+The library supports some TFT displays designed for the Raspberry Pi (RPi) that are based on a ILI9486 or ST7796 driver chip with a 480 x 320 pixel screen. The ILI9486 RPi display must be of the Waveshare design and use a 16 bit serial interface based on the 74HC04, 74HC4040 and 2 x 74HC4094 logic chips. Note that due to design variations between these displays not all RPi displays will work with this library, so purchasing a RPi display of these types solely for use with this library is not recommended.
 
-A "good" RPi display is the [MHS-4.0 inch Display-B type ST7796](http://www.lcdwiki.com/MHS-4.0inch_Display-B) which provides good performance. This has a dedicated controller and can be clocked at up to 80MHz with the ESP32 (125MHz with overclocked RP2040, 55MHz with STM32 and 40MHz with ESP8266). The [MHS-3.5 inch RPi ILI9486](http://www.lcdwiki.com/MHS-3.5inch_RPi_Display) based display is also supported, however the MHS ILI9341 based display of the same type does NOT work with this library.
+A "good" RPi display is the [MHS-4.0 inch Display-B type ST7796](http://www.lcdwiki.com/MHS-4.0inch_Display-B) which provides good performance. This has a dedicated controller and can be clocked at up to 80MHz with the ESP32 (55MHz with STM32 and 40MHz with ESP8266). The [MHS-3.5 inch RPi ILI9486](http://www.lcdwiki.com/MHS-3.5inch_RPi_Display) based display is also supported.
 
 Some displays permit the internal TFT screen RAM to be read, a few of the examples use this feature. The TFT_Screen_Capture example allows full screens to be captured and sent to a PC, this is handy to create program documentation.
 
@@ -207,3 +199,10 @@ You can take this one step further and have your own setup select file and then
 #include <../TFT_eSPI_Setups/my_setup_select.h>
 ```
 To select a new setup you then edit your own my_setup_select.h file (which will not get overwritten during an upgrade).
+
+# ePaper displays
+
+The library was intended to support only TFT displays but using a Sprite as a 1 bit per pixel screen buffer permits support for the Waveshare 2 and 3 colour SPI ePaper displays. This addition to the library is experimental and only one example is provided. Further examples will be added.
+
+![Example](https://i.imgur.com/L2tV129.jpg?1)
+

README.txt

@@ -1,7 +1,7 @@
 This is a stand-alone library that contains both graphics functions
-and the TFT chip driver library. It supports the ESP8266, ESP32,
+and the TFT chip driver library. It supports the ESP8266, ESP32 and
-STM32 and RP2040 processors with performance optimised code. Other
+STM32 processors with performance optimised code. Other Arduino IDE
-Arduino IDE compatible boards are also supported but the library
+compatible boards are also supported but the library then uses
-then uses generic functions which will be slower. The library uses
+generic functions which will be slower. The library uses 32 bit
-32 bit variables extensively so this will affect performance on 8
+variables extensively so this will affect performance on 8 and 16
-and 16 bit processors.
+bit processors.

TFT_Drivers/ILI9486_Init.h

@@ -21,14 +21,8 @@
       writedata(0x66);           // 18 bit colour interface
     #endif
 
-    writecommand(0xC0); //                          1100.0000 Power Control 1
+    writecommand(0xC2);
-    writedata(0x0E);    //                          0001.0111   ... VRH1
+    writedata(0x44);
-    writedata(0x0E);    //                          0001.0101   ... VRH2
-    writecommand(0xC1); //                          1100.0001 Power Control 2
-    writedata(0x41);    //                          0100.0001   . SAP BT
-    writedata(0x00);    //                          0000.0000   ..... VC
-    writecommand(0xC2); //                          1100.0010 Power Control 3
-    writedata(0x55);    //     nb. was 0x44         0101.0101   . DCA1 . DCA0
 
     writecommand(0xC5);
     writedata(0x00);

TFT_Drivers/ST7735_Defines.h

@@ -17,7 +17,6 @@
 #define INITR_GREENTAB128    0x5 // Use if you only get part of 128x128 screen in rotation 0 & 1
 #define INITR_GREENTAB160x80 0x6 // Use if you only get part of 128x128 screen in rotation 0 & 1
 #define INITR_REDTAB160x80   0x7 // Added for https://www.aliexpress.com/item/ShengYang-1pcs-IPS-0-96-inch-7P-SPI-HD-65K-Full-Color-OLED-Module-ST7735-Drive/32918394604.html
-#define INITR_ROBOTLCD       0x8
 #define INITB                0xB
 
 
@@ -45,10 +44,6 @@
   #define TAB_COLOUR INITR_GREENTAB160x80
   #define CGRAM_OFFSET
 
-#elif defined (ST7735_ROBOTLCD)
-  #define TAB_COLOUR INITR_ROBOTLCD
-  #define CGRAM_OFFSET
-
 #elif defined (ST7735_REDTAB160x80)
   #define TAB_COLOUR INITR_REDTAB160x80
   #define CGRAM_OFFSET
@@ -112,7 +107,7 @@
 #define TFT_MAD_RGB 0x00
 
 #ifndef TFT_RGB_ORDER
-  #if defined(ST7735_BLACKTAB) || defined(ST7735_GREENTAB2) || defined(ST7735_INITB)
+  #if defined(INITR_BLACKTAB) || defined(INITR_GREENTAB2) || defined(INITB)
     #define TFT_MAD_COLOR_ORDER TFT_MAD_RGB
   #else
     #define TFT_MAD_COLOR_ORDER TFT_MAD_BGR

TFT_Drivers/ST7735_Init.h

@@ -123,17 +123,6 @@
       0x00, 0x00,             //     XSTART = 0
       0x00, 0x9F },           //     XEND = 159
 
-  // Frame control init for RobotLCD, taken from https://github.com/arduino-libraries/TFT, Adafruit_ST7735.cpp l. 263, commit 61b8a7e
-  Rcmd3RobotLCD[] = {
-      3,
-      ST7735_FRMCTR1, 2    ,  //  1: Frame rate ctrl - normal mode, 2 args
-        0x0B, 0x14,
-      ST7735_FRMCTR2, 2    ,  //  2: Frame rate ctrl - idle mode, 2 args
-        0x0B, 0x14,
-      ST7735_FRMCTR3, 4    ,  //  3: Frame rate ctrl - partial mode, 4 args
-        0x0B, 0x14,
-        0x0B, 0x14 },
-
   Rcmd3[] = {                 // Init for 7735R, part 3 (red or green tab)
     4,                        //  4 commands in list:
     ST7735_GMCTRP1, 16      , //  1: 16 args, no delay:
@@ -192,11 +181,6 @@
          colstart = 26;
          rowstart = 1;
        }
-       else if (tabcolor == INITR_ROBOTLCD)
-       {
-         commandList(Rcmd2green);
-         commandList(Rcmd3RobotLCD);
-       }
        else if (tabcolor == INITR_REDTAB160x80)
        {
          commandList(Rcmd2green);

TFT_Drivers/ST7789_2_Defines.h

@@ -34,12 +34,6 @@
   #endif
 #endif
 
-#if (TFT_HEIGHT == 320) && (TFT_WIDTH == 170)
-  #ifndef CGRAM_OFFSET
-    #define CGRAM_OFFSET
-  #endif
-#endif
-
 #if (TFT_HEIGHT == 300) && (TFT_WIDTH == 240)
   #ifndef CGRAM_OFFSET
     #define CGRAM_OFFSET

TFT_Drivers/ST7789_2_Rotation.h

@@ -138,3 +138,143 @@
       _height = _init_width;
       break;
   }
+  // This is the command sequence that rotates the ST7789 driver coordinate frame
+
+  writecommand(TFT_MADCTL);
+  rotation = m % 4;
+  switch (rotation) {
+    case 0: // Portrait
+#ifdef CGRAM_OFFSET
+      if (_init_width == 135)
+      {
+        colstart = 52;
+        rowstart = 40;
+      }
+      else if(_init_height == 280)
+      {
+        colstart = 0;
+        rowstart = 20;
+      }
+      else if(_init_width == 172)
+      {
+        colstart = 34;
+        rowstart = 0;
+      }
+      else if(_init_width == 170)
+      {
+        colstart = 35;
+        rowstart = 0;
+      }
+      else
+      {
+        colstart = 0;
+        rowstart = 0;
+      }
+#endif
+      writedata(TFT_MAD_COLOR_ORDER);
+
+      _width  = _init_width;
+      _height = _init_height;
+      break;
+
+    case 1: // Landscape (Portrait + 90)
+#ifdef CGRAM_OFFSET
+      if (_init_width == 135)
+      {
+        colstart = 40;
+        rowstart = 53;
+      }
+      else if(_init_height == 280)
+      {
+        colstart = 20;
+        rowstart = 0;
+      }
+      else if(_init_width == 172)
+      {
+        colstart = 0;
+        rowstart = 34;
+      }
+      else if(_init_width == 170)
+      {
+        colstart = 0;
+        rowstart = 35;
+      }
+      else
+      {
+        colstart = 0;
+        rowstart = 0;
+      }
+#endif
+      writedata(TFT_MAD_MX | TFT_MAD_MV | TFT_MAD_COLOR_ORDER);
+
+      _width  = _init_height;
+      _height = _init_width;
+      break;
+
+      case 2: // Inverter portrait
+#ifdef CGRAM_OFFSET
+      if (_init_width == 135)
+      {
+        colstart = 53;
+        rowstart = 40;
+      }
+      else if(_init_height == 280)
+      {
+        colstart = 0;
+        rowstart = 20;
+      }
+      else if(_init_width == 172)
+      {
+        colstart = 34;
+        rowstart = 0;
+      }
+      else if(_init_width == 170)
+      {
+        colstart = 35;
+        rowstart = 0;
+      }
+      else
+      {
+        colstart = 0;
+        rowstart = 80;
+      }
+#endif
+      writedata(TFT_MAD_MX | TFT_MAD_MY | TFT_MAD_COLOR_ORDER);
+
+      _width  = _init_width;
+      _height = _init_height;
+       break;
+    case 3: // Inverted landscape
+#ifdef CGRAM_OFFSET
+      if (_init_width == 135)
+      {
+        colstart = 40;
+        rowstart = 52;
+      }
+      else if(_init_height == 280)
+      {
+        colstart = 20;
+        rowstart = 0;
+      }
+      else if(_init_width == 172)
+      {
+        colstart = 0;
+        rowstart = 34;
+      }
+      else if(_init_width == 170)
+      {
+        colstart = 0;
+        rowstart = 35;
+      }
+      else
+      {
+        colstart = 80;
+        rowstart = 0;
+      }
+#endif
+      writedata(TFT_MAD_MV | TFT_MAD_MY | TFT_MAD_COLOR_ORDER);
+
+      _width  = _init_height;
+      _height = _init_width;
+      break;
+  }

TFT_Drivers/ST7789_Defines.h

@@ -34,12 +34,6 @@
   #endif
 #endif
 
-#if (TFT_HEIGHT == 320) && (TFT_WIDTH == 170)
-  #ifndef CGRAM_OFFSET
-    #define CGRAM_OFFSET
-  #endif
-#endif
-
 #if (TFT_HEIGHT == 300) && (TFT_WIDTH == 240)
   #ifndef CGRAM_OFFSET
     #define CGRAM_OFFSET

TFT_Drivers/ST7789_Init.h

@@ -5,7 +5,6 @@
 //
 // See ST7735_Setup.h file for an alternative format
 
-#ifndef INIT_SEQUENCE_3
 {
   writecommand(ST7789_SLPOUT);   // Sleep out
   delay(120);
@@ -104,7 +103,7 @@
   writedata(0x00);
   writedata(0x00);
   writedata(0x00);
-  writedata(0xEF);    // 239
+  writedata(0xE5);    // 239
 
   writecommand(ST7789_RASET);    // Row address set
   writedata(0x00);
@@ -127,111 +126,3 @@
   pinMode(TFT_BL, OUTPUT);
 #endif
 }
-
-
-#else
-// TTGO ESP32 S3 T-Display
-{
-  writecommand(ST7789_SLPOUT);   // Sleep out
-  delay(120);
-
-  writecommand(ST7789_NORON);    // Normal display mode on
-
-  //------------------------------display and color format setting--------------------------------//
-  writecommand(ST7789_MADCTL);
-  writedata(TFT_MAD_COLOR_ORDER);
-
- // writecommand(ST7789_RAMCTRL);
- // writedata(0x00);
- // writedata(0xE0); // 5 to 6 bit conversion: r0 = r5, b0 = b5
-
-  writecommand(ST7789_COLMOD);
-  writedata(0x55);
-  delay(10);
-
-  //--------------------------------ST7789V Frame rate setting----------------------------------//
-  writecommand(ST7789_PORCTRL);
-  writedata(0x0b);
-  writedata(0x0b);
-  writedata(0x00);
-  writedata(0x33);
-  writedata(0x33);
-
-  writecommand(ST7789_GCTRL);      // Voltages: VGH / VGL
-  writedata(0x75);
-
-  //---------------------------------ST7789V Power setting--------------------------------------//
-  writecommand(ST7789_VCOMS);
-  writedata(0x28);		// JLX240 display datasheet
-
-  writecommand(ST7789_LCMCTRL);
-  writedata(0x2C);
-
-  writecommand(ST7789_VDVVRHEN);
-  writedata(0x01);
-
-  writecommand(ST7789_VRHS);       // voltage VRHS
-  writedata(0x1F);
-
-  writecommand(ST7789_FRCTR2);
-  writedata(0x13);
-
-  writecommand(ST7789_PWCTRL1);
-  writedata(0xa7);
-
-  writecommand(ST7789_PWCTRL1);
-  writedata(0xa4);
-  writedata(0xa1);
-
-  writecommand(0xD6);
-  writedata(0xa1);
-
-  //--------------------------------ST7789V gamma setting---------------------------------------//
-  writecommand(ST7789_PVGAMCTRL);
-  writedata(0xf0);
-  writedata(0x05);
-  writedata(0x0a);
-  writedata(0x06);
-  writedata(0x06);
-  writedata(0x03);
-  writedata(0x2b);
-  writedata(0x32);
-  writedata(0x43);
-  writedata(0x36);
-  writedata(0x11);
-  writedata(0x10);
-  writedata(0x2b);
-  writedata(0x32);
-
-  writecommand(ST7789_NVGAMCTRL);
-  writedata(0xf0);
-  writedata(0x08);
-  writedata(0x0c);
-  writedata(0x0b);
-  writedata(0x09);
-  writedata(0x24);
-  writedata(0x2b);
-  writedata(0x22);
-  writedata(0x43);
-  writedata(0x38);
-  writedata(0x15);
-  writedata(0x16);
-  writedata(0x2f);
-  writedata(0x37);
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-  end_tft_write();
-  delay(120);
-  begin_tft_write();
-
-  writecommand(ST7789_DISPON);    //Display on
-  delay(120);
-
-#ifdef TFT_BL
-  // Turn on the back-light LED
-  digitalWrite(TFT_BL, HIGH);
-  pinMode(TFT_BL, OUTPUT);
-#endif
-}
-#endif

TFT_config.h

@@ -78,7 +78,7 @@
     #define TFT_RGB_ORDER TFT_RGB
 #endif
 
-#ifdef CONFIG_TFT_BGR_ORDER
+#ifdef CONFIG_TFT_RGB_ORDER
     #define TFT_RGB_ORDER TFT_BGR
 #endif
 
@@ -223,11 +223,9 @@
 
 // SPI BUS
 #else
-    #if CONFIG_TFT_HSPI_PORT
+    #if CONFIG_TFT_MISO == -1
-        #define USE_HSPI_PORT
+        #error "Invalid MISO pin. Check TFT_eSPI configuration"
-    #endif
+    #else
-
-    #if CONFIG_TFT_MISO != -1
         #define TFT_MISO      CONFIG_TFT_MISO
     #endif
 

TFT_eSPI.h

@@ -16,7 +16,7 @@
 #ifndef _TFT_eSPIH_
 #define _TFT_eSPIH_
 
-#define TFT_ESPI_VERSION "2.5.21"
+#define TFT_ESPI_VERSION "2.4.72"
 
 // Bit level feature flags
 // Bit 0 set: viewport capability
@@ -39,32 +39,6 @@
 #ifdef CONFIG_TFT_eSPI_ESPIDF
   #include "TFT_config.h"
 #endif
-
-// New ESP8266 board package uses ARDUINO_ARCH_ESP8266
-// old package defined ESP8266
-#if defined (ESP8266)
-  #ifndef ARDUINO_ARCH_ESP8266
-    #define ARDUINO_ARCH_ESP8266
-  #endif
-#endif
-
-// The following lines allow the user setup to be included in the sketch folder, see
-// "Sketch_with_tft_setup" generic example.
-#if !defined __has_include
-  #if !defined(DISABLE_ALL_LIBRARY_WARNINGS)
-    #warning Compiler does not support __has_include, so sketches cannot define the setup
-  #endif
-#else
-  #if __has_include(<tft_setup.h>)
-    // Include the sketch setup file
-    #include <tft_setup.h>
-    #ifndef USER_SETUP_LOADED
-      // Prevent loading further setups
-      #define USER_SETUP_LOADED
-    #endif
-  #endif
-#endif
-
 #include <User_Setup_Select.h>
 
 // Handle FLASH based storage e.g. PROGMEM
@@ -83,12 +57,10 @@
   })
 #elif defined(__AVR__)
   #include <avr/pgmspace.h>
-#elif defined(ARDUINO_ARCH_ESP8266) || defined(ESP32)
+#elif defined(ESP8266) || defined(ESP32)
   #include <pgmspace.h>
 #else
-  #ifndef PROGMEM
+  #define PROGMEM
-    #define PROGMEM
-  #endif
 #endif
 
 // Include the processor specific drivers
@@ -98,7 +70,7 @@
   #include "Processors/TFT_eSPI_ESP32_C3.h"
 #elif defined (ESP32)
   #include "Processors/TFT_eSPI_ESP32.h"
-#elif defined (ARDUINO_ARCH_ESP8266)
+#elif defined (ESP8266)
   #include "Processors/TFT_eSPI_ESP8266.h"
 #elif defined (STM32)
   #include "Processors/TFT_eSPI_STM32.h"
@@ -143,17 +115,6 @@
   #define SPI_BUSY_CHECK
 #endif
 
-// If half duplex SDA mode is defined then MISO pin should be -1
-#ifdef TFT_SDA_READ
-  #ifdef TFT_MISO
-    #if TFT_MISO != -1
-      #undef TFT_MISO
-      #define TFT_MISO -1
-      #warning TFT_MISO set to -1
-    #endif
-  #endif
-#endif  
-
 /***************************************************************************************
 **                         Section 4: Setup fonts
 ***************************************************************************************/
@@ -415,6 +376,9 @@ int16_t tch_spi_freq;// Touch controller read/write SPI frequency
 /***************************************************************************************
 **                         Section 8: Class member and support functions
 ***************************************************************************************/
+// Swap any type
+template <typename T> static inline void
+swap_coord(T& a, T& b) { T t = a; a = b; b = t; }
 
 // Callback prototype for smooth font pixel colour read
 typedef uint16_t (*getColorCallback)(uint16_t x, uint16_t y);
@@ -459,12 +423,6 @@ class TFT_eSPI : public Print { friend class TFT_eSprite; // Sprite class has ac
   void     setRotation(uint8_t r); // Set the display image orientation to 0, 1, 2 or 3
   uint8_t  getRotation(void);      // Read the current rotation
 
-  // Change the origin position from the default top left
-  // Note: setRotation, setViewport and resetViewport will revert origin to top left corner of screen/sprite
-  void     setOrigin(int32_t x, int32_t y);
-  int32_t  getOriginX(void);
-  int32_t  getOriginY(void);
-
   void     invertDisplay(bool i);  // Tell TFT to invert all displayed colours
 
 
@@ -507,7 +465,6 @@ class TFT_eSPI : public Print { friend class TFT_eSprite; // Sprite class has ac
   void     end_SDA_Read(void);   // Restore MOSI to output
            #endif
 
-
   // Graphics drawing
   void     fillScreen(uint32_t color),
            drawRect(int32_t x, int32_t y, int32_t w, int32_t h, uint32_t color),
@@ -517,6 +474,28 @@ class TFT_eSPI : public Print { friend class TFT_eSprite; // Sprite class has ac
   void     fillRectVGradient(int16_t x, int16_t y, int16_t w, int16_t h, uint32_t color1, uint32_t color2);
   void     fillRectHGradient(int16_t x, int16_t y, int16_t w, int16_t h, uint32_t color1, uint32_t color2);
 
+           // Draw a pixel blended with the pixel colour on the TFT or sprite, return blended colour
+           // If bg_color is not included the background pixel colour will be read from TFT or sprite
+  uint16_t drawPixel(int32_t x, int32_t y, uint32_t color, uint8_t alpha, uint32_t bg_color = 0x00FFFFFF);
+
+           // Draw a small anti-aliased filled circle at ax,ay with radius r (uses drawWideLine)
+           // If bg_color is not included the background pixel colour will be read from TFT or sprite
+  void     drawSpot(float ax, float ay, float r, uint32_t fg_color, uint32_t bg_color = 0x00FFFFFF);
+
+           // Draw an anti-aliased filled circle at x, y with radius r
+           // If bg_color is not included the background pixel colour will be read from TFT or sprite
+  void     fillSmoothCircle(int32_t x, int32_t y, int32_t r, uint32_t color, uint32_t bg_color = 0x00FFFFFF);
+
+  void     fillSmoothRoundRect(int32_t x, int32_t y, int32_t w, int32_t h, int32_t radius, uint32_t color, uint32_t bg_color = 0x00FFFFFF);
+
+           // Draw an anti-aliased wide line from ax,ay to bx,by width wd with radiused ends (radius is wd/2)
+           // If bg_color is not included the background pixel colour will be read from TFT or sprite
+  void     drawWideLine(float ax, float ay, float bx, float by, float wd, uint32_t fg_color, uint32_t bg_color = 0x00FFFFFF);
+
+           // Draw an anti-aliased wide line from ax,ay to bx,by with different width at each end aw, bw and with radiused ends
+           // If bg_color is not included the background pixel colour will be read from TFT or sprite
+  void     drawWedgeLine(float ax, float ay, float bx, float by, float aw, float bw, uint32_t fg_color, uint32_t bg_color = 0x00FFFFFF);
+
   void     drawCircle(int32_t x, int32_t y, int32_t r, uint32_t color),
            drawCircleHelper(int32_t x, int32_t y, int32_t r, uint8_t cornername, uint32_t color),
            fillCircle(int32_t x, int32_t y, int32_t r, uint32_t color),
@@ -529,53 +508,6 @@ class TFT_eSPI : public Print { friend class TFT_eSprite; // Sprite class has ac
            drawTriangle(int32_t x1,int32_t y1, int32_t x2,int32_t y2, int32_t x3,int32_t y3, uint32_t color),
            fillTriangle(int32_t x1,int32_t y1, int32_t x2,int32_t y2, int32_t x3,int32_t y3, uint32_t color);
 
-
-  // Smooth (anti-aliased) graphics drawing
-           // Draw a pixel blended with the background pixel colour (bg_color) specified,  return blended colour
-           // If the bg_color is not specified, the background pixel colour will be read from TFT or sprite
-  uint16_t drawPixel(int32_t x, int32_t y, uint32_t color, uint8_t alpha, uint32_t bg_color = 0x00FFFFFF);
-
-           // Draw an anti-aliased (smooth) arc between start and end angles. Arc ends are anti-aliased.
-           // By default the arc is drawn with square ends unless the "roundEnds" parameter is included and set true
-           // Angle = 0 is at 6 o'clock position, 90 at 9 o'clock etc. The angles must be in range 0-360 or they will be clipped to these limits
-           // The start angle may be larger than the end angle. Arcs are always drawn clockwise from the start angle.
-  void     drawSmoothArc(int32_t x, int32_t y, int32_t r, int32_t ir, uint32_t startAngle, uint32_t endAngle, uint32_t fg_color, uint32_t bg_color, bool roundEnds = false);
-
-           // As per "drawSmoothArc" except the ends of the arc are NOT anti-aliased, this facilitates dynamic arc length changes with
-           // arc segments and ensures clean segment joints. 
-           // The sides of the arc are anti-aliased by default. If smoothArc is false sides will NOT be anti-aliased
-  void     drawArc(int32_t x, int32_t y, int32_t r, int32_t ir, uint32_t startAngle, uint32_t endAngle, uint32_t fg_color, uint32_t bg_color, bool smoothArc = true);
-
-           // Draw an anti-aliased filled circle at x, y with radius r
-           // Note: The thickness of line is 3 pixels to reduce the visible "braiding" effect of anti-aliasing narrow lines
-           //       this means the inner anti-alias zone is always at r-1 and the outer zone at r+1
-  void     drawSmoothCircle(int32_t x, int32_t y, int32_t r, uint32_t fg_color, uint32_t bg_color);
-  
-           // Draw an anti-aliased filled circle at x, y with radius r
-           // If bg_color is not included the background pixel colour will be read from TFT or sprite
-  void     fillSmoothCircle(int32_t x, int32_t y, int32_t r, uint32_t color, uint32_t bg_color = 0x00FFFFFF);
-
-           // Draw a rounded rectangle that has a line thickness of r-ir+1 and bounding box defined by x,y and w,h
-           // The outer corner radius is r, inner corner radius is ir
-           // The inside and outside of the border are anti-aliased
-  void     drawSmoothRoundRect(int32_t x, int32_t y, int32_t r, int32_t ir, int32_t w, int32_t h, uint32_t fg_color, uint32_t bg_color = 0x00FFFFFF, uint8_t quadrants = 0xF);
-
-           // Draw a filled rounded rectangle , corner radius r and bounding box defined by x,y and w,h
-  void     fillSmoothRoundRect(int32_t x, int32_t y, int32_t w, int32_t h, int32_t radius, uint32_t color, uint32_t bg_color = 0x00FFFFFF);
-
-           // Draw a small anti-aliased filled circle at ax,ay with radius r (uses drawWideLine)
-           // If bg_color is not included the background pixel colour will be read from TFT or sprite
-  void     drawSpot(float ax, float ay, float r, uint32_t fg_color, uint32_t bg_color = 0x00FFFFFF);
-
-           // Draw an anti-aliased wide line from ax,ay to bx,by width wd with radiused ends (radius is wd/2)
-           // If bg_color is not included the background pixel colour will be read from TFT or sprite
-  void     drawWideLine(float ax, float ay, float bx, float by, float wd, uint32_t fg_color, uint32_t bg_color = 0x00FFFFFF);
-
-           // Draw an anti-aliased wide line from ax,ay to bx,by with different width at each end aw, bw and with radiused ends
-           // If bg_color is not included the background pixel colour will be read from TFT or sprite
-  void     drawWedgeLine(float ax, float ay, float bx, float by, float aw, float bw, uint32_t fg_color, uint32_t bg_color = 0x00FFFFFF);
-
-
   // Image rendering
            // Swap the byte order for pushImage() and pushPixels() - corrects endianness
   void     setSwapBytes(bool swap);
@@ -614,16 +546,11 @@ class TFT_eSPI : public Print { friend class TFT_eSprite; // Sprite class has ac
   void     pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint8_t  *data, uint8_t  transparent, bool bpp8 = true, uint16_t *cmap = nullptr);
            // FLASH version
   void     pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const uint8_t *data, bool bpp8,  uint16_t *cmap = nullptr);
-
-           // Render a 16 bit colour image with a 1bpp mask
-  void     pushMaskedImage(int32_t x, int32_t y, int32_t w, int32_t h, uint16_t *img, uint8_t *mask);
-
            // This next function has been used successfully to dump the TFT screen to a PC for documentation purposes
            // It reads a screen area and returns the 3 RGB 8 bit colour values of each pixel in the buffer
            // Set w and h to 1 to read 1 pixel's colour. The data buffer must be at least w * h * 3 bytes
   void     readRectRGB(int32_t x, int32_t y, int32_t w, int32_t h, uint8_t *data);
 
-
   // Text rendering - value returned is the pixel width of the rendered text
   int16_t  drawNumber(long intNumber, int32_t x, int32_t y, uint8_t font), // Draw integer using specified font number
            drawNumber(long intNumber, int32_t x, int32_t y),               // Draw integer using current font
@@ -645,7 +572,6 @@ class TFT_eSPI : public Print { friend class TFT_eSprite; // Sprite class has ac
            drawCentreString(const String& string, int32_t x, int32_t y, uint8_t font),// Deprecated, use setTextDatum() and drawString()
            drawRightString(const String& string, int32_t x, int32_t y, uint8_t font); // Deprecated, use setTextDatum() and drawString()
 
-
   // Text rendering and font handling support funtions
   void     setCursor(int16_t x, int16_t y),                 // Set cursor for tft.print()
            setCursor(int16_t x, int16_t y, uint8_t font);   // Set cursor and font number for tft.print()
@@ -686,14 +612,13 @@ class TFT_eSPI : public Print { friend class TFT_eSprite; // Sprite class has ac
 
            // Support function to UTF8 decode and draw characters piped through print stream
   size_t   write(uint8_t);
-           // size_t   write(const uint8_t *buf, size_t len);
+  // size_t   write(const uint8_t *buf, size_t len);
 
            // Used by Smooth font class to fetch a pixel colour for the anti-aliasing
   void     setCallback(getColorCallback getCol);
 
   uint16_t fontsLoaded(void); // Each bit in returned value represents a font type that is loaded - used for debug/error handling only
 
-
   // Low level read/write
   void     spiwrite(uint8_t);        // legacy support only
 #ifndef RM68120_DRIVER
@@ -727,15 +652,14 @@ class TFT_eSPI : public Print { friend class TFT_eSprite; // Sprite class has ac
            // Alpha blend 2 colours, see generic "alphaBlend_Test" example
            // alpha =   0 = 100% background colour
            // alpha = 255 = 100% foreground colour
-  inline uint16_t alphaBlend(uint8_t alpha, uint16_t fgc, uint16_t bgc);
+  uint16_t alphaBlend(uint8_t alpha, uint16_t fgc, uint16_t bgc);
            // 16 bit colour alphaBlend with alpha dither (dither reduces colour banding)
   uint16_t alphaBlend(uint8_t alpha, uint16_t fgc, uint16_t bgc, uint8_t dither);
            // 24 bit colour alphaBlend with optional alpha dither
   uint32_t alphaBlend24(uint8_t alpha, uint32_t fgc, uint32_t bgc, uint8_t dither = 0);
 
-  // Direct Memory Access (DMA) support functions
+
-  // These can be used for SPI writes when using the ESP32 (original) or STM32 processors.
+  // DMA support functions - these are currently just for SPI writes when using the ESP32 or STM32 processors
-  // DMA also works on a RP2040 processor with PIO based SPI and parallel (8 and 16 bit) interfaces
            // Bear in mind DMA will only be of benefit in particular circumstances and can be tricky
            // to manage by noobs. The functions have however been designed to be noob friendly and
            // avoid a few DMA behaviour "gotchas".
@@ -767,13 +691,8 @@ class TFT_eSPI : public Print { friend class TFT_eSprite; // Sprite class has ac
 
            // Push an image to the TFT using DMA, buffer is optional and grabs (double buffers) a copy of the image
            // Use the buffer if the image data will get over-written or destroyed while DMA is in progress
-           //
+           // If swapping colour bytes is defined, and the double buffer option is NOT used, then the bytes
-           // Note 1: If swapping colour bytes is defined, and the double buffer option is NOT used, then the bytes
+           // in the original data image will be swapped by the function before DMA is initiated.
-           // in the original image buffer content will be byte swapped by the function before DMA is initiated.
-           //
-           // Note 2: If part of the image will be off screen or outside of a set viewport, then the the original
-           // image buffer content will be altered to a correctly clipped image before DMA is initiated.
-           //
            // The function will wait for the last DMA to complete if it is called while a previous DMA is still
            // in progress, this simplifies the sketch and helps avoid "gotchas".
   void     pushImageDMA(int32_t x, int32_t y, int32_t w, int32_t h, uint16_t* data, uint16_t* buffer = nullptr);
@@ -866,9 +785,6 @@ class TFT_eSPI : public Print { friend class TFT_eSprite; // Sprite class has ac
            // Single GPIO input/output direction control
   void     gpioMode(uint8_t gpio, uint8_t mode);
 
-           // Smooth graphics helper
-  uint8_t  sqrt_fraction(uint32_t num);
-
            // Helper function: calculate distance of a point from a finite length line between two points
   float    wedgeLineDistance(float pax, float pay, float bax, float bay, float dr);
 
@@ -974,10 +890,6 @@ class TFT_eSPI : public Print { friend class TFT_eSprite; // Sprite class has ac
 
 }; // End of class TFT_eSPI
 
-// Swap any type
-template <typename T> static inline void
-transpose(T& a, T& b) { T t = a; a = b; b = t; }
-
 /***************************************************************************************
 **                         Section 10: Additional extension classes
 ***************************************************************************************/

User_Setup.h

@@ -104,7 +104,6 @@
 // #define ST7735_GREENTAB3
 // #define ST7735_GREENTAB128    // For 128 x 128 display
 // #define ST7735_GREENTAB160x80 // For 160 x 80 display (BGR, inverted, 26 offset)
-// #define ST7735_ROBOTLCD       // For some RobotLCD arduino shields (128x160, BGR, https://docs.arduino.cc/retired/getting-started-guides/TFT)
 // #define ST7735_REDTAB
 // #define ST7735_BLACKTAB
 // #define ST7735_REDTAB160x80   // For 160 x 80 display with 24 pixel offset
@@ -324,20 +323,6 @@
 // For RP2040 processor and SPI displays, uncomment the following line to use the PIO interface.
 //#define RP2040_PIO_SPI // Leave commented out to use standard RP2040 SPI port interface
 
-// For RP2040 processor and 8 or 16 bit parallel displays:
-// The parallel interface write cycle period is derived from a division of the CPU clock
-// speed so scales with the processor clock. This means that the divider ratio may need
-// to be increased when overclocking. I may also need to be adjusted dependant on the
-// display controller type (ILI94341, HX8357C etc). If RP2040_PIO_CLK_DIV is not defined
-// the library will set default values which may not suit your display.
-// The display controller data sheet will specify the minimum write cycle period. The
-// controllers often work reliably for shorter periods, however if the period is too short
-// the display may not initialise or graphics will become corrupted.
-// PIO write cycle frequency = (CPU clock/(4 * RP2040_PIO_CLK_DIV))
-//#define RP2040_PIO_CLK_DIV 1 // 32ns write cycle at 125MHz CPU clock
-//#define RP2040_PIO_CLK_DIV 2 // 64ns write cycle at 125MHz CPU clock
-//#define RP2040_PIO_CLK_DIV 3 // 96ns write cycle at 125MHz CPU clock
-
 // For the RP2040 processor define the SPI port channel used (default 0 if undefined)
 //#define TFT_SPI_PORT 1 // Set to 0 if SPI0 pins are used, or 1 if spi1 pins used
 

User_Setup_Select.h

@@ -1,31 +1,23 @@
 // This header file contains a list of user setup files and defines which one the
 // compiler uses when the IDE performs a Verify/Compile or Upload.
 //
-// Users can create configurations for different boards and TFT displays.
+// Users can create configurations for different Espressif boards and TFT displays.
 // This makes selecting between hardware setups easy by "uncommenting" one line.
 
 // The advantage of this hardware configuration method is that the examples provided
-// with the library should work with immediately without any other changes being
+// with the library should work with different setups immediately without any other
-// needed. It also improves the portability of users sketches to other hardware
+// changes being needed. It also improves the portability of users sketches to other
-// configurations and compatible libraries.
+// hardware configurations and compatible libraries.
 //
 // Create a shortcut to this file on your desktop to permit quick access for editing.
 // Re-compile and upload after making and saving any changes to this file.
 
 // Customised User_Setup files are stored in the "User_Setups" folder.
 
-// It is also possible for the user tft settings to be included with the sketch, see
-// the "Sketch_with_tft_setup" generic example. This may be more convenient for
-// multiple projects.
-
 #ifndef USER_SETUP_LOADED //  Lets PlatformIO users define settings in
                           //  platformio.ini, see notes in "Tools" folder.
 
-///////////////////////////////////////////////////////
+// Only ONE line below should be uncommented.  Add extra lines and files as needed.
-//   User configuration selection lines are below    //
-///////////////////////////////////////////////////////
-
-// Only ONE line below should be uncommented to define your setup.  Add extra lines and files as needed.
 
 #include <User_Setup.h>           // Default setup is root library folder
 
@@ -128,11 +120,6 @@
 
 //#include <User_Setups/Setup205_ESP32_TouchDown_S3.h>     // Setup file for the ESP32 TouchDown S3 based on ILI9488 480 x 320 TFT 
 
-//#include <User_Setups/Setup206_LilyGo_T_Display_S3.h>
-//#include <User_Setups/Setup207_LilyGo_T_HMI.h>
-
-//#include <User_Setups/Setup301_BW16_ST7735.h>            // Setup file for Bw16-based boards with ST7735 160 x 80 TFT
-
 //#include <User_Setups/SetupX_Template.h>     // Template file for a setup
 
 

User_Setups/Setup206_LilyGo_T_Display_S3.h

@@ -1,46 +0,0 @@
-// ST7789 using 8-bit Parallel
-
-#define USER_SETUP_ID 206
-
-#define ST7789_DRIVER
-#define INIT_SEQUENCE_3 // Using this initialisation sequence improves the display image
-
-#define CGRAM_OFFSET
-#define TFT_RGB_ORDER TFT_RGB  // Colour order Red-Green-Blue
-//#define TFT_RGB_ORDER TFT_BGR // Colour order Blue-Green-Red
-
-#define TFT_INVERSION_ON
-// #define TFT_INVERSION_OFF
-
-#define TFT_PARALLEL_8_BIT
-
-#define TFT_WIDTH 170
-#define TFT_HEIGHT 320
-
-#define TFT_DC 7
-#define TFT_RST 5
-
-#define TFT_WR 8
-#define TFT_RD 9
-
-#define TFT_D0 39
-#define TFT_D1 40
-#define TFT_D2 41
-#define TFT_D3 42
-#define TFT_D4 45
-#define TFT_D5 46
-#define TFT_D6 47
-#define TFT_D7 48
-
-#define TFT_BL 38
-#define TFT_BACKLIGHT_ON HIGH
-
-#define LOAD_GLCD
-#define LOAD_FONT2
-#define LOAD_FONT4
-#define LOAD_FONT6
-#define LOAD_FONT7
-#define LOAD_FONT8
-#define LOAD_GFXFF
-
-#define SMOOTH_FONT

User_Setups/Setup207_LilyGo_T_HMI.h

@@ -1,48 +0,0 @@
-// ST7789 240 x 240 display with no chip select line
-#define USER_SETUP_ID 207
-
-#define ST7789_DRIVER // Configure all registers
-
-// #define TFT_RGB_ORDER TFT_BGR // Colour order Blue-Green-Red
-
-#define TFT_WIDTH 240
-#define TFT_HEIGHT 320
-
-#define CGRAM_OFFSET
-// #define TFT_RGB_ORDER TFT_RGB  // Colour order Red-Green-Blue
-#define TFT_RGB_ORDER TFT_BGR  // Colour order Blue-Green-Red
-
-// #define TFT_INVERSION_ON
-#define TFT_INVERSION_OFF
-
-#define TFT_PARALLEL_8_BIT
-
-// The ESP32 and TFT the pins used for testing are:
-#define TFT_CS 6  // Chip select control pin (library pulls permanently low
-#define TFT_DC 7  // Data Command control pin
-#define TFT_RST -1 // Reset pin, toggles on startup
-
-#define TFT_WR 8 // Write strobe control pin
-#define TFT_RD -1 // Read strobe control pin
-
-#define TFT_D0 48 // Must use pins in the range 0-31 or alternatively 32-48
-#define TFT_D1 47 // so a single register write sets/clears all bits.
-#define TFT_D2 39 // Pins can be randomly assigned, this does not affect
-#define TFT_D3 40 // TFT screen update performance.
-#define TFT_D4 41
-#define TFT_D5 42
-#define TFT_D6 45
-#define TFT_D7 46
-
-#define TFT_BL 38 // LED back-light
-
-#define LOAD_GLCD  // Font 1. Original Adafruit 8 pixel font needs ~1820 bytes in FLASH
-#define LOAD_FONT2 // Font 2. Small 16 pixel high font, needs ~3534 bytes in FLASH, 96 characters
-#define LOAD_FONT4 // Font 4. Medium 26 pixel high font, needs ~5848 bytes in FLASH, 96 characters
-#define LOAD_FONT6 // Font 6. Large 48 pixel font, needs ~2666 bytes in FLASH, only characters 1234567890:-.apm
-#define LOAD_FONT7 // Font 7. 7 segment 48 pixel font, needs ~2438 bytes in FLASH, only characters 1234567890:.
-#define LOAD_FONT8 // Font 8. Large 75 pixel font needs ~3256 bytes in FLASH, only characters 1234567890:-.
-//#define LOAD_FONT8N // Font 8. Alternative to Font 8 above, slightly narrower, so 3 digits fit a 160 pixel TFT
-#define LOAD_GFXFF // FreeFonts. Include access to the 48 Adafruit_GFX free fonts FF1 to FF48 and custom fonts
-
-#define SMOOTH_FONT

User_Setups/Setup25_TTGO_T_Display.h

@@ -19,6 +19,8 @@
 #define TFT_DC              16
 #define TFT_RST             23
 
+#define TOUCH_CS            -1
+
 #define TFT_BL          4  // Display backlight control pin
 
 #define TFT_BACKLIGHT_ON HIGH  // HIGH or LOW are options

User_Setups/Setup301_BW16_ST7735.h

@@ -1,47 +0,0 @@
-#include "itoa.h"
-#include <avr/dtostrf.h>
-
-
-// Setup for BW16 and ST7735 80 x 160 TFT
-#define USER_SETUP_ID 301
-// See SetupX_Template.h for all options available
-
-#define ST7735_DRIVER
-
-
-#define TFT_WIDTH  80
-#define TFT_HEIGHT 160
-
-
-#define ST7735_GREENTAB160x80
-
-// For ST7735, ST7789 and ILI9341 ONLY, define the colour order IF the blue and red are swapped on your display
-// Try ONE option at a time to find the correct colour order for your display
-
-//  #define TFT_RGB_ORDER TFT_RGB  // Colour order Red-Green-Blue
-//  #define TFT_RGB_ORDER TFT_BGR  // Colour order Blue-Green-Red
-
-// Pin Mappings for BW16 board
-#define TFT_MISO 11
-#define TFT_MOSI 12
-#define TFT_SCLK 10
-#define TFT_CS    9  // Chip select control pin
-#define TFT_DC    8  // Data Command control pin
-#define TFT_RST   6  // Reset pin (could connect to RST pin)
-
-
-#define LOAD_GLCD   // Font 1. Original Adafruit 8 pixel font needs ~1820 bytes in FLASH
-#define LOAD_FONT2  // Font 2. Small 16 pixel high font, needs ~3534 bytes in FLASH, 96 characters
-#define LOAD_FONT4  // Font 4. Medium 26 pixel high font, needs ~5848 bytes in FLASH, 96 characters
-#define LOAD_FONT6  // Font 6. Large 48 pixel font, needs ~2666 bytes in FLASH, only characters 1234567890:-.apm
-#define LOAD_FONT7  // Font 7. 7 segment 48 pixel font, needs ~2438 bytes in FLASH, only characters 1234567890:.
-#define LOAD_FONT8  // Font 8. Large 75 pixel font needs ~3256 bytes in FLASH, only characters 1234567890:-.
-//#define LOAD_FONT8N // Font 8. Alternative to Font 8 above, slightly narrower, so 3 digits fit a 160 pixel TFT
-#define LOAD_GFXFF  // FreeFonts. Include access to the 48 Adafruit_GFX free fonts FF1 to FF48 and custom fonts
-
-#define SMOOTH_FONT
-
-
-#define SPI_FREQUENCY  20000000
-//#define SPI_FREQUENCY  27000000 // Actually sets it to 26.67MHz = 80/3
-

User_Setups/Setup70b_ESP32_S3_ILI9341.h

@@ -26,7 +26,7 @@
 
 #define SMOOTH_FONT
 
-// FSPI (or VSPI) port (SPI2) used unless following defined. HSPI port is (SPI3) on S3.
+// FSPI port (SPI2) used unless following defined. HSPI port (SPI3) NOT TESTED YET
 //#define USE_HSPI_PORT
 
 //#define SPI_FREQUENCY  27000000

User_Setups/Setup70f_ESP32_S2_ST7735.h

@@ -1,44 +0,0 @@
-// Setup for the ESP32 S2 with ST7735 80x160 display
-// See SetupX_Template.h for all options available
-
-#define USER_SETUP_ID 70
-
-#define ST7735_DRIVER
-
-#define TFT_SDA_READ // Display has a bidirectional SDA pin (no MISO)
-
-#define TFT_WIDTH  80
-#define TFT_HEIGHT 160
-
-#define ST7735_GREENTAB160x80
-//#define ST7735_REDTAB160x80
-
-//#define TFT_RGB_ORDER TFT_RGB  // Colour order Red-Green-Blue
-#define TFT_RGB_ORDER TFT_BGR  // Colour order Blue-Green-Red
-
-#define TFT_INVERSION_ON
-// #define TFT_INVERSION_OFF
-
-                    // Typical board default pins
-#define TFT_CS   10 //     10 or 34
-
-#define TFT_MOSI 11 //     11 or 35
-#define TFT_SCLK 12 //     12 or 36
-
-#define TFT_DC   14
-#define TFT_RST  15
-
-#define LOAD_GLCD
-#define LOAD_FONT2
-#define LOAD_FONT4
-#define LOAD_FONT6
-#define LOAD_FONT7
-#define LOAD_FONT8
-#define LOAD_GFXFF
-
-#define SMOOTH_FONT
-
-// FSPI port must be used for SDA reads. Do not use #define USE_HSPI_PORT
-
-#define SPI_FREQUENCY       27000000
-#define SPI_READ_FREQUENCY  16000000

docs/ESP-IDF/Using ESP-IDF.txt

@@ -1,70 +0,0 @@
-The TFT_eSPI library has been updated by a user (dracir9) in pull request #1770 to enable
-use with the ESP-IDF.
-
-https://github.com/Bodmer/TFT_eSPI/pull/1770
-
-The library author (Bodmer) does not use the ESP-IDF so will not be able to provide support!
-
-There are two ways to configure the library either:
-
-    manually enter the setup in menuconfig
-    OR
-    delete the KConfig file, select your LCD/board in the User_Setup_Select.h file, and run "idf.py reconfigure"
-
-The following menuconfig instructions were posted by dracir9 as part of the pull request #1770:
-
-https://github.com/Bodmer/TFT_eSPI/pull/1770#issuecomment-1096478997
-
-In the above link the instructions include useful hyperlinks. The bare text of the
-instructions is included below.
-
-Steps to use:
-
-  1.  Install ESP-IDF toolchain. The easiest way is to use VS Code and the ESP-IDF extension
-      which handles most of the work automatically. Make sure to install version V4.4. From
-      now on I'll assume that VS Code is being used.
- 
-  2.  Once ESP-IDF is installed open VS Code and press F1. Type ESP-IDF: New Project. Hit enter.
-  
-  3.  Enter your project name, directory and board (if not sure choose ESP32 chip (via ESP-PROG)).
-      If your board is connected choose serial port. Leave ESP-IDF component directory blank and
-      press Choose Template.
-      
-  4.  In the dropdown choose Extension and select Arduino-as-component. (This is not mandatory.
-      You can try other templates if you want). This will create a blank project with a simple
-      main source file in the "main" folder.
-      
-  5.  Now we have to add Arduino to your project. You can find the complete documentation here:
-      https://github.com/espressif/arduino-esp32
-      
-      and here:
-      https://docs.espressif.com/projects/arduino-esp32/en/latest/esp-idf_component.html
-      
-      I'll list two methods that I use most of the time:
-
-      5.1. Press F1 and type ESP-IDF: Add Arduino ESP32 as ESP-IDF Component. This will
-      automatically download and install the latest code from the arduino esp-32 repository.
-      This is the easiest method but as it uses the latest code it may introduce compilation errors.
-
-      5.2. Go to the Arduino esp-32 repository release page. Choose a version and find its "Assets"
-      section. Download the source code file into "project directory/components". Extract the
-      compressed file. This will create a folder called arduino-esp32-2.x.x. Rename it to arduino.
-      This method is slightly more complex but ensures you choose a stable version.
-      
-  6.  Download the TFT_eSPI library into the components folder
-  
-  7.  Now open VS Code and load your project folder. Press F1 and type ESP-IDF: SDK Configuration
-      editor (menuconfig). Alternatively press Ctrl+E, G or press the gear button in the bottom left
-      corner.
-      
-  8.  This will open the project configuration menu. Navigate to the TFT_eSPI section and configure
-      the library (TFT driver, pins, fonts, etc.).
-      
-  9.  Press F1 and type ESP-IDF: Build your project. Alternatively press Ctrl+E, B or click the
-      build button in the bottom left corner.
-      
- 10.  Choose your port by typing ESP-IDF: Select port to use or with the button in the bottom left.
- 
- 11.  Upload your code with the lightning button in the bottom toolbar.
- 
- 12.  Enjoy!

examples/GUI Widgets/Buttons/Button_demo/Button_demo.ino

@@ -1,191 +0,0 @@
-// Button widget demo, requires SPI display with touch screen
-
-// Requires widget library here:
-// https://github.com/Bodmer/TFT_eWidget
-
-#include <FS.h>
-#include "Free_Fonts.h" // Include the header file attached to this sketch
-
-#include <TFT_eSPI.h>              // Hardware-specific library
-#include <TFT_eWidget.h>           // Widget library
-
-TFT_eSPI tft = TFT_eSPI();         // Invoke custom library
-
-#define CALIBRATION_FILE "/TouchCalData1"
-#define REPEAT_CAL false
-
-ButtonWidget btnL = ButtonWidget(&tft);
-ButtonWidget btnR = ButtonWidget(&tft);
-
-#define BUTTON_W 100
-#define BUTTON_H 50
-
-// Create an array of button instances to use in for() loops
-// This is more useful where large numbers of buttons are employed
-ButtonWidget* btn[] = {&btnL , &btnR};;
-uint8_t buttonCount = sizeof(btn) / sizeof(btn[0]);
-
-void btnL_pressAction(void)
-{
-  if (btnL.justPressed()) {
-    Serial.println("Left button just pressed");
-    btnL.drawSmoothButton(true);
-  }
-}
-
-void btnL_releaseAction(void)
-{
-  static uint32_t waitTime = 1000;
-  if (btnL.justReleased()) {
-    Serial.println("Left button just released");
-    btnL.drawSmoothButton(false);
-    btnL.setReleaseTime(millis());
-    waitTime = 10000;
-  }
-  else {
-    if (millis() - btnL.getReleaseTime() >= waitTime) {
-      waitTime = 1000;
-      btnL.setReleaseTime(millis());
-      btnL.drawSmoothButton(!btnL.getState());
-    }
-  }
-}
-
-void btnR_pressAction(void)
-{
-  if (btnR.justPressed()) {
-    btnR.drawSmoothButton(!btnR.getState(), 3, TFT_BLACK, btnR.getState() ? "OFF" : "ON");
-    Serial.print("Button toggled: ");
-    if (btnR.getState()) Serial.println("ON");
-    else  Serial.println("OFF");
-    btnR.setPressTime(millis());
-  }
-
-  // if button pressed for more than 1 sec...
-  if (millis() - btnR.getPressTime() >= 1000) {
-    Serial.println("Stop pressing my buttton.......");
-  }
-  else Serial.println("Right button is being pressed");
-}
-
-void btnR_releaseAction(void)
-{
-  // Not action
-}
-
-void initButtons() {
-  uint16_t x = (tft.width() - BUTTON_W) / 2;
-  uint16_t y = tft.height() / 2 - BUTTON_H - 10;
-  btnL.initButtonUL(x, y, BUTTON_W, BUTTON_H, TFT_WHITE, TFT_RED, TFT_BLACK, "Button", 1);
-  btnL.setPressAction(btnL_pressAction);
-  btnL.setReleaseAction(btnL_releaseAction);
-  btnL.drawSmoothButton(false, 3, TFT_BLACK); // 3 is outline width, TFT_BLACK is the surrounding background colour for anti-aliasing
-
-  y = tft.height() / 2 + 10;
-  btnR.initButtonUL(x, y, BUTTON_W, BUTTON_H, TFT_WHITE, TFT_BLACK, TFT_GREEN, "OFF", 1);
-  btnR.setPressAction(btnR_pressAction);
-  //btnR.setReleaseAction(btnR_releaseAction);
-  btnR.drawSmoothButton(false, 3, TFT_BLACK); // 3 is outline width, TFT_BLACK is the surrounding background colour for anti-aliasing
-}
-
-void setup() {
-  Serial.begin(115200);
-  tft.begin();
-  tft.setRotation(0);
-  tft.fillScreen(TFT_BLACK);
-  tft.setFreeFont(FF18);
-
-  // Calibrate the touch screen and retrieve the scaling factors
-  touch_calibrate();
-  initButtons();
-}
-
-void loop() {
-  static uint32_t scanTime = millis();
-  uint16_t t_x = 9999, t_y = 9999; // To store the touch coordinates
-
-  // Scan keys every 50ms at most
-  if (millis() - scanTime >= 50) {
-    // Pressed will be set true if there is a valid touch on the screen
-    bool pressed = tft.getTouch(&t_x, &t_y);
-    scanTime = millis();
-    for (uint8_t b = 0; b < buttonCount; b++) {
-      if (pressed) {
-        if (btn[b]->contains(t_x, t_y)) {
-          btn[b]->press(true);
-          btn[b]->pressAction();
-        }
-      }
-      else {
-        btn[b]->press(false);
-        btn[b]->releaseAction();
-      }
-    }
-  }
-
-}
-
-void touch_calibrate()
-{
-  uint16_t calData[5];
-  uint8_t calDataOK = 0;
-
-  // check file system exists
-  if (!LittleFS.begin()) {
-    Serial.println("Formating file system");
-    LittleFS.format();
-    LittleFS.begin();
-  }
-
-  // check if calibration file exists and size is correct
-  if (LittleFS.exists(CALIBRATION_FILE)) {
-    if (REPEAT_CAL)
-    {
-      // Delete if we want to re-calibrate
-      LittleFS.remove(CALIBRATION_FILE);
-    }
-    else
-    {
-      File f = LittleFS.open(CALIBRATION_FILE, "r");
-      if (f) {
-        if (f.readBytes((char *)calData, 14) == 14)
-          calDataOK = 1;
-        f.close();
-      }
-    }
-  }
-
-  if (calDataOK && !REPEAT_CAL) {
-    // calibration data valid
-    tft.setTouch(calData);
-  } else {
-    // data not valid so recalibrate
-    tft.fillScreen(TFT_BLACK);
-    tft.setCursor(20, 0);
-    tft.setTextFont(2);
-    tft.setTextSize(1);
-    tft.setTextColor(TFT_WHITE, TFT_BLACK);
-
-    tft.println("Touch corners as indicated");
-
-    tft.setTextFont(1);
-    tft.println();
-
-    if (REPEAT_CAL) {
-      tft.setTextColor(TFT_RED, TFT_BLACK);
-      tft.println("Set REPEAT_CAL to false to stop this running again!");
-    }
-
-    tft.calibrateTouch(calData, TFT_MAGENTA, TFT_BLACK, 15);
-
-    tft.setTextColor(TFT_GREEN, TFT_BLACK);
-    tft.println("Calibration complete!");
-
-    // store data
-    File f = LittleFS.open(CALIBRATION_FILE, "w");
-    if (f) {
-      f.write((const unsigned char *)calData, 14);
-      f.close();
-    }
-  }
-}

examples/GUI Widgets/Buttons/Button_demo/Free_Fonts.h

@@ -1,377 +0,0 @@
-// Attach this header file to your sketch to use the GFX Free Fonts. You can write
-// sketches without it, but it makes referencing them easier.
-
-// This calls up ALL the fonts but they only get loaded if you actually
-// use them in your sketch.
-//
-// No changes are needed to this header file unless new fonts are added to the
-// library "Fonts/GFXFF" folder.
-//
-// To save a lot of typing long names, each font can easily be referenced in the
-// sketch in three ways, either with:
-//
-//    1. Font file name with the & in front such as &FreeSansBoldOblique24pt7b
-//       an example being:
-//
-//       tft.setFreeFont(&FreeSansBoldOblique24pt7b);
-//
-//    2. FF# where # is a number determined by looking at the list below
-//       an example being:
-//
-//       tft.setFreeFont(FF32);
-//
-//    3. An abbreviation of the file name. Look at the list below to see
-//       the abbreviations used, for example:
-//
-//       tft.setFreeFont(FSSBO24)
-//
-//       Where the letters mean:
-//       F = Free font
-//       M = Mono
-//      SS = Sans Serif (double S to distinguish is form serif fonts)
-//       S = Serif
-//       B = Bold
-//       O = Oblique (letter O not zero)
-//       I = Italic
-//       # =  point size, either 9, 12, 18 or 24
-//
-//  Setting the font to NULL will select the GLCD font:
-//
-//      tft.setFreeFont(NULL); // Set font to GLCD
-
-#define LOAD_tftFF
-
-#ifdef LOAD_tftFF // Only include the fonts if LOAD_tftFF is defined in User_Setup.h
-
-// Use these when printing or drawing text in GLCD and high rendering speed fonts
-#define GFXFF 1
-#define GLCD  0
-#define FONT2 2
-#define FONT4 4
-#define FONT6 6
-#define FONT7 7
-#define FONT8 8
-
-// Use the following when calling setFont()
-//
-// Reserved for GLCD font  // FF0
-//
-
-#define TT1 &TomThumb
-
-#define FM9 &FreeMono9pt7b
-#define FM12 &FreeMono12pt7b
-#define FM18 &FreeMono18pt7b
-#define FM24 &FreeMono24pt7b
-
-#define FMB9 &FreeMonoBold9pt7b
-#define FMB12 &FreeMonoBold12pt7b
-#define FMB18 &FreeMonoBold18pt7b
-#define FMB24 &FreeMonoBold24pt7b
-
-#define FMO9 &FreeMonoOblique9pt7b
-#define FMO12 &FreeMonoOblique12pt7b
-#define FMO18 &FreeMonoOblique18pt7b
-#define FMO24 &FreeMonoOblique24pt7b
-
-#define FMBO9 &FreeMonoBoldOblique9pt7b
-#define FMBO12 &FreeMonoBoldOblique12pt7b
-#define FMBO18 &FreeMonoBoldOblique18pt7b
-#define FMBO24 &FreeMonoBoldOblique24pt7b
-
-#define FSS9 &FreeSans9pt7b
-#define FSS12 &FreeSans12pt7b
-#define FSS18 &FreeSans18pt7b
-#define FSS24 &FreeSans24pt7b
-
-#define FSSB9 &FreeSansBold9pt7b
-#define FSSB12 &FreeSansBold12pt7b
-#define FSSB18 &FreeSansBold18pt7b
-#define FSSB24 &FreeSansBold24pt7b
-
-#define FSSO9 &FreeSansOblique9pt7b
-#define FSSO12 &FreeSansOblique12pt7b
-#define FSSO18 &FreeSansOblique18pt7b
-#define FSSO24 &FreeSansOblique24pt7b
-
-#define FSSBO9 &FreeSansBoldOblique9pt7b
-#define FSSBO12 &FreeSansBoldOblique12pt7b
-#define FSSBO18 &FreeSansBoldOblique18pt7b
-#define FSSBO24 &FreeSansBoldOblique24pt7b
-
-#define FS9 &FreeSerif9pt7b
-#define FS12 &FreeSerif12pt7b
-#define FS18 &FreeSerif18pt7b
-#define FS24 &FreeSerif24pt7b
-
-#define FSI9 &FreeSerifItalic9pt7b
-#define FSI12 &FreeSerifItalic12pt7b
-#define FSI19 &FreeSerifItalic18pt7b
-#define FSI24 &FreeSerifItalic24pt7b
-
-#define FSB9 &FreeSerifBold9pt7b
-#define FSB12 &FreeSerifBold12pt7b
-#define FSB18 &FreeSerifBold18pt7b
-#define FSB24 &FreeSerifBold24pt7b
-
-#define FSBI9 &FreeSerifBoldItalic9pt7b
-#define FSBI12 &FreeSerifBoldItalic12pt7b
-#define FSBI18 &FreeSerifBoldItalic18pt7b
-#define FSBI24 &FreeSerifBoldItalic24pt7b
-
-#define FF0 NULL //ff0 reserved for GLCD
-#define FF1 &FreeMono9pt7b
-#define FF2 &FreeMono12pt7b
-#define FF3 &FreeMono18pt7b
-#define FF4 &FreeMono24pt7b
-
-#define FF5 &FreeMonoBold9pt7b
-#define FF6 &FreeMonoBold12pt7b
-#define FF7 &FreeMonoBold18pt7b
-#define FF8 &FreeMonoBold24pt7b
-
-#define FF9 &FreeMonoOblique9pt7b
-#define FF10 &FreeMonoOblique12pt7b
-#define FF11 &FreeMonoOblique18pt7b
-#define FF12 &FreeMonoOblique24pt7b
-
-#define FF13 &FreeMonoBoldOblique9pt7b
-#define FF14 &FreeMonoBoldOblique12pt7b
-#define FF15 &FreeMonoBoldOblique18pt7b
-#define FF16 &FreeMonoBoldOblique24pt7b
-
-#define FF17 &FreeSans9pt7b
-#define FF18 &FreeSans12pt7b
-#define FF19 &FreeSans18pt7b
-#define FF20 &FreeSans24pt7b
-
-#define FF21 &FreeSansBold9pt7b
-#define FF22 &FreeSansBold12pt7b
-#define FF23 &FreeSansBold18pt7b
-#define FF24 &FreeSansBold24pt7b
-
-#define FF25 &FreeSansOblique9pt7b
-#define FF26 &FreeSansOblique12pt7b
-#define FF27 &FreeSansOblique18pt7b
-#define FF28 &FreeSansOblique24pt7b
-
-#define FF29 &FreeSansBoldOblique9pt7b
-#define FF30 &FreeSansBoldOblique12pt7b
-#define FF31 &FreeSansBoldOblique18pt7b
-#define FF32 &FreeSansBoldOblique24pt7b
-
-#define FF33 &FreeSerif9pt7b
-#define FF34 &FreeSerif12pt7b
-#define FF35 &FreeSerif18pt7b
-#define FF36 &FreeSerif24pt7b
-
-#define FF37 &FreeSerifItalic9pt7b
-#define FF38 &FreeSerifItalic12pt7b
-#define FF39 &FreeSerifItalic18pt7b
-#define FF40 &FreeSerifItalic24pt7b
-
-#define FF41 &FreeSerifBold9pt7b
-#define FF42 &FreeSerifBold12pt7b
-#define FF43 &FreeSerifBold18pt7b
-#define FF44 &FreeSerifBold24pt7b
-
-#define FF45 &FreeSerifBoldItalic9pt7b
-#define FF46 &FreeSerifBoldItalic12pt7b
-#define FF47 &FreeSerifBoldItalic18pt7b
-#define FF48 &FreeSerifBoldItalic24pt7b
-
-// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-// Now we define "s"tring versions for easy printing of the font name so:
-//   tft.println(sFF5);
-// will print
-//   Mono bold 9
-// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-
-#define sFF0 "GLCD"
-#define sTT1 "Tom Thumb"
-#define sFF1 "Mono 9"
-#define sFF2 "Mono 12"
-#define sFF3 "Mono 18"
-#define sFF4 "Mono 24"
-
-#define sFF5 "Mono bold 9"
-#define sFF6 "Mono bold 12"
-#define sFF7 "Mono bold 18"
-#define sFF8 "Mono bold 24"
-
-#define sFF9 "Mono oblique 9"
-#define sFF10 "Mono oblique 12"
-#define sFF11 "Mono oblique 18"
-#define sFF12 "Mono oblique 24"
-
-#define sFF13 "Mono bold oblique 9"
-#define sFF14 "Mono bold oblique 12"
-#define sFF15 "Mono bold oblique 18"
-#define sFF16 "Mono bold oblique 24" // Full text line is too big for 480 pixel wide screen
-
-#define sFF17 "Sans 9"
-#define sFF18 "Sans 12"
-#define sFF19 "Sans 18"
-#define sFF20 "Sans 24"
-
-#define sFF21 "Sans bold 9"
-#define sFF22 "Sans bold 12"
-#define sFF23 "Sans bold 18"
-#define sFF24 "Sans bold 24"
-
-#define sFF25 "Sans oblique 9"
-#define sFF26 "Sans oblique 12"
-#define sFF27 "Sans oblique 18"
-#define sFF28 "Sans oblique 24"
-
-#define sFF29 "Sans bold oblique 9"
-#define sFF30 "Sans bold oblique 12"
-#define sFF31 "Sans bold oblique 18"
-#define sFF32 "Sans bold oblique 24"
-
-#define sFF33 "Serif 9"
-#define sFF34 "Serif 12"
-#define sFF35 "Serif 18"
-#define sFF36 "Serif 24"
-
-#define sFF37 "Serif italic 9"
-#define sFF38 "Serif italic 12"
-#define sFF39 "Serif italic 18"
-#define sFF40 "Serif italic 24"
-
-#define sFF41 "Serif bold 9"
-#define sFF42 "Serif bold 12"
-#define sFF43 "Serif bold 18"
-#define sFF44 "Serif bold 24"
-
-#define sFF45 "Serif bold italic 9"
-#define sFF46 "Serif bold italic 12"
-#define sFF47 "Serif bold italic 18"
-#define sFF48 "Serif bold italic 24"
-
-#else // LOAD_tftFF not defined so setup defaults to prevent error messages
-
-// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-// Free fonts are not loaded in User_Setup.h so we must define all as font 1
-// to prevent compile error messages
-// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-
-#define GFXFF 1
-#define GLCD  1
-#define FONT2 2
-#define FONT4 4
-#define FONT6 6
-#define FONT7 7
-#define FONT8 8
-
-#define FF0 1
-#define FF1 1
-#define FF2 1
-#define FF3 1
-#define FF4 1
-#define FF5 1
-#define FF6 1
-#define FF7 1
-#define FF8 1
-#define FF9 1
-#define FF10 1
-#define FF11 1
-#define FF12 1
-#define FF13 1
-#define FF14 1
-#define FF15 1
-#define FF16 1
-#define FF17 1
-#define FF18 1
-#define FF19 1
-#define FF20 1
-#define FF21 1
-#define FF22 1
-#define FF23 1
-#define FF24 1
-#define FF25 1
-#define FF26 1
-#define FF27 1
-#define FF28 1
-#define FF29 1
-#define FF30 1
-#define FF31 1
-#define FF32 1
-#define FF33 1
-#define FF34 1
-#define FF35 1
-#define FF36 1
-#define FF37 1
-#define FF38 1
-#define FF39 1
-#define FF40 1
-#define FF41 1
-#define FF42 1
-#define FF43 1
-#define FF44 1
-#define FF45 1
-#define FF46 1
-#define FF47 1
-#define FF48 1
-
-#define FM9  1
-#define FM12 1
-#define FM18 1
-#define FM24 1
-
-#define FMB9  1
-#define FMB12 1
-#define FMB18 1
-#define FMB24 1
-
-#define FMO9  1
-#define FMO12 1
-#define FMO18 1
-#define FMO24 1
-
-#define FMBO9  1
-#define FMBO12 1
-#define FMBO18 1
-#define FMBO24 1
-
-#define FSS9  1
-#define FSS12 1
-#define FSS18 1
-#define FSS24 1
-
-#define FSSB9  1
-#define FSSB12 1
-#define FSSB18 1
-#define FSSB24 1
-
-#define FSSO9  1
-#define FSSO12 1
-#define FSSO18 1
-#define FSSO24 1
-
-#define FSSBO9  1
-#define FSSBO12 1
-#define FSSBO18 1
-#define FSSBO24 1
-
-#define FS9  1
-#define FS12 1
-#define FS18 1
-#define FS24 1
-
-#define FSI9  1
-#define FSI12 1
-#define FSI19 1
-#define FSI24 1
-
-#define FSB9  1
-#define FSB12 1
-#define FSB18 1
-#define FSB24 1
-
-#define FSBI9  1
-#define FSBI12 1
-#define FSBI18 1
-#define FSBI24 1
-
-#endif // LOAD_tftFF

examples/GUI Widgets/Graphs/Graph_demo_1/Graph_demo_1.ino

@@ -1,80 +0,0 @@
-// Demonstrate graph widget functions with a single trace instance
-// One trace can be drawn at a time with one trace instance
-
-// Requires widget library here:
-// https://github.com/Bodmer/TFT_eWidget
-
-#include <TFT_eSPI.h>
-TFT_eSPI tft = TFT_eSPI();
-
-#include <TFT_eWidget.h>               // Widget library
-
-GraphWidget gr = GraphWidget(&tft);    // Graph widget gr instance with pointer to tft
-TraceWidget tr = TraceWidget(&gr);     // Graph trace tr with pointer to gr
-
-const float gxLow  = 0.0;
-const float gxHigh = 100.0;
-const float gyLow  = -512.0;
-const float gyHigh = 512.0;
-
-void setup() {
-  Serial.begin(115200);
-
-  tft.begin();
-  tft.setRotation(3);
-  tft.fillScreen(TFT_BLACK);
-
-  // Graph area is 200 pixels wide, 150 pixels high, dark grey background
-  gr.createGraph(200, 150, tft.color565(5, 5, 5));
-
-  // x scale units is from 0 to 100, y scale units is -512 to 512
-  gr.setGraphScale(gxLow, gxHigh, gyLow, gyHigh);
-
-  // X grid starts at 0 with lines every 20 x-scale units
-  // Y grid starts at -512 with lines every 64 y-scale units
-  // blue grid
-  gr.setGraphGrid(gxLow, 20.0, gyLow, 64.0, TFT_BLUE);
-
-  // Draw empty graph, top left corner at pixel coordinate 40,10 on TFT
-  gr.drawGraph(40, 10);
-
-  // Start a trace with using red, trace points are in x and y scale units
-  // In this example a horizontal line is drawn
-  tr.startTrace(TFT_RED);
-  // Add a trace point at 0.0,0.0 on graph
-  tr.addPoint(0.0, 0.0);
-  // Add another point at 100.0, 0.0 this will be joined via line to the last point added
-  tr.addPoint(100.0, 0.0);
-
-  // Start a new trace with using white
-  tr.startTrace(TFT_WHITE);
-}
-
-void loop() {
-  static uint32_t plotTime = millis();
-  static float gx = 0.0, gy = 0.0;
-  static float delta = 10.0;
-
-  // Create a new plot point every 100ms
-  if (millis() - plotTime >= 100) {
-    plotTime = millis();
-
-    // Add a plot, first point in a trace will be a single pixel (if within graph area)
-    tr.addPoint(gx, gy);
-    gx += 1.0;
-    if (gy >  500.0) delta = -10.0;
-    if (gy < -500.0) delta =  10.0;
-    gy += delta;
-
-    // If the end of the graph x ais is reached start a new trace at 0.0,0.0
-    if (gx > gxHigh) {
-      gx = 0.0;
-      gy = 0.0;
-
-      // Draw empty graph at 40,10 on display to clear old one
-      gr.drawGraph(40, 10);
-      // Start new trace
-      tr.startTrace(TFT_GREEN);
-    }
-  }
-}

examples/GUI Widgets/Graphs/Graph_demo_2/Graph_demo_2.ino

@@ -1,105 +0,0 @@
-// Demonstrate graph widget functions with two independant trace instances
-// Multiple traces can be drawn at a time with multiple trace instances
-// Note: Traces are automatically clipped at graph boundaries by widget library
-
-// Requires widget library here:
-// https://github.com/Bodmer/TFT_eWidget
-
-#include <TFT_eSPI.h>
-TFT_eSPI tft = TFT_eSPI();
-
-#include <TFT_eWidget.h>               // Widget library
-
-GraphWidget gr = GraphWidget(&tft);    // Graph widget
-
-// Traces are drawn on tft using graph instance
-TraceWidget tr1 = TraceWidget(&gr);    // Graph trace 1
-TraceWidget tr2 = TraceWidget(&gr);    // Graph trace 2
-
-void setup() {
-  Serial.begin(115200);
-  delay(5000);
-  tft.begin();
-  tft.setRotation(3);
-  tft.fillScreen(TFT_BLACK);
-
-  // Graph area is 200 pixels wide, 150 high, dark grey background
-  gr.createGraph(200, 150, tft.color565(5, 5, 5));
-
-  // x scale units is from 0 to 100, y scale units is -50 to 50
-  gr.setGraphScale(0.0, 100.0, -50.0, 50.0);
-
-  // X grid starts at 0 with lines every 10 x-scale units
-  // Y grid starts at -50 with lines every 25 y-scale units
-  // blue grid
-  gr.setGraphGrid(0.0, 10.0, -50.0, 25.0, TFT_BLUE);
-
-  // Draw empty graph, top left corner at 40,10 on TFT
-  gr.drawGraph(40, 10);
-
-  // Start a trace with using red and another with green
-  tr1.startTrace(TFT_RED);
-  tr2.startTrace(TFT_GREEN);
-
-  // Add points on graph to trace 1 using graph scale factors
-  tr1.addPoint(0.0, 0.0);
-  tr1.addPoint(100.0, 0.0);
-
-  // Add points on graph to trace 2 using graph scale factors
-  // Points are off graph so the plotted line is clipped to graph area
-  tr2.addPoint(0.0, -100.0);
-  tr2.addPoint(100.0, 100.0);
-
-  // Get x,y pixel coordinates of any scaled point on graph
-  // and ring that point.
-  tft.drawCircle(gr.getPointX(50.0), gr.getPointY(0.0), 5, TFT_MAGENTA);
-
-  // Draw the x axis scale
-  tft.setTextDatum(TC_DATUM); // Top centre text datum
-  tft.drawNumber(0, gr.getPointX(0.0), gr.getPointY(-50.0) + 3);
-  tft.drawNumber(50, gr.getPointX(50.0), gr.getPointY(-50.0) + 3);
-  tft.drawNumber(100, gr.getPointX(100.0), gr.getPointY(-50.0) + 3);
-
-  // Draw the y axis scale
-  tft.setTextDatum(MR_DATUM); // Middle right text datum
-  tft.drawNumber(-50, gr.getPointX(0.0), gr.getPointY(-50.0));
-  tft.drawNumber(0, gr.getPointX(0.0), gr.getPointY(0.0));
-  tft.drawNumber(50, gr.getPointX(0.0), gr.getPointY(50.0));
-
-  // Restart traces with new colours
-  tr1.startTrace(TFT_WHITE);
-  tr2.startTrace(TFT_YELLOW);
-}
-
-void loop() {
-  static uint32_t plotTime = millis();
-  static float gx = 0.0, gy = 0.0;
-  static float delta = 7.0;
-
-  // Sample periodically
-  if (millis() - plotTime >= 100) {
-    plotTime = millis();
-
-    // Add a new point on each trace
-    tr1.addPoint(gx, gy);
-    tr2.addPoint(gx, gy/2.0); // half y amplitude
-
-    // Create next plot point
-    gx += 1.0;
-    gy += delta;
-    if (gy >  70.0) { delta = -7.0; gy =  70.0; }
-    if (gy < -70.0) { delta =  7.0; gy = -70.0; }
-
-    // If the end of the graph is reached start 2 new traces
-    if (gx > 100.0) {
-      gx = 0.0;
-      gy = 0.0;
-
-      // Draw empty graph at 40,10 on display
-      gr.drawGraph(40, 10);
-      // Start new trace
-      tr1.startTrace(TFT_GREEN);
-      tr2.startTrace(TFT_YELLOW);
-    }
-  }
-}

examples/GUI Widgets/Meters/Analogue_meters/Analogue_meters.ino

@@ -1,87 +0,0 @@
-/*
-  Example animated analogue meters
-
-  Needs Font 2 (also Font 4 if using large scale label)
-
-  Make sure all the display driver and pin connections are correct by
-  editing the User_Setup.h file in the TFT_eSPI library folder.
-
-  #########################################################################
-  ###### DON'T FORGET TO UPDATE THE User_Setup.h FILE IN THE LIBRARY ######
-  #########################################################################
-
-  Requires widget library here:
-  https://github.com/Bodmer/TFT_eWidget
-*/
-
-#include <TFT_eSPI.h>     // Hardware-specific library
-#include <TFT_eWidget.h>  // Widget library
-
-TFT_eSPI tft  = TFT_eSPI();      // Invoke custom library
-
-MeterWidget   amps  = MeterWidget(&tft);
-MeterWidget   volts = MeterWidget(&tft);
-MeterWidget   ohms  = MeterWidget(&tft);
-
-#define LOOP_PERIOD 35 // Display updates every 35 ms
-
-void setup(void) 
-{
-  tft.init();
-  tft.setRotation(0);
-  Serial.begin(115200); // For debug
-  
-  
-  // Colour zones are set as a start and end percentage of full scale (0-100)
-  // If start and end of a colour zone are the same then that colour is not used
-  //            --Red--  -Org-   -Yell-  -Grn-
-  amps.setZones(75, 100, 50, 75, 25, 50, 0, 25); // Example here red starts at 75% and ends at 100% of full scale
-  // Meter is 239 pixels wide and 126 pixels high
-  amps.analogMeter(0, 0, 2.0, "mA", "0", "0.5", "1.0", "1.5", "2.0");    // Draw analogue meter at 0, 0
-
-  // Colour draw order is red, orange, yellow, green. So red can be full scale with green drawn
-  // last on top to indicate a "safe" zone.
-  //             -Red-   -Org-  -Yell-  -Grn-
-  volts.setZones(0, 100, 25, 75, 0, 0, 40, 60);
-  volts.analogMeter(0, 128, 10.0, "V", "0", "2.5", "5", "7.5", "10"); // Draw analogue meter at 0, 128
-
-  // No coloured zones if not defined
-  ohms.analogMeter(0, 256, 100, "R", "0", "", "50", "", "100"); // Draw analogue meter at 0, 128
-}
-
-
-void loop() 
-{
-  static int d = 0;
-  static uint32_t updateTime = 0;  
-
-  if (millis() - updateTime >= LOOP_PERIOD) 
-  {
-    updateTime = millis();
-
-    d += 4; if (d > 360) d = 0;
-
-    // Create a Sine wave for testing, value is in range 0 - 100
-    float value = 50.0 + 50.0 * sin((d + 0) * 0.0174532925);
-
-    float current;
-    current = mapValue(value, (float)0.0, (float)100.0, (float)0.0, (float)2.0);
-    //Serial.print("I = "); Serial.print(current);
-    amps.updateNeedle(current, 0);
-
-    float voltage;
-    voltage = mapValue(value, (float)0.0, (float)100.0, (float)0.0, (float)10.0);
-    //Serial.print(", V = "); Serial.println(voltage);
-    volts.updateNeedle(voltage, 0);
-    
-    float resistance;
-    resistance = mapValue(value, (float)0.0, (float)100.0, (float)0.0, (float)100.0);
-    //Serial.print(", R = "); Serial.println(resistance);
-    ohms.updateNeedle(resistance, 0);
-  }
-}
-
-float mapValue(float ip, float ipmin, float ipmax, float tomin, float tomax)
-{
-  return tomin + (((tomax - tomin) * (ip - ipmin))/ (ipmax - ipmin));
-}

examples/GUI Widgets/Sliders/Slider_demo/Free_Fonts.h

@@ -1,377 +0,0 @@
-// Attach this header file to your sketch to use the GFX Free Fonts. You can write
-// sketches without it, but it makes referencing them easier.
-
-// This calls up ALL the fonts but they only get loaded if you actually
-// use them in your sketch.
-//
-// No changes are needed to this header file unless new fonts are added to the
-// library "Fonts/GFXFF" folder.
-//
-// To save a lot of typing long names, each font can easily be referenced in the
-// sketch in three ways, either with:
-//
-//    1. Font file name with the & in front such as &FreeSansBoldOblique24pt7b
-//       an example being:
-//
-//       tft.setFreeFont(&FreeSansBoldOblique24pt7b);
-//
-//    2. FF# where # is a number determined by looking at the list below
-//       an example being:
-//
-//       tft.setFreeFont(FF32);
-//
-//    3. An abbreviation of the file name. Look at the list below to see
-//       the abbreviations used, for example:
-//
-//       tft.setFreeFont(FSSBO24)
-//
-//       Where the letters mean:
-//       F = Free font
-//       M = Mono
-//      SS = Sans Serif (double S to distinguish is form serif fonts)
-//       S = Serif
-//       B = Bold
-//       O = Oblique (letter O not zero)
-//       I = Italic
-//       # =  point size, either 9, 12, 18 or 24
-//
-//  Setting the font to NULL will select the GLCD font:
-//
-//      tft.setFreeFont(NULL); // Set font to GLCD
-
-#define LOAD_tftFF
-
-#ifdef LOAD_tftFF // Only include the fonts if LOAD_tftFF is defined in User_Setup.h
-
-// Use these when printing or drawing text in GLCD and high rendering speed fonts
-#define GFXFF 1
-#define GLCD  0
-#define FONT2 2
-#define FONT4 4
-#define FONT6 6
-#define FONT7 7
-#define FONT8 8
-
-// Use the following when calling setFont()
-//
-// Reserved for GLCD font  // FF0
-//
-
-#define TT1 &TomThumb
-
-#define FM9 &FreeMono9pt7b
-#define FM12 &FreeMono12pt7b
-#define FM18 &FreeMono18pt7b
-#define FM24 &FreeMono24pt7b
-
-#define FMB9 &FreeMonoBold9pt7b
-#define FMB12 &FreeMonoBold12pt7b
-#define FMB18 &FreeMonoBold18pt7b
-#define FMB24 &FreeMonoBold24pt7b
-
-#define FMO9 &FreeMonoOblique9pt7b
-#define FMO12 &FreeMonoOblique12pt7b
-#define FMO18 &FreeMonoOblique18pt7b
-#define FMO24 &FreeMonoOblique24pt7b
-
-#define FMBO9 &FreeMonoBoldOblique9pt7b
-#define FMBO12 &FreeMonoBoldOblique12pt7b
-#define FMBO18 &FreeMonoBoldOblique18pt7b
-#define FMBO24 &FreeMonoBoldOblique24pt7b
-
-#define FSS9 &FreeSans9pt7b
-#define FSS12 &FreeSans12pt7b
-#define FSS18 &FreeSans18pt7b
-#define FSS24 &FreeSans24pt7b
-
-#define FSSB9 &FreeSansBold9pt7b
-#define FSSB12 &FreeSansBold12pt7b
-#define FSSB18 &FreeSansBold18pt7b
-#define FSSB24 &FreeSansBold24pt7b
-
-#define FSSO9 &FreeSansOblique9pt7b
-#define FSSO12 &FreeSansOblique12pt7b
-#define FSSO18 &FreeSansOblique18pt7b
-#define FSSO24 &FreeSansOblique24pt7b
-
-#define FSSBO9 &FreeSansBoldOblique9pt7b
-#define FSSBO12 &FreeSansBoldOblique12pt7b
-#define FSSBO18 &FreeSansBoldOblique18pt7b
-#define FSSBO24 &FreeSansBoldOblique24pt7b
-
-#define FS9 &FreeSerif9pt7b
-#define FS12 &FreeSerif12pt7b
-#define FS18 &FreeSerif18pt7b
-#define FS24 &FreeSerif24pt7b
-
-#define FSI9 &FreeSerifItalic9pt7b
-#define FSI12 &FreeSerifItalic12pt7b
-#define FSI19 &FreeSerifItalic18pt7b
-#define FSI24 &FreeSerifItalic24pt7b
-
-#define FSB9 &FreeSerifBold9pt7b
-#define FSB12 &FreeSerifBold12pt7b
-#define FSB18 &FreeSerifBold18pt7b
-#define FSB24 &FreeSerifBold24pt7b
-
-#define FSBI9 &FreeSerifBoldItalic9pt7b
-#define FSBI12 &FreeSerifBoldItalic12pt7b
-#define FSBI18 &FreeSerifBoldItalic18pt7b
-#define FSBI24 &FreeSerifBoldItalic24pt7b
-
-#define FF0 NULL //ff0 reserved for GLCD
-#define FF1 &FreeMono9pt7b
-#define FF2 &FreeMono12pt7b
-#define FF3 &FreeMono18pt7b
-#define FF4 &FreeMono24pt7b
-
-#define FF5 &FreeMonoBold9pt7b
-#define FF6 &FreeMonoBold12pt7b
-#define FF7 &FreeMonoBold18pt7b
-#define FF8 &FreeMonoBold24pt7b
-
-#define FF9 &FreeMonoOblique9pt7b
-#define FF10 &FreeMonoOblique12pt7b
-#define FF11 &FreeMonoOblique18pt7b
-#define FF12 &FreeMonoOblique24pt7b
-
-#define FF13 &FreeMonoBoldOblique9pt7b
-#define FF14 &FreeMonoBoldOblique12pt7b
-#define FF15 &FreeMonoBoldOblique18pt7b
-#define FF16 &FreeMonoBoldOblique24pt7b
-
-#define FF17 &FreeSans9pt7b
-#define FF18 &FreeSans12pt7b
-#define FF19 &FreeSans18pt7b
-#define FF20 &FreeSans24pt7b
-
-#define FF21 &FreeSansBold9pt7b
-#define FF22 &FreeSansBold12pt7b
-#define FF23 &FreeSansBold18pt7b
-#define FF24 &FreeSansBold24pt7b
-
-#define FF25 &FreeSansOblique9pt7b
-#define FF26 &FreeSansOblique12pt7b
-#define FF27 &FreeSansOblique18pt7b
-#define FF28 &FreeSansOblique24pt7b
-
-#define FF29 &FreeSansBoldOblique9pt7b
-#define FF30 &FreeSansBoldOblique12pt7b
-#define FF31 &FreeSansBoldOblique18pt7b
-#define FF32 &FreeSansBoldOblique24pt7b
-
-#define FF33 &FreeSerif9pt7b
-#define FF34 &FreeSerif12pt7b
-#define FF35 &FreeSerif18pt7b
-#define FF36 &FreeSerif24pt7b
-
-#define FF37 &FreeSerifItalic9pt7b
-#define FF38 &FreeSerifItalic12pt7b
-#define FF39 &FreeSerifItalic18pt7b
-#define FF40 &FreeSerifItalic24pt7b
-
-#define FF41 &FreeSerifBold9pt7b
-#define FF42 &FreeSerifBold12pt7b
-#define FF43 &FreeSerifBold18pt7b
-#define FF44 &FreeSerifBold24pt7b
-
-#define FF45 &FreeSerifBoldItalic9pt7b
-#define FF46 &FreeSerifBoldItalic12pt7b
-#define FF47 &FreeSerifBoldItalic18pt7b
-#define FF48 &FreeSerifBoldItalic24pt7b
-
-// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-// Now we define "s"tring versions for easy printing of the font name so:
-//   tft.println(sFF5);
-// will print
-//   Mono bold 9
-// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-
-#define sFF0 "GLCD"
-#define sTT1 "Tom Thumb"
-#define sFF1 "Mono 9"
-#define sFF2 "Mono 12"
-#define sFF3 "Mono 18"
-#define sFF4 "Mono 24"
-
-#define sFF5 "Mono bold 9"
-#define sFF6 "Mono bold 12"
-#define sFF7 "Mono bold 18"
-#define sFF8 "Mono bold 24"
-
-#define sFF9 "Mono oblique 9"
-#define sFF10 "Mono oblique 12"
-#define sFF11 "Mono oblique 18"
-#define sFF12 "Mono oblique 24"
-
-#define sFF13 "Mono bold oblique 9"
-#define sFF14 "Mono bold oblique 12"
-#define sFF15 "Mono bold oblique 18"
-#define sFF16 "Mono bold oblique 24" // Full text line is too big for 480 pixel wide screen
-
-#define sFF17 "Sans 9"
-#define sFF18 "Sans 12"
-#define sFF19 "Sans 18"
-#define sFF20 "Sans 24"
-
-#define sFF21 "Sans bold 9"
-#define sFF22 "Sans bold 12"
-#define sFF23 "Sans bold 18"
-#define sFF24 "Sans bold 24"
-
-#define sFF25 "Sans oblique 9"
-#define sFF26 "Sans oblique 12"
-#define sFF27 "Sans oblique 18"
-#define sFF28 "Sans oblique 24"
-
-#define sFF29 "Sans bold oblique 9"
-#define sFF30 "Sans bold oblique 12"
-#define sFF31 "Sans bold oblique 18"
-#define sFF32 "Sans bold oblique 24"
-
-#define sFF33 "Serif 9"
-#define sFF34 "Serif 12"
-#define sFF35 "Serif 18"
-#define sFF36 "Serif 24"
-
-#define sFF37 "Serif italic 9"
-#define sFF38 "Serif italic 12"
-#define sFF39 "Serif italic 18"
-#define sFF40 "Serif italic 24"
-
-#define sFF41 "Serif bold 9"
-#define sFF42 "Serif bold 12"
-#define sFF43 "Serif bold 18"
-#define sFF44 "Serif bold 24"
-
-#define sFF45 "Serif bold italic 9"
-#define sFF46 "Serif bold italic 12"
-#define sFF47 "Serif bold italic 18"
-#define sFF48 "Serif bold italic 24"
-
-#else // LOAD_tftFF not defined so setup defaults to prevent error messages
-
-// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-// Free fonts are not loaded in User_Setup.h so we must define all as font 1
-// to prevent compile error messages
-// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-
-#define GFXFF 1
-#define GLCD  1
-#define FONT2 2
-#define FONT4 4
-#define FONT6 6
-#define FONT7 7
-#define FONT8 8
-
-#define FF0 1
-#define FF1 1
-#define FF2 1
-#define FF3 1
-#define FF4 1
-#define FF5 1
-#define FF6 1
-#define FF7 1
-#define FF8 1
-#define FF9 1
-#define FF10 1
-#define FF11 1
-#define FF12 1
-#define FF13 1
-#define FF14 1
-#define FF15 1
-#define FF16 1
-#define FF17 1
-#define FF18 1
-#define FF19 1
-#define FF20 1
-#define FF21 1
-#define FF22 1
-#define FF23 1
-#define FF24 1
-#define FF25 1
-#define FF26 1
-#define FF27 1
-#define FF28 1
-#define FF29 1
-#define FF30 1
-#define FF31 1
-#define FF32 1
-#define FF33 1
-#define FF34 1
-#define FF35 1
-#define FF36 1
-#define FF37 1
-#define FF38 1
-#define FF39 1
-#define FF40 1
-#define FF41 1
-#define FF42 1
-#define FF43 1
-#define FF44 1
-#define FF45 1
-#define FF46 1
-#define FF47 1
-#define FF48 1
-
-#define FM9  1
-#define FM12 1
-#define FM18 1
-#define FM24 1
-
-#define FMB9  1
-#define FMB12 1
-#define FMB18 1
-#define FMB24 1
-
-#define FMO9  1
-#define FMO12 1
-#define FMO18 1
-#define FMO24 1
-
-#define FMBO9  1
-#define FMBO12 1
-#define FMBO18 1
-#define FMBO24 1
-
-#define FSS9  1
-#define FSS12 1
-#define FSS18 1
-#define FSS24 1
-
-#define FSSB9  1
-#define FSSB12 1
-#define FSSB18 1
-#define FSSB24 1
-
-#define FSSO9  1
-#define FSSO12 1
-#define FSSO18 1
-#define FSSO24 1
-
-#define FSSBO9  1
-#define FSSBO12 1
-#define FSSBO18 1
-#define FSSBO24 1
-
-#define FS9  1
-#define FS12 1
-#define FS18 1
-#define FS24 1
-
-#define FSI9  1
-#define FSI12 1
-#define FSI19 1
-#define FSI24 1
-
-#define FSB9  1
-#define FSB12 1
-#define FSB18 1
-#define FSB24 1
-
-#define FSBI9  1
-#define FSBI12 1
-#define FSBI18 1
-#define FSBI24 1
-
-#endif // LOAD_tftFF

examples/GUI Widgets/Sliders/Slider_demo/Slider_demo.ino

@@ -1,201 +0,0 @@
-// Slider widget demo, requires display with touch screen
-
-// Requires widget library here:
-// https://github.com/Bodmer/TFT_eWidget
-
-#include "FS.h"
-
-#include "Free_Fonts.h" // Include the header file attached to this sketch
-
-#include <TFT_eSPI.h>
-#include <TFT_eWidget.h>           // Widget library
-
-TFT_eSPI tft = TFT_eSPI();
-TFT_eSprite knob = TFT_eSprite(&tft); // Sprite for the slide knob
-
-#define CALIBRATION_FILE "/TouchCalData1"
-#define REPEAT_CAL false
-
-SliderWidget s1 = SliderWidget(&tft, &knob);    // Slider 1 widget
-SliderWidget s2 = SliderWidget(&tft, &knob);    // Slider 2 widget
-
-
-void setup() {
-  Serial.begin(115200);
-  tft.begin();
-  tft.setRotation(0);
-  tft.fillScreen(TFT_BLACK);
-  tft.setFreeFont(FF18);
-
-  // Calibrate the touch screen and retrieve the scaling factors
-  if (REPEAT_CAL) {
-    touch_calibrate();
-    tft.fillScreen(TFT_BLACK);
-  }
-
-  // Create a parameter set for the slider
-  slider_t param;
-
-  // Slider slot parameters
-  param.slotWidth = 9;           // Note: ends of slot will be rounded and anti-aliased
-  param.slotLength = 200;        // Length includes rounded ends
-  param.slotColor = TFT_BLUE;    // Slot colour
-  param.slotBgColor = TFT_BLACK; // Slot background colour for anti-aliasing
-  param.orientation = H_SLIDER;  // sets it "true" for horizontal
-
-  // Slider control knob parameters (smooth rounded rectangle)
-  param.knobWidth = 15;          // Always along x axis
-  param.knobHeight = 25;         // Always along y axis
-  param.knobRadius = 5;          // Corner radius
-  param.knobColor = TFT_WHITE;   // Anti-aliased with slot backgound colour
-  param.knobLineColor = TFT_RED; // Colour of marker line (set to same as knobColor for no line)
-
-  // Slider range and movement speed
-  param.sliderLT = 0;            // Left side for horizontal, top for vertical slider
-  param.sliderRB = 100;          // Right side for horizontal, bottom for vertical slider
-  param.startPosition = 50;      // Start position for control knob
-  param.sliderDelay = 0;         // Microseconds per pixel movement delay (0 = no delay)
-
-  // Create slider using parameters and plot at 0,0
-  s1.drawSlider(0, 0, param);
-
-  // Show bounding box (1 pixel outside slider working area)
-  int16_t x, y;    // x and y can be negative
-  uint16_t w, h;   // Width and height
-  s1.getBoundingRect(&x, &y, &w, &h);     // Update x,y,w,h with bounding box
-  tft.drawRect(x, y, w, h, TFT_DARKGREY); // Draw rectangle outline
-/*
-  // Alternative discrete fns to create/modify same slider - but fn sequence is important...
-  s1.createSlider(9, 200, TFT_BLUE, TFT_BLACK, H_SLIDER);
-  s1.createKnob(15, 25, 5, TFT_WHITE, TFT_RED);
-  s1.setSliderScale(0, 100);
-  s1.drawSlider(0, 0);
-*/
-  delay(1000);
-  s1.setSliderPosition(50);
-  delay(1000);
-  s1.setSliderPosition(100);
-
-  // Update any parameters that are different for slider 2
-  param.slotWidth = 4;
-  param.orientation = V_SLIDER; // sets it "false" for vertical
-
-  param.knobWidth = 19;
-  param.knobHeight = 19;
-  param.knobRadius = 19/2; // Half w and h so creates a circle
-
-  param.sliderLT = 200;     // Top for vertical slider
-  param.sliderRB = 0;       // Bottom for vertical slider
-  param.sliderDelay = 2000; // 2ms per pixel movement delay (movement is blocking until complete)
-
-  s2.drawSlider(0, 50, param);
-
-  s2.getBoundingRect(&x, &y, &w, &h);
-  tft.drawRect(x, y, w, h, TFT_DARKGREY);
-/*
-  // Alternative discrete fns to create/modify same slider - but fn sequence is important...
-  s2.createSlider(4, 200, TFT_BLUE, TFT_BLACK, V_SLIDER);
-  s2.createKnob(19, 19, 9, TFT_WHITE, TFT_RED);
-  s2.setSliderScale(200, 0, 2000);
-  s2.drawSlider(0, 50);
-*/
-  // Move slider under software control
-  delay(1000);
-  s2.setSliderPosition(50);
-  delay(1000);
-  s2.setSliderPosition(100);
-
-}
-
-void loop() {
-  static uint32_t scanTime = millis();
-  uint16_t t_x = 9999, t_y = 9999; // To store the touch coordinates
-
-  // Scan for touch every 50ms
-  if (millis() - scanTime >= 20) {
-    // Pressed will be set true if there is a valid touch on the screen
-    if( tft.getTouch(&t_x, &t_y, 250) ) {
-      if (s1.checkTouch(t_x, t_y)) {
-        Serial.print("Slider 1 = "); Serial.println(s1.getSliderPosition());
-      }
-      if (s2.checkTouch(t_x, t_y)) {
-        Serial.print("Slider 2 = "); Serial.println(s2.getSliderPosition());
-      }
-    }
-    scanTime = millis();
-  }
-
-  //s1.moveTo(random(101));
-  //delay(250);
-  //s2.moveTo(random(101));
-  //delay(250);
-}
-
-
-
-
-
-void touch_calibrate()
-{
-  uint16_t calData[5];
-  uint8_t calDataOK = 0;
-
-  // check file system exists
-  if (!LittleFS.begin()) {
-    Serial.println("Formating file system");
-    LittleFS.format();
-    LittleFS.begin();
-  }
-
-  // check if calibration file exists and size is correct
-  if (LittleFS.exists(CALIBRATION_FILE)) {
-    if (REPEAT_CAL)
-    {
-      // Delete if we want to re-calibrate
-      LittleFS.remove(CALIBRATION_FILE);
-    }
-    else
-    {
-      File f = LittleFS.open(CALIBRATION_FILE, "r");
-      if (f) {
-        if (f.readBytes((char *)calData, 14) == 14)
-          calDataOK = 1;
-        f.close();
-      }
-    }
-  }
-
-  if (calDataOK && !REPEAT_CAL) {
-    // calibration data valid
-    tft.setTouch(calData);
-  } else {
-    // data not valid so recalibrate
-    tft.fillScreen(TFT_BLACK);
-    tft.setCursor(20, 0);
-    tft.setTextFont(2);
-    tft.setTextSize(1);
-    tft.setTextColor(TFT_WHITE, TFT_BLACK);
-
-    tft.println("Touch corners as indicated");
-
-    tft.setTextFont(1);
-    tft.println();
-
-    if (REPEAT_CAL) {
-      tft.setTextColor(TFT_RED, TFT_BLACK);
-      tft.println("Set REPEAT_CAL to false to stop this running again!");
-    }
-
-    tft.calibrateTouch(calData, TFT_MAGENTA, TFT_BLACK, 15);
-
-    tft.setTextColor(TFT_GREEN, TFT_BLACK);
-    tft.println("Calibration complete!");
-
-    // store data
-    File f = LittleFS.open(CALIBRATION_FILE, "w");
-    if (f) {
-      f.write((const unsigned char *)calData, 14);
-      f.close();
-    }
-  }
-}

examples/PNG Images/Flash_transparent_PNG/Flash_transparent_PNG.ino

@@ -1,86 +0,0 @@
-
-// This example renders a png file that is stored in a FLASH array
-// using the PNGdec library (available via library manager).
-
-// The example png is encoded as ARGB 8 bits per pixel with indexed colour
-// It was created using GIMP and has a transparent background area.
-
-// Image files can be converted to arrays using the tool here:
-// https://notisrac.github.io/FileToCArray/
-// To use this tool:
-//   1. Drag and drop PNG image file on "Browse..." button
-//   2. Tick box "Treat as binary"
-//   3. Click "Convert"
-//   4. Click "Save as file" and move the header file to sketch folder
-//      (alternatively use the "Copy to clipboard" and paste into a new tab)
-//   5. Open the sketch in IDE
-//   6. Include the header file containing the array (SpongeBob.h in this example)
-
-// Include the PNG decoder library, available via the IDE library manager
-#include <PNGdec.h>
-
-// Include image array
-#include "SpongeBob.h"
-
-PNG png; // PNG decoder instance
-
-#define MAX_IMAGE_WDITH 240 // Sets rendering line buffer lengths, adjust for your images
-
-// Include the TFT library - see https://github.com/Bodmer/TFT_eSPI for library information
-#include "SPI.h"
-#include <TFT_eSPI.h>              // Hardware-specific library
-TFT_eSPI tft = TFT_eSPI();         // Invoke custom library
-
-// Position variables must be global (PNGdec does not handle position coordinates)
-int16_t xpos = 0;
-int16_t ypos = 0;
-
-//====================================================================================
-//                                    Setup
-//====================================================================================
-void setup()
-{
-  Serial.begin(115200);
-  Serial.println("\n\n Using the PNGdec library");
-
-  // Initialise the TFT
-  tft.begin();
-  tft.fillScreen(TFT_BLACK);
-
-  Serial.println("\r\nInitialisation done.");
-}
-
-//====================================================================================
-//                                    Loop
-//====================================================================================
-void loop()
-{
-  uint16_t pngw = 0, pngh = 0; // To store width and height of image
-
-  int16_t rc = png.openFLASH((uint8_t *)bob, sizeof(bob), pngDraw);
-
-  if (rc == PNG_SUCCESS) {
-    Serial.println("Successfully png file");
-    pngw = png.getWidth();
-    pngh = png.getHeight();
-    Serial.printf("Image metrics: (%d x %d), %d bpp, pixel type: %d\n", pngw, pngh, png.getBpp(), png.getPixelType());
-
-    tft.startWrite();
-    uint32_t dt = millis();
-    rc = png.decode(NULL, 0);
-    tft.endWrite();
-    Serial.print(millis() - dt); Serial.println("ms");
-    tft.endWrite();
-
-    // png.close(); // Required for files, not needed for FLASH arrays
-  }
-
-  delay(250);
-
-  // Randomly change position
-  xpos = random(tft.width() - pngw);
-  ypos = random(tft.height() - pngh);
-
-  // Fill screen with a random colour at random intervals
-  if (random(100) < 20) tft.fillScreen(random(0x10000));
-}

examples/PNG Images/Flash_transparent_PNG/png_support.ino

@@ -1,18 +0,0 @@
-
-// PNGdec support functions
-
-//=========================================v==========================================
-//  pngDraw: Callback function to draw pixels to the display
-//====================================================================================
-// This function will be called during decoding of the png file to render each image
-// line to the TFT. PNGdec generates the image line and a 1bpp mask.
-void pngDraw(PNGDRAW *pDraw) {
-  uint16_t lineBuffer[MAX_IMAGE_WDITH];          // Line buffer for rendering
-  uint8_t  maskBuffer[1 + MAX_IMAGE_WDITH / 8];  // Mask buffer
-
-  png.getLineAsRGB565(pDraw, lineBuffer, PNG_RGB565_BIG_ENDIAN, 0xffffffff);
-
-  if (png.getAlphaMask(pDraw, maskBuffer, 255)) {
-    tft.pushMaskedImage(xpos, ypos + pDraw->y, pDraw->iWidth, 1, lineBuffer, maskBuffer);
-  }
-}

examples/Smooth Graphics/Anti-aliased_Clock/Anti-aliased_Clock.ino

@@ -129,7 +129,7 @@ static void renderFace(float t) {
   face.setTextDatum(MC_DATUM);
 
   // The background colour will be read during the character rendering
-  face.setTextColor(CLOCK_FG, CLOCK_BG);
+  face.setTextColor(CLOCK_FG);
 
   // Text offset adjustment
   constexpr uint32_t dialOffset = CLOCK_R - 10;
@@ -143,7 +143,7 @@ static void renderFace(float t) {
   }
 
   // Add text (could be digital time...)
-  face.setTextColor(LABEL_FG, CLOCK_BG);
+  face.setTextColor(LABEL_FG);
   face.drawString("TFT_eSPI", CLOCK_R, CLOCK_R * 0.75);
 
   // Draw minute hand

examples/Smooth Graphics/Anti-aliased_Clock/NTP_Time.h

@@ -11,10 +11,10 @@
 #include <Timezone.h>
 
 // Choose library to load
-#ifdef ARDUINO_ARCH_ESP8266
+#ifdef ESP8266
 // ESP8266
 #include <ESP8266WiFi.h>
-#elif (defined(ARDUINO_ARCH_MBED) || defined(ARDUINO_ARCH_RP2040)) && !defined(ARDUINO_RASPBERRY_PI_PICO_W)
+#elif defined(ARDUINO_ARCH_MBED) || defined(ARDUINO_ARCH_RP2040)
 // RP2040 Nano Connect
 #include <WiFiNINA.h>
 #else

examples/Smooth Graphics/Arc_meter_demo/Arc_meter_demo.ino

@@ -1,208 +0,0 @@
-// This is a test sketch being developed for a new arc based meter widget
-// The meter grahic is fully anti-aliased to avoid jaggy pixelated edges
-
-// For this demo randomly sized meters are drawn, cycled and redrawn a random size.
-// The meter is ramped up and down 0-100 and 100-0, then pauses before a new
-// random sized meter is drawn
-
-// If the radius is > 25 then the value is drawn in the middle
-
-// The outer ring of the meter uses the drawSmoothCircle function (which draws
-// a narrow full circle smooth arc)
-
-// Uncomment to draw meter digits and label text
-//#define DRAW_DIGITS
-
-// If DRAW_DIGITS is defined the OpenFontRender library must be loaded since
-// the sketch uses a scaleable TrueType font for the text and numerals.
-// https://github.com/Bodmer/OpenFontRender
-
-#define LOOP_DELAY 0 // This controls how frequently the meter is updated
-                     // for test purposes this is set to 0
-
-
-#include <SPI.h>
-#include <TFT_eSPI.h> // Hardware-specific library
-
-#ifdef DRAW_DIGITS
-  #include "NotoSans_Bold.h"
-  #include "OpenFontRender.h"
-  #define TTF_FONT NotoSans_Bold
-#endif
-
-
-TFT_eSPI tft = TFT_eSPI();            // Invoke custom library with default width and height
-TFT_eSprite spr = TFT_eSprite(&tft);  // Declare Sprite object "spr" with pointer to "tft" object
-
-#ifdef DRAW_DIGITS
-OpenFontRender ofr;
-#endif
-
-#define DARKER_GREY 0x18E3
-
-uint32_t runTime = 0;       // time for next update
-
-int reading = 0; // Value to be displayed
-int d = 0; // Variable used for the sinewave test waveform
-bool range_error = 0;
-int8_t ramp = 1;
-
-bool initMeter = true;
-
-void setup(void) {
-  Serial.begin(115200);
-  tft.begin();
-  tft.setRotation(1);
-  tft.fillScreen(TFT_NAVY);
-  //tft.setViewport(0, 0, 240, 320);
-}
-
-
-void loop() {
-  static uint16_t maxRadius = 0;
-  int8_t ramp = 1;
-  static uint8_t radius = 0;
-  static int16_t xpos = tft.width() / 2;
-  static int16_t ypos = tft.height() / 2;
-  bool newMeter = false;
-
-  if (maxRadius == 0) {
-    maxRadius = tft.width();
-    if (tft.height() < maxRadius) maxRadius = tft.height();
-    maxRadius = (0.6 * maxRadius) / 2;
-    radius = maxRadius;
-  }
-
-  // Choose a random meter radius for test purposes and draw for one range cycle
-  // Clear old meter first
-  tft.fillCircle(xpos, ypos, radius + 1, TFT_NAVY);
-  radius = random(20, maxRadius); // Random radius
-  initMeter = true;
-
-#ifdef DRAW_DIGITS
-  // Loading a font takes a few milliseconds, so for test purposes it is done outside the test loop
-  if (ofr.loadFont(TTF_FONT, sizeof(TTF_FONT))) {
-    Serial.println("Render initialize error");
-    return;
-  }
-#endif
-
-  initMeter = true;
-  reading = 0;
-  ramp = 1;
-  while (!newMeter) {
-    if (millis() - runTime >= LOOP_DELAY) {
-      runTime = millis();
-
-      reading += ramp;
-      ringMeter(xpos, ypos, radius, reading, "Watts"); // Draw analogue meter
-
-      if (reading > 99) ramp = -1;
-      if (reading <=  0) ramp = 1;
-
-      if (reading > 99) delay(1000);
-      if (reading <= 0) {
-        delay(1000);
-        newMeter = true;
-      }
-    }
-  }
-
-#ifdef DRAW_DIGITS
-  ofr.unloadFont(); // Recover space used by font metrics etc
-#endif
-}
-
-// #########################################################################
-//  Draw the meter on the screen, returns x coord of righthand side
-// #########################################################################
-// x,y is centre of meter, r the radius, val a number in range 0-100
-// units is the meter scale label
-void ringMeter(int x, int y, int r, int val, const char *units)
-{
-  static uint16_t last_angle = 30;
-
-  if (initMeter) {
-    initMeter = false;
-    last_angle = 30;
-    tft.fillCircle(x, y, r, DARKER_GREY);
-    tft.drawSmoothCircle(x, y, r, TFT_SILVER, DARKER_GREY);
-    uint16_t tmp = r - 3;
-    tft.drawArc(x, y, tmp, tmp - tmp / 5, last_angle, 330, TFT_BLACK, DARKER_GREY);
-  }
-
-  r -= 3;
-
-  // Range here is 0-100 so value is scaled to an angle 30-330
-  int val_angle = map(val, 0, 100, 30, 330);
-
-
-  if (last_angle != val_angle) {
-    // Could load the required font here
-    //if (ofr.loadFont(TTF_FONT, sizeof(TTF_FONT))) {
-    //  Serial.println("Render initialize error");
-    //  return;
-    //}
-#ifdef DRAW_DIGITS
-    ofr.setDrawer(spr); // Link renderer to sprite (font will be rendered in sprite spr)
-
-    // Add value in centre if radius is a reasonable size
-    if ( r >= 25 ) {
-      // This code gets the font dimensions in pixels to determine the required the sprite size
-      ofr.setFontSize((6 * r) / 4);
-      ofr.setFontColor(TFT_WHITE, DARKER_GREY);
-
-
-      // The OpenFontRender library only has simple print functions...
-      // Digit jiggle for chaging values often happens with proportional fonts because
-      // digit glyph width varies ( 1 narrower that 4 for example). This code prints up to
-      // 3 digits with even spacing.
-      // A few experiemntal fudge factors are used here to position the
-      // digits in the sprite...
-      // Create a sprite to draw the digits into
-      uint8_t w = ofr.getTextWidth("444");
-      uint8_t h = ofr.getTextHeight("4") + 4;
-      spr.createSprite(w, h + 2);
-      spr.fillSprite(DARKER_GREY); // (TFT_BLUE); // (DARKER_GREY);
-      char str_buf[8];         // Buffed for string
-      itoa (val, str_buf, 10); // Convert value to string (null terminated)
-      uint8_t ptr = 0;         // Pointer to a digit character
-      uint8_t dx = 4;          // x offfset for cursor position
-      if (val < 100) dx = ofr.getTextWidth("4") / 2; // Adjust cursor x for 2 digits
-      if (val < 10) dx = ofr.getTextWidth("4");      // Adjust cursor x for 1 digit
-      while ((uint8_t)str_buf[ptr] != 0) ptr++;      // Count the characters
-      while (ptr) {
-        ofr.setCursor(w - dx - w / 20, -h / 2.5);    // Offset cursor position in sprtie
-        ofr.rprintf(str_buf + ptr - 1);              // Draw a character
-        str_buf[ptr - 1] = 0;                        // Replace character with a null
-        dx += 1 + w / 3;                             // Adjust cursor for next character
-        ptr--;                                       // Decrement character pointer
-      }
-      spr.pushSprite(x - w / 2, y - h / 2); // Push sprite containing the val number
-      spr.deleteSprite();                   // Recover used memory
-
-      // Make the TFT the print destination, print the units label direct to the TFT
-      ofr.setDrawer(tft);
-      ofr.setFontColor(TFT_GOLD, DARKER_GREY);
-      ofr.setFontSize(r / 2.0);
-      ofr.setCursor(x, y + (r * 0.4));
-      ofr.cprintf("Watts");
-    }
-#endif
-
-    //ofr.unloadFont(); // Recover space used by font metrics etc
-
-    // Allocate a value to the arc thickness dependant of radius
-    uint8_t thickness = r / 5;
-    if ( r < 25 ) thickness = r / 3;
-
-    // Update the arc, only the zone between last_angle and new val_angle is updated
-    if (val_angle > last_angle) {
-      tft.drawArc(x, y, r, r - thickness, last_angle, val_angle, TFT_SKYBLUE, TFT_BLACK); // TFT_SKYBLUE random(0x10000)
-    }
-    else {
-      tft.drawArc(x, y, r, r - thickness, val_angle, last_angle, TFT_BLACK, DARKER_GREY);
-    }
-    last_angle = val_angle; // Store meter arc position for next redraw
-  }
-}

examples/Smooth Graphics/Arc_meter_demo/NotoSans_Bold.h

@@ -1,732 +0,0 @@
-// This font is a subset of the full font to reduce array size, ONLY these characters are present:
-// !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~
-
-// array size is 11592
-
-const unsigned char NotoSans_Bold[] PROGMEM  = {
-  0x00, 0x01, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x80, 0x00, 0x03, 0x00, 0x30, 0x63, 0x6d, 0x61, 0x70, 
-  0xe1, 0x4c, 0xf1, 0x46, 0x00, 0x00, 0x00, 0xbc, 0x00, 0x00, 0x0b, 0x6e, 0x67, 0x6c, 0x79, 0x66, 
-  0xab, 0x85, 0x48, 0xd5, 0x00, 0x00, 0x0c, 0x2c, 0x00, 0x00, 0x1b, 0xa0, 0x68, 0x65, 0x61, 0x64, 
-  0x26, 0x95, 0xb4, 0xa1, 0x00, 0x00, 0x27, 0xcc, 0x00, 0x00, 0x00, 0x36, 0x68, 0x68, 0x65, 0x61, 
-  0x03, 0x7f, 0x04, 0x08, 0x00, 0x00, 0x28, 0x04, 0x00, 0x00, 0x00, 0x24, 0x68, 0x6d, 0x74, 0x78, 
-  0xd0, 0xa7, 0x10, 0x76, 0x00, 0x00, 0x28, 0x28, 0x00, 0x00, 0x01, 0x7c, 0x6c, 0x6f, 0x63, 0x61, 
-  0x00, 0x05, 0x33, 0xed, 0x00, 0x00, 0x29, 0xa4, 0x00, 0x00, 0x01, 0x80, 0x6d, 0x61, 0x78, 0x70, 
-  0x07, 0x5d, 0x11, 0x1f, 0x00, 0x00, 0x2b, 0x24, 0x00, 0x00, 0x00, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x1a, 0x56, 0x03, 0x30, 0x00, 0x00, 0x2b, 0x44, 0x00, 0x00, 0x01, 0x7a, 0x4f, 0x53, 0x2f, 0x32, 
-  0x0f, 0x8e, 0x89, 0xf7, 0x00, 0x00, 0x2c, 0xc0, 0x00, 0x00, 0x00, 0x60, 0x70, 0x6f, 0x73, 0x74, 
-  0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x20, 0x00, 0x00, 0x00, 0x20, 0x70, 0x72, 0x65, 0x70, 
-  0x68, 0x06, 0x8c, 0x85, 0x00, 0x00, 0x2d, 0x40, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x03, 
-  0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0xe2, 
-  0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x07, 0xa8, 0x00, 0x04, 0x03, 0xc6, 0x00, 0x00, 0x00, 0xbe, 
-  0x00, 0x80, 0x00, 0x06, 0x00, 0x3e, 0x00, 0x21, 0x00, 0x22, 0x00, 0x23, 0x00, 0x24, 0x00, 0x25, 
-  0x00, 0x26, 0x00, 0x27, 0x00, 0x28, 0x00, 0x29, 0x00, 0x2a, 0x00, 0x2b, 0x00, 0x2c, 0x00, 0x2d, 
-  0x00, 0x2e, 0x00, 0x2f, 0x00, 0x30, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, 0x00, 0x34, 0x00, 0x35, 
-  0x00, 0x36, 0x00, 0x37, 0x00, 0x38, 0x00, 0x39, 0x00, 0x3a, 0x00, 0x3b, 0x00, 0x3c, 0x00, 0x3d, 
-  0x00, 0x3e, 0x00, 0x3f, 0x00, 0x40, 0x00, 0x41, 0x00, 0x42, 0x00, 0x43, 0x00, 0x44, 0x00, 0x45, 
-  0x00, 0x46, 0x00, 0x47, 0x00, 0x48, 0x00, 0x49, 0x00, 0x4a, 0x00, 0x4b, 0x00, 0x4c, 0x00, 0x4d, 
-  0x00, 0x4e, 0x00, 0x4f, 0x00, 0x50, 0x00, 0x51, 0x00, 0x52, 0x00, 0x53, 0x00, 0x54, 0x00, 0x55, 
-  0x00, 0x56, 0x00, 0x57, 0x00, 0x58, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x5b, 0x00, 0x5c, 0x00, 0x5d, 
-  0x00, 0x5e, 0x00, 0x5f, 0x00, 0x60, 0x00, 0x61, 0x00, 0x62, 0x00, 0x63, 0x00, 0x64, 0x00, 0x65, 
-  0x00, 0x66, 0x00, 0x67, 0x00, 0x68, 0x00, 0x69, 0x00, 0x6a, 0x00, 0x6b, 0x00, 0x6c, 0x00, 0x6d, 
-  0x00, 0x6e, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x71, 0x00, 0x72, 0x00, 0x73, 0x00, 0x74, 0x00, 0x75, 
-  0x00, 0x76, 0x00, 0x77, 0x00, 0x78, 0x00, 0x79, 0x00, 0x7a, 0x00, 0x7b, 0x00, 0x7c, 0x00, 0x7d, 
-  0x00, 0x7e, 0xff, 0xff, 0x00, 0x00, 0x00, 0x21, 0x00, 0x22, 0x00, 0x23, 0x00, 0x24, 0x00, 0x25, 
-  0x00, 0x26, 0x00, 0x27, 0x00, 0x28, 0x00, 0x29, 0x00, 0x2a, 0x00, 0x2b, 0x00, 0x2c, 0x00, 0x2d, 
-  0x00, 0x2e, 0x00, 0x2f, 0x00, 0x30, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, 0x00, 0x34, 0x00, 0x35, 
-  0x00, 0x36, 0x00, 0x37, 0x00, 0x38, 0x00, 0x39, 0x00, 0x3a, 0x00, 0x3b, 0x00, 0x3c, 0x00, 0x3d, 
-  0x00, 0x3e, 0x00, 0x3f, 0x00, 0x40, 0x00, 0x41, 0x00, 0x42, 0x00, 0x43, 0x00, 0x44, 0x00, 0x45, 
-  0x00, 0x46, 0x00, 0x47, 0x00, 0x48, 0x00, 0x49, 0x00, 0x4a, 0x00, 0x4b, 0x00, 0x4c, 0x00, 0x4d, 
-  0x00, 0x4e, 0x00, 0x4f, 0x00, 0x50, 0x00, 0x51, 0x00, 0x52, 0x00, 0x53, 0x00, 0x54, 0x00, 0x55, 
-  0x00, 0x56, 0x00, 0x57, 0x00, 0x58, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x5b, 0x00, 0x5c, 0x00, 0x5d, 
-  0x00, 0x5e, 0x00, 0x5f, 0x00, 0x60, 0x00, 0x61, 0x00, 0x62, 0x00, 0x63, 0x00, 0x64, 0x00, 0x65, 
-  0x00, 0x66, 0x00, 0x67, 0x00, 0x68, 0x00, 0x69, 0x00, 0x6a, 0x00, 0x6b, 0x00, 0x6c, 0x00, 0x6d, 
-  0x00, 0x6e, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x71, 0x00, 0x72, 0x00, 0x73, 0x00, 0x74, 0x00, 0x75, 
-  0x00, 0x76, 0x00, 0x77, 0x00, 0x78, 0x00, 0x79, 0x00, 0x7a, 0x00, 0x7b, 0x00, 0x7c, 0x00, 0x7d, 
-  0x00, 0x7e, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, 0x00, 0x08, 
-  0x00, 0x09, 0x00, 0x0a, 0x00, 0x0b, 0x00, 0x0c, 0x00, 0x0d, 0x00, 0x0e, 0x00, 0x0f, 0x00, 0x10, 
-  0x00, 0x11, 0x00, 0x12, 0x00, 0x13, 0x00, 0x14, 0x00, 0x15, 0x00, 0x16, 0x00, 0x17, 0x00, 0x18, 
-  0x00, 0x19, 0x00, 0x1a, 0x00, 0x1b, 0x00, 0x1c, 0x00, 0x1d, 0x00, 0x1e, 0x00, 0x1f, 0x00, 0x20, 
-  0x00, 0x21, 0x00, 0x22, 0x00, 0x23, 0x00, 0x24, 0x00, 0x25, 0x00, 0x26, 0x00, 0x27, 0x00, 0x28, 
-  0x00, 0x29, 0x00, 0x2a, 0x00, 0x2b, 0x00, 0x2c, 0x00, 0x2d, 0x00, 0x2e, 0x00, 0x2f, 0x00, 0x30, 
-  0x00, 0x31, 0x00, 0x32, 0x00, 0x33, 0x00, 0x34, 0x00, 0x35, 0x00, 0x36, 0x00, 0x37, 0x00, 0x38, 
-  0x00, 0x39, 0x00, 0x3a, 0x00, 0x3b, 0x00, 0x3c, 0x00, 0x3d, 0x00, 0x3e, 0x00, 0x3f, 0x00, 0x40, 
-  0x00, 0x41, 0x00, 0x42, 0x00, 0x43, 0x00, 0x44, 0x00, 0x45, 0x00, 0x46, 0x00, 0x47, 0x00, 0x48, 
-  0x00, 0x49, 0x00, 0x4a, 0x00, 0x4b, 0x00, 0x4c, 0x00, 0x4d, 0x00, 0x4e, 0x00, 0x4f, 0x00, 0x50, 
-  0x00, 0x51, 0x00, 0x52, 0x00, 0x53, 0x00, 0x54, 0x00, 0x55, 0x00, 0x56, 0x00, 0x57, 0x00, 0x58, 
-  0x00, 0x59, 0x00, 0x5a, 0x00, 0x5b, 0x00, 0x5c, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x00, 0x00, 0x04, 
-  0x03, 0xc6, 0x00, 0x00, 0x00, 0xbe, 0x00, 0x80, 0x00, 0x06, 0x00, 0x3e, 0x00, 0x21, 0x00, 0x22, 
-  0x00, 0x23, 0x00, 0x24, 0x00, 0x25, 0x00, 0x26, 0x00, 0x27, 0x00, 0x28, 0x00, 0x29, 0x00, 0x2a, 
-  0x00, 0x2b, 0x00, 0x2c, 0x00, 0x2d, 0x00, 0x2e, 0x00, 0x2f, 0x00, 0x30, 0x00, 0x31, 0x00, 0x32, 
-  0x00, 0x33, 0x00, 0x34, 0x00, 0x35, 0x00, 0x36, 0x00, 0x37, 0x00, 0x38, 0x00, 0x39, 0x00, 0x3a, 
-  0x00, 0x3b, 0x00, 0x3c, 0x00, 0x3d, 0x00, 0x3e, 0x00, 0x3f, 0x00, 0x40, 0x00, 0x41, 0x00, 0x42, 
-  0x00, 0x43, 0x00, 0x44, 0x00, 0x45, 0x00, 0x46, 0x00, 0x47, 0x00, 0x48, 0x00, 0x49, 0x00, 0x4a, 
-  0x00, 0x4b, 0x00, 0x4c, 0x00, 0x4d, 0x00, 0x4e, 0x00, 0x4f, 0x00, 0x50, 0x00, 0x51, 0x00, 0x52, 
-  0x00, 0x53, 0x00, 0x54, 0x00, 0x55, 0x00, 0x56, 0x00, 0x57, 0x00, 0x58, 0x00, 0x59, 0x00, 0x5a, 
-  0x00, 0x5b, 0x00, 0x5c, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x5f, 0x00, 0x60, 0x00, 0x61, 0x00, 0x62, 
-  0x00, 0x63, 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x67, 0x00, 0x68, 0x00, 0x69, 0x00, 0x6a, 
-  0x00, 0x6b, 0x00, 0x6c, 0x00, 0x6d, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x71, 0x00, 0x72, 
-  0x00, 0x73, 0x00, 0x74, 0x00, 0x75, 0x00, 0x76, 0x00, 0x77, 0x00, 0x78, 0x00, 0x79, 0x00, 0x7a, 
-  0x00, 0x7b, 0x00, 0x7c, 0x00, 0x7d, 0x00, 0x7e, 0xff, 0xff, 0x00, 0x00, 0x00, 0x21, 0x00, 0x22, 
-  0x00, 0x23, 0x00, 0x24, 0x00, 0x25, 0x00, 0x26, 0x00, 0x27, 0x00, 0x28, 0x00, 0x29, 0x00, 0x2a, 
-  0x00, 0x2b, 0x00, 0x2c, 0x00, 0x2d, 0x00, 0x2e, 0x00, 0x2f, 0x00, 0x30, 0x00, 0x31, 0x00, 0x32, 
-  0x00, 0x33, 0x00, 0x34, 0x00, 0x35, 0x00, 0x36, 0x00, 0x37, 0x00, 0x38, 0x00, 0x39, 0x00, 0x3a, 
-  0x00, 0x3b, 0x00, 0x3c, 0x00, 0x3d, 0x00, 0x3e, 0x00, 0x3f, 0x00, 0x40, 0x00, 0x41, 0x00, 0x42, 
-  0x00, 0x43, 0x00, 0x44, 0x00, 0x45, 0x00, 0x46, 0x00, 0x47, 0x00, 0x48, 0x00, 0x49, 0x00, 0x4a, 
-  0x00, 0x4b, 0x00, 0x4c, 0x00, 0x4d, 0x00, 0x4e, 0x00, 0x4f, 0x00, 0x50, 0x00, 0x51, 0x00, 0x52, 
-  0x00, 0x53, 0x00, 0x54, 0x00, 0x55, 0x00, 0x56, 0x00, 0x57, 0x00, 0x58, 0x00, 0x59, 0x00, 0x5a, 
-  0x00, 0x5b, 0x00, 0x5c, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x5f, 0x00, 0x60, 0x00, 0x61, 0x00, 0x62, 
-  0x00, 0x63, 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x67, 0x00, 0x68, 0x00, 0x69, 0x00, 0x6a, 
-  0x00, 0x6b, 0x00, 0x6c, 0x00, 0x6d, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x71, 0x00, 0x72, 
-  0x00, 0x73, 0x00, 0x74, 0x00, 0x75, 0x00, 0x76, 0x00, 0x77, 0x00, 0x78, 0x00, 0x79, 0x00, 0x7a, 
-  0x00, 0x7b, 0x00, 0x7c, 0x00, 0x7d, 0x00, 0x7e, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, 0x00, 0x05, 
-  0x00, 0x06, 0x00, 0x07, 0x00, 0x08, 0x00, 0x09, 0x00, 0x0a, 0x00, 0x0b, 0x00, 0x0c, 0x00, 0x0d, 
-  0x00, 0x0e, 0x00, 0x0f, 0x00, 0x10, 0x00, 0x11, 0x00, 0x12, 0x00, 0x13, 0x00, 0x14, 0x00, 0x15, 
-  0x00, 0x16, 0x00, 0x17, 0x00, 0x18, 0x00, 0x19, 0x00, 0x1a, 0x00, 0x1b, 0x00, 0x1c, 0x00, 0x1d, 
-  0x00, 0x1e, 0x00, 0x1f, 0x00, 0x20, 0x00, 0x21, 0x00, 0x22, 0x00, 0x23, 0x00, 0x24, 0x00, 0x25, 
-  0x00, 0x26, 0x00, 0x27, 0x00, 0x28, 0x00, 0x29, 0x00, 0x2a, 0x00, 0x2b, 0x00, 0x2c, 0x00, 0x2d, 
-  0x00, 0x2e, 0x00, 0x2f, 0x00, 0x30, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, 0x00, 0x34, 0x00, 0x35, 
-  0x00, 0x36, 0x00, 0x37, 0x00, 0x38, 0x00, 0x39, 0x00, 0x3a, 0x00, 0x3b, 0x00, 0x3c, 0x00, 0x3d, 
-  0x00, 0x3e, 0x00, 0x3f, 0x00, 0x40, 0x00, 0x41, 0x00, 0x42, 0x00, 0x43, 0x00, 0x44, 0x00, 0x45, 
-  0x00, 0x46, 0x00, 0x47, 0x00, 0x48, 0x00, 0x49, 0x00, 0x4a, 0x00, 0x4b, 0x00, 0x4c, 0x00, 0x4d, 
-  0x00, 0x4e, 0x00, 0x4f, 0x00, 0x50, 0x00, 0x51, 0x00, 0x52, 0x00, 0x53, 0x00, 0x54, 0x00, 0x55, 
-  0x00, 0x56, 0x00, 0x57, 0x00, 0x58, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x5b, 0x00, 0x5c, 0x00, 0x5d, 
-  0x00, 0x5e, 0x00, 0x00, 0x00, 0x04, 0x03, 0xc6, 0x00, 0x00, 0x00, 0xbe, 0x00, 0x80, 0x00, 0x06, 
-  0x00, 0x3e, 0x00, 0x21, 0x00, 0x22, 0x00, 0x23, 0x00, 0x24, 0x00, 0x25, 0x00, 0x26, 0x00, 0x27, 
-  0x00, 0x28, 0x00, 0x29, 0x00, 0x2a, 0x00, 0x2b, 0x00, 0x2c, 0x00, 0x2d, 0x00, 0x2e, 0x00, 0x2f, 
-  0x00, 0x30, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, 0x00, 0x34, 0x00, 0x35, 0x00, 0x36, 0x00, 0x37, 
-  0x00, 0x38, 0x00, 0x39, 0x00, 0x3a, 0x00, 0x3b, 0x00, 0x3c, 0x00, 0x3d, 0x00, 0x3e, 0x00, 0x3f, 
-  0x00, 0x40, 0x00, 0x41, 0x00, 0x42, 0x00, 0x43, 0x00, 0x44, 0x00, 0x45, 0x00, 0x46, 0x00, 0x47, 
-  0x00, 0x48, 0x00, 0x49, 0x00, 0x4a, 0x00, 0x4b, 0x00, 0x4c, 0x00, 0x4d, 0x00, 0x4e, 0x00, 0x4f, 
-  0x00, 0x50, 0x00, 0x51, 0x00, 0x52, 0x00, 0x53, 0x00, 0x54, 0x00, 0x55, 0x00, 0x56, 0x00, 0x57, 
-  0x00, 0x58, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x5b, 0x00, 0x5c, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x5f, 
-  0x00, 0x60, 0x00, 0x61, 0x00, 0x62, 0x00, 0x63, 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x67, 
-  0x00, 0x68, 0x00, 0x69, 0x00, 0x6a, 0x00, 0x6b, 0x00, 0x6c, 0x00, 0x6d, 0x00, 0x6e, 0x00, 0x6f, 
-  0x00, 0x70, 0x00, 0x71, 0x00, 0x72, 0x00, 0x73, 0x00, 0x74, 0x00, 0x75, 0x00, 0x76, 0x00, 0x77, 
-  0x00, 0x78, 0x00, 0x79, 0x00, 0x7a, 0x00, 0x7b, 0x00, 0x7c, 0x00, 0x7d, 0x00, 0x7e, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x21, 0x00, 0x22, 0x00, 0x23, 0x00, 0x24, 0x00, 0x25, 0x00, 0x26, 0x00, 0x27, 
-  0x00, 0x28, 0x00, 0x29, 0x00, 0x2a, 0x00, 0x2b, 0x00, 0x2c, 0x00, 0x2d, 0x00, 0x2e, 0x00, 0x2f, 
-  0x00, 0x30, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, 0x00, 0x34, 0x00, 0x35, 0x00, 0x36, 0x00, 0x37, 
-  0x00, 0x38, 0x00, 0x39, 0x00, 0x3a, 0x00, 0x3b, 0x00, 0x3c, 0x00, 0x3d, 0x00, 0x3e, 0x00, 0x3f, 
-  0x00, 0x40, 0x00, 0x41, 0x00, 0x42, 0x00, 0x43, 0x00, 0x44, 0x00, 0x45, 0x00, 0x46, 0x00, 0x47, 
-  0x00, 0x48, 0x00, 0x49, 0x00, 0x4a, 0x00, 0x4b, 0x00, 0x4c, 0x00, 0x4d, 0x00, 0x4e, 0x00, 0x4f, 
-  0x00, 0x50, 0x00, 0x51, 0x00, 0x52, 0x00, 0x53, 0x00, 0x54, 0x00, 0x55, 0x00, 0x56, 0x00, 0x57, 
-  0x00, 0x58, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x5b, 0x00, 0x5c, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x5f, 
-  0x00, 0x60, 0x00, 0x61, 0x00, 0x62, 0x00, 0x63, 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x67, 
-  0x00, 0x68, 0x00, 0x69, 0x00, 0x6a, 0x00, 0x6b, 0x00, 0x6c, 0x00, 0x6d, 0x00, 0x6e, 0x00, 0x6f, 
-  0x00, 0x70, 0x00, 0x71, 0x00, 0x72, 0x00, 0x73, 0x00, 0x74, 0x00, 0x75, 0x00, 0x76, 0x00, 0x77, 
-  0x00, 0x78, 0x00, 0x79, 0x00, 0x7a, 0x00, 0x7b, 0x00, 0x7c, 0x00, 0x7d, 0x00, 0x7e, 0xff, 0xff, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 
-  0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0xbe, 0x00, 0x01, 0x00, 0x02, 
-  0x00, 0x03, 0x00, 0x04, 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, 0x00, 0x08, 0x00, 0x09, 0x00, 0x0a, 
-  0x00, 0x0b, 0x00, 0x0c, 0x00, 0x0d, 0x00, 0x0e, 0x00, 0x0f, 0x00, 0x10, 0x00, 0x11, 0x00, 0x12, 
-  0x00, 0x13, 0x00, 0x14, 0x00, 0x15, 0x00, 0x16, 0x00, 0x17, 0x00, 0x18, 0x00, 0x19, 0x00, 0x1a, 
-  0x00, 0x1b, 0x00, 0x1c, 0x00, 0x1d, 0x00, 0x1e, 0x00, 0x1f, 0x00, 0x20, 0x00, 0x21, 0x00, 0x22, 
-  0x00, 0x23, 0x00, 0x24, 0x00, 0x25, 0x00, 0x26, 0x00, 0x27, 0x00, 0x28, 0x00, 0x29, 0x00, 0x2a, 
-  0x00, 0x2b, 0x00, 0x2c, 0x00, 0x2d, 0x00, 0x2e, 0x00, 0x2f, 0x00, 0x30, 0x00, 0x31, 0x00, 0x32, 
-  0x00, 0x33, 0x00, 0x34, 0x00, 0x35, 0x00, 0x36, 0x00, 0x37, 0x00, 0x38, 0x00, 0x39, 0x00, 0x3a, 
-  0x00, 0x3b, 0x00, 0x3c, 0x00, 0x3d, 0x00, 0x3e, 0x00, 0x3f, 0x00, 0x40, 0x00, 0x41, 0x00, 0x42, 
-  0x00, 0x43, 0x00, 0x44, 0x00, 0x45, 0x00, 0x46, 0x00, 0x47, 0x00, 0x48, 0x00, 0x49, 0x00, 0x4a, 
-  0x00, 0x4b, 0x00, 0x4c, 0x00, 0x4d, 0x00, 0x4e, 0x00, 0x4f, 0x00, 0x50, 0x00, 0x51, 0x00, 0x52, 
-  0x00, 0x53, 0x00, 0x54, 0x00, 0x55, 0x00, 0x56, 0x00, 0x57, 0x00, 0x58, 0x00, 0x59, 0x00, 0x5a, 
-  0x00, 0x5b, 0x00, 0x5c, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 
-  0x00, 0x00, 0x02, 0x58, 0x08, 0x00, 0x00, 0x03, 0x00, 0x07, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 
-  0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x58, 0x00, 0x00, 0xfd, 0xad, 0x02, 0x4e, 
-  0x00, 0x00, 0xfd, 0xb2, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x05, 0x00, 0x00, 
-  0x07, 0xf6, 0x00, 0x00, 0x00, 0x02, 0x00, 0x39, 0xff, 0xf3, 0x00, 0xe4, 0x02, 0xca, 0x00, 0x03, 
-  0x00, 0x0f, 0x00, 0x00, 0x37, 0x23, 0x03, 0x33, 0x03, 0x34, 0x36, 0x33, 0x32, 0x16, 0x15, 0x14, 
-  0x06, 0x23, 0x22, 0x26, 0xcb, 0x77, 0x19, 0xa9, 0xab, 0x32, 0x24, 0x23, 0x32, 0x32, 0x23, 0x24, 
-  0x32, 0xed, 0x01, 0xdd, 0xfd, 0x7c, 0x2e, 0x25, 0x25, 0x2e, 0x2c, 0x27, 0x27, 0x00, 0x02, 0x00, 
-  0x41, 0x01, 0xc8, 0x01, 0x97, 0x02, 0xca, 0x00, 0x03, 0x00, 0x07, 0x00, 0x00, 0x13, 0x03, 0x23, 
-  0x03, 0x21, 0x03, 0x23, 0x03, 0xc9, 0x14, 0x60, 0x14, 0x01, 0x56, 0x14, 0x60, 0x14, 0x02, 0xca, 
-  0xfe, 0xfe, 0x01, 0x02, 0xfe, 0xfe, 0x01, 0x02, 0x00, 0x02, 0x00, 0x16, 0x00, 0x00, 0x02, 0x70, 
-  0x02, 0xc9, 0x00, 0x1b, 0x00, 0x1f, 0x00, 0x00, 0x01, 0x07, 0x33, 0x15, 0x23, 0x07, 0x23, 0x37, 
-  0x23, 0x07, 0x23, 0x37, 0x23, 0x35, 0x33, 0x37, 0x23, 0x35, 0x33, 0x37, 0x33, 0x07, 0x33, 0x37, 
-  0x33, 0x07, 0x33, 0x15, 0x05, 0x33, 0x37, 0x23, 0x01, 0xe8, 0x17, 0x7e, 0x91, 0x26, 0x6b, 0x26, 
-  0x5f, 0x25, 0x69, 0x24, 0x74, 0x87, 0x17, 0x7b, 0x8d, 0x26, 0x6b, 0x26, 0x61, 0x26, 0x69, 0x26, 
-  0x75, 0xfe, 0x97, 0x60, 0x17, 0x60, 0x01, 0x9c, 0x71, 0x65, 0xc6, 0xc6, 0xc6, 0xc6, 0x65, 0x71, 
-  0x66, 0xc7, 0xc7, 0xc7, 0xc7, 0x66, 0x71, 0x71, 0x00, 0x03, 0x00, 0x2b, 0xff, 0xc6, 0x02, 0x15, 
-  0x02, 0xf7, 0x00, 0x22, 0x00, 0x28, 0x00, 0x2e, 0x00, 0x00, 0x37, 0x26, 0x26, 0x27, 0x35, 0x16, 
-  0x16, 0x17, 0x35, 0x2e, 0x02, 0x35, 0x34, 0x36, 0x37, 0x35, 0x33, 0x15, 0x16, 0x17, 0x07, 0x26, 
-  0x26, 0x27, 0x15, 0x1e, 0x02, 0x15, 0x14, 0x06, 0x07, 0x15, 0x23, 0x11, 0x06, 0x15, 0x14, 0x16, 
-  0x17, 0x13, 0x36, 0x35, 0x34, 0x26, 0x27, 0xfd, 0x41, 0x66, 0x2a, 0x29, 0x74, 0x34, 0x4d, 0x5d, 
-  0x28, 0x75, 0x5d, 0x43, 0x6f, 0x5b, 0x2e, 0x28, 0x51, 0x23, 0x36, 0x62, 0x3d, 0x6a, 0x6b, 0x43, 
-  0x3f, 0x1e, 0x21, 0x43, 0x42, 0x21, 0x21, 0x28, 0x02, 0x15, 0x13, 0x81, 0x14, 0x21, 0x03, 0x97, 
-  0x1e, 0x39, 0x46, 0x31, 0x4b, 0x59, 0x08, 0x4b, 0x49, 0x04, 0x29, 0x72, 0x11, 0x12, 0x03, 0x90, 
-  0x14, 0x2f, 0x48, 0x3b, 0x49, 0x62, 0x0a, 0x64, 0x02, 0x6d, 0x09, 0x2a, 0x15, 0x1c, 0x0f, 0xfe, 
-  0xde, 0x0c, 0x2e, 0x14, 0x1d, 0x0f, 0x00, 0x05, 0x00, 0x1f, 0xff, 0xf7, 0x03, 0x66, 0x02, 0xd4, 
-  0x00, 0x0b, 0x00, 0x0f, 0x00, 0x17, 0x00, 0x23, 0x00, 0x2b, 0x00, 0x00, 0x13, 0x32, 0x16, 0x15, 
-  0x14, 0x06, 0x23, 0x22, 0x26, 0x35, 0x34, 0x36, 0x05, 0x01, 0x23, 0x01, 0x05, 0x22, 0x15, 0x14, 
-  0x33, 0x32, 0x35, 0x34, 0x05, 0x32, 0x16, 0x15, 0x14, 0x06, 0x23, 0x22, 0x26, 0x35, 0x34, 0x36, 
-  0x17, 0x22, 0x15, 0x14, 0x33, 0x32, 0x35, 0x34, 0xc7, 0x54, 0x57, 0x52, 0x59, 0x52, 0x56, 0x50, 
-  0x02, 0x53, 0xfe, 0x74, 0x75, 0x01, 0x8c, 0xfe, 0x7b, 0x2e, 0x2e, 0x2f, 0x01, 0xc4, 0x54, 0x57, 
-  0x52, 0x59, 0x52, 0x56, 0x50, 0x59, 0x2e, 0x2e, 0x2f, 0x02, 0xd4, 0x75, 0x6a, 0x6a, 0x77, 0x77, 
-  0x6a, 0x6a, 0x75, 0x0a, 0xfd, 0x36, 0x02, 0xca, 0x5c, 0x7a, 0x7b, 0x7b, 0x7a, 0xb7, 0x75, 0x6a, 
-  0x6a, 0x77, 0x77, 0x6a, 0x6a, 0x75, 0x66, 0x7a, 0x7b, 0x7b, 0x7a, 0x00, 0x03, 0x00, 0x28, 0xff, 
-  0xf6, 0x02, 0xee, 0x02, 0xd4, 0x00, 0x21, 0x00, 0x2d, 0x00, 0x37, 0x00, 0x00, 0x01, 0x32, 0x16, 
-  0x16, 0x15, 0x14, 0x06, 0x07, 0x17, 0x36, 0x36, 0x37, 0x33, 0x06, 0x06, 0x07, 0x17, 0x23, 0x27, 
-  0x06, 0x06, 0x23, 0x22, 0x26, 0x35, 0x34, 0x36, 0x37, 0x26, 0x26, 0x35, 0x34, 0x36, 0x36, 0x17, 
-  0x22, 0x06, 0x15, 0x14, 0x16, 0x17, 0x36, 0x36, 0x35, 0x34, 0x26, 0x03, 0x06, 0x06, 0x15, 0x14, 
-  0x16, 0x33, 0x32, 0x36, 0x37, 0x01, 0x36, 0x3a, 0x5a, 0x34, 0x52, 0x3d, 0x8b, 0x14, 0x1e, 0x0a, 
-  0x9b, 0x0f, 0x3a, 0x2d, 0x93, 0xb8, 0x38, 0x2b, 0x6a, 0x3e, 0x7a, 0x89, 0x46, 0x3d, 0x27, 0x1f, 
-  0x35, 0x5f, 0x3c, 0x19, 0x2d, 0x19, 0x15, 0x2a, 0x2d, 0x28, 0x4a, 0x1c, 0x21, 0x40, 0x30, 0x20, 
-  0x38, 0x17, 0x02, 0xd4, 0x24, 0x45, 0x32, 0x45, 0x5e, 0x23, 0x87, 0x22, 0x4b, 0x26, 0x38, 0x80, 
-  0x38, 0x8f, 0x37, 0x1e, 0x23, 0x70, 0x5b, 0x4c, 0x5b, 0x23, 0x2d, 0x4c, 0x2b, 0x33, 0x4a, 0x28, 
-  0x73, 0x19, 0x23, 0x19, 0x2e, 0x18, 0x17, 0x2e, 0x1e, 0x1e, 0x1a, 0xfe, 0xd1, 0x15, 0x2f, 0x1f, 
-  0x2b, 0x31, 0x10, 0x0e, 0x00, 0x01, 0x00, 0x41, 0x01, 0xc8, 0x00, 0xc9, 0x02, 0xca, 0x00, 0x03, 
-  0x00, 0x00, 0x13, 0x03, 0x23, 0x03, 0xc9, 0x14, 0x60, 0x14, 0x02, 0xca, 0xfe, 0xfe, 0x01, 0x02, 
-  0x00, 0x01, 0x00, 0x28, 0xff, 0x62, 0x01, 0x35, 0x02, 0xca, 0x00, 0x0d, 0x00, 0x00, 0x13, 0x34, 
-  0x36, 0x37, 0x33, 0x06, 0x06, 0x15, 0x14, 0x16, 0x17, 0x23, 0x26, 0x26, 0x28, 0x47, 0x4c, 0x7a, 
-  0x44, 0x47, 0x47, 0x43, 0x79, 0x4c, 0x47, 0x01, 0x12, 0x7a, 0xe3, 0x5b, 0x5e, 0xe2, 0x77, 0x74, 
-  0xe1, 0x5c, 0x58, 0xdf, 0x00, 0x01, 0x00, 0x1e, 0xff, 0x62, 0x01, 0x2b, 0x02, 0xca, 0x00, 0x0d, 
-  0x00, 0x00, 0x01, 0x14, 0x06, 0x07, 0x23, 0x36, 0x36, 0x35, 0x34, 0x26, 0x27, 0x33, 0x16, 0x16, 
-  0x01, 0x2b, 0x47, 0x4c, 0x79, 0x44, 0x46, 0x47, 0x44, 0x7a, 0x4c, 0x47, 0x01, 0x12, 0x79, 0xdf, 
-  0x58, 0x5c, 0xe1, 0x74, 0x77, 0xe2, 0x5e, 0x5b, 0xe3, 0x00, 0x01, 0x00, 0x1f, 0x01, 0x24, 0x02, 
-  0x02, 0x02, 0xf8, 0x00, 0x0e, 0x00, 0x00, 0x01, 0x07, 0x37, 0x17, 0x07, 0x17, 0x07, 0x27, 0x07, 
-  0x27, 0x37, 0x27, 0x37, 0x17, 0x27, 0x01, 0x50, 0x14, 0xb6, 0x10, 0xa6, 0x6d, 0x6f, 0x4c, 0x43, 
-  0x73, 0x6c, 0xa5, 0x13, 0xb2, 0x14, 0x02, 0xf8, 0xb4, 0x33, 0x7b, 0x0c, 0x91, 0x3b, 0x99, 0x98, 
-  0x3a, 0x91, 0x0d, 0x7a, 0x33, 0xb4, 0x00, 0x01, 0x00, 0x2b, 0x00, 0x6f, 0x02, 0x10, 0x02, 0x54, 
-  0x00, 0x0b, 0x00, 0x00, 0x01, 0x33, 0x15, 0x23, 0x15, 0x23, 0x35, 0x23, 0x35, 0x33, 0x35, 0x33, 
-  0x01, 0x53, 0xbd, 0xbd, 0x6b, 0xbd, 0xbd, 0x6b, 0x01, 0x96, 0x6b, 0xbc, 0xbc, 0x6b, 0xbe, 0x00, 
-  0x01, 0x00, 0x1f, 0xff, 0x7f, 0x00, 0xe0, 0x00, 0x74, 0x00, 0x08, 0x00, 0x00, 0x37, 0x06, 0x06, 
-  0x07, 0x23, 0x36, 0x36, 0x37, 0x33, 0xe0, 0x0d, 0x30, 0x19, 0x6b, 0x0e, 0x1c, 0x07, 0x89, 0x69, 
-  0x35, 0x7e, 0x37, 0x3b, 0x86, 0x34, 0x00, 0x01, 0x00, 0x1e, 0x00, 0xcf, 0x01, 0x24, 0x01, 0x49, 
-  0x00, 0x03, 0x00, 0x00, 0x37, 0x35, 0x21, 0x15, 0x1e, 0x01, 0x06, 0xcf, 0x7a, 0x7a, 0x00, 0x01, 
-  0x00, 0x39, 0xff, 0xf3, 0x00, 0xe4, 0x00, 0x99, 0x00, 0x0b, 0x00, 0x00, 0x37, 0x34, 0x36, 0x33, 
-  0x32, 0x16, 0x15, 0x14, 0x06, 0x23, 0x22, 0x26, 0x39, 0x32, 0x24, 0x23, 0x32, 0x32, 0x23, 0x24, 
-  0x32, 0x46, 0x2e, 0x25, 0x25, 0x2e, 0x2c, 0x27, 0x27, 0x00, 0x01, 0x00, 0x07, 0x00, 0x00, 0x01, 
-  0x98, 0x02, 0xca, 0x00, 0x03, 0x00, 0x00, 0x01, 0x01, 0x23, 0x01, 0x01, 0x98, 0xfe, 0xf6, 0x87, 
-  0x01, 0x0a, 0x02, 0xca, 0xfd, 0x36, 0x02, 0xca, 0x00, 0x02, 0x00, 0x24, 0xff, 0xf6, 0x02, 0x17, 
-  0x02, 0xd5, 0x00, 0x0d, 0x00, 0x19, 0x00, 0x00, 0x01, 0x14, 0x06, 0x06, 0x23, 0x22, 0x26, 0x35, 
-  0x34, 0x36, 0x36, 0x33, 0x32, 0x16, 0x05, 0x14, 0x16, 0x33, 0x32, 0x36, 0x35, 0x34, 0x26, 0x23, 
-  0x22, 0x06, 0x02, 0x17, 0x31, 0x6d, 0x5c, 0x81, 0x78, 0x30, 0x6e, 0x5b, 0x80, 0x7a, 0xfe, 0xa3, 
-  0x2a, 0x39, 0x38, 0x2c, 0x2c, 0x38, 0x39, 0x2a, 0x01, 0x65, 0x73, 0xa4, 0x58, 0xc3, 0xac, 0x74, 
-  0xa4, 0x58, 0xc2, 0xae, 0x7a, 0x7b, 0x7a, 0x7b, 0x7a, 0x7c, 0x7c, 0x00, 0x01, 0x00, 0x3b, 0x00, 
-  0x00, 0x01, 0x9d, 0x02, 0xca, 0x00, 0x0c, 0x00, 0x00, 0x21, 0x23, 0x11, 0x34, 0x36, 0x37, 0x06, 
-  0x06, 0x07, 0x07, 0x27, 0x37, 0x33, 0x01, 0x9d, 0x97, 0x03, 0x01, 0x05, 0x21, 0x0e, 0x52, 0x49, 
-  0xe6, 0x7c, 0x01, 0x9d, 0x1a, 0x54, 0x20, 0x06, 0x1f, 0x0c, 0x42, 0x5b, 0xb7, 0x00, 0x01, 0x00, 
-  0x26, 0x00, 0x00, 0x02, 0x1b, 0x02, 0xd4, 0x00, 0x1d, 0x00, 0x00, 0x21, 0x21, 0x35, 0x37, 0x3e, 
-  0x02, 0x35, 0x34, 0x26, 0x23, 0x22, 0x06, 0x07, 0x27, 0x3e, 0x02, 0x33, 0x32, 0x16, 0x16, 0x15, 
-  0x14, 0x06, 0x06, 0x07, 0x07, 0x15, 0x21, 0x02, 0x1b, 0xfe, 0x0d, 0xb3, 0x36, 0x42, 0x1e, 0x2f, 
-  0x28, 0x29, 0x4e, 0x2b, 0x52, 0x1f, 0x45, 0x5b, 0x40, 0x46, 0x65, 0x37, 0x2f, 0x59, 0x3f, 0x5c, 
-  0x01, 0x37, 0x69, 0xb5, 0x38, 0x4b, 0x3d, 0x23, 0x2b, 0x2a, 0x26, 0x23, 0x61, 0x1b, 0x2e, 0x1d, 
-  0x33, 0x57, 0x37, 0x3b, 0x62, 0x60, 0x3a, 0x56, 0x07, 0x00, 0x01, 0x00, 0x26, 0xff, 0xf6, 0x02, 
-  0x14, 0x02, 0xd4, 0x00, 0x2b, 0x00, 0x00, 0x01, 0x14, 0x06, 0x07, 0x15, 0x16, 0x16, 0x15, 0x14, 
-  0x06, 0x06, 0x23, 0x22, 0x27, 0x35, 0x16, 0x16, 0x33, 0x32, 0x36, 0x35, 0x34, 0x26, 0x26, 0x23, 
-  0x23, 0x35, 0x33, 0x32, 0x36, 0x36, 0x35, 0x34, 0x26, 0x23, 0x22, 0x06, 0x07, 0x27, 0x36, 0x36, 
-  0x33, 0x32, 0x16, 0x01, 0xff, 0x59, 0x41, 0x56, 0x59, 0x3d, 0x7f, 0x64, 0x74, 0x5a, 0x2e, 0x65, 
-  0x2b, 0x51, 0x41, 0x1e, 0x4b, 0x43, 0x36, 0x37, 0x42, 0x45, 0x19, 0x2f, 0x37, 0x33, 0x4b, 0x1a, 
-  0x46, 0x2a, 0x71, 0x4e, 0x6e, 0x81, 0x02, 0x2a, 0x4a, 0x58, 0x10, 0x03, 0x0a, 0x54, 0x47, 0x3e, 
-  0x63, 0x39, 0x27, 0x80, 0x17, 0x18, 0x38, 0x33, 0x1e, 0x29, 0x15, 0x74, 0x19, 0x2b, 0x1c, 0x26, 
-  0x2b, 0x23, 0x11, 0x68, 0x1e, 0x28, 0x59, 0x00, 0x02, 0x00, 0x11, 0x00, 0x00, 0x02, 0x2b, 0x02, 
-  0xca, 0x00, 0x0a, 0x00, 0x15, 0x00, 0x00, 0x25, 0x23, 0x15, 0x23, 0x35, 0x21, 0x35, 0x01, 0x33, 
-  0x11, 0x33, 0x27, 0x34, 0x36, 0x36, 0x37, 0x23, 0x06, 0x06, 0x07, 0x07, 0x33, 0x02, 0x2b, 0x56, 
-  0x93, 0xfe, 0xcf, 0x01, 0x39, 0x8b, 0x56, 0xe9, 0x02, 0x03, 0x01, 0x04, 0x09, 0x14, 0x0e, 0x83, 
-  0xac, 0x94, 0x94, 0x94, 0x69, 0x01, 0xcd, 0xfe, 0x3f, 0x79, 0x17, 0x42, 0x39, 0x09, 0x14, 0x26, 
-  0x14, 0xc6, 0x00, 0x01, 0x00, 0x31, 0xff, 0xf6, 0x02, 0x0e, 0x02, 0xca, 0x00, 0x1e, 0x00, 0x00, 
-  0x01, 0x32, 0x16, 0x16, 0x15, 0x14, 0x06, 0x23, 0x22, 0x26, 0x27, 0x35, 0x16, 0x16, 0x33, 0x32, 
-  0x36, 0x35, 0x34, 0x23, 0x22, 0x06, 0x07, 0x27, 0x13, 0x21, 0x15, 0x23, 0x07, 0x36, 0x36, 0x01, 
-  0x2c, 0x41, 0x66, 0x3b, 0x90, 0x8d, 0x38, 0x63, 0x25, 0x25, 0x68, 0x2e, 0x43, 0x47, 0x8f, 0x1c, 
-  0x3c, 0x14, 0x3c, 0x1b, 0x01, 0x83, 0xff, 0x0d, 0x11, 0x27, 0x01, 0xc8, 0x32, 0x60, 0x47, 0x74, 
-  0x85, 0x14, 0x13, 0x82, 0x13, 0x1b, 0x37, 0x3a, 0x6c, 0x0b, 0x05, 0x20, 0x01, 0x6c, 0x80, 0x8c, 
-  0x03, 0x07, 0x00, 0x02, 0x00, 0x23, 0xff, 0xf6, 0x02, 0x1b, 0x02, 0xd2, 0x00, 0x1e, 0x00, 0x2c, 
-  0x00, 0x00, 0x13, 0x34, 0x3e, 0x03, 0x33, 0x32, 0x16, 0x17, 0x15, 0x26, 0x26, 0x23, 0x22, 0x06, 
-  0x06, 0x07, 0x33, 0x36, 0x36, 0x33, 0x32, 0x16, 0x15, 0x14, 0x06, 0x23, 0x22, 0x26, 0x26, 0x05, 
-  0x32, 0x36, 0x35, 0x34, 0x26, 0x23, 0x22, 0x06, 0x06, 0x15, 0x14, 0x16, 0x16, 0x23, 0x12, 0x2d, 
-  0x51, 0x7d, 0x59, 0x15, 0x38, 0x13, 0x13, 0x2d, 0x16, 0x59, 0x61, 0x28, 0x03, 0x06, 0x14, 0x4b, 
-  0x3c, 0x5e, 0x6e, 0x83, 0x70, 0x49, 0x76, 0x46, 0x01, 0x02, 0x2c, 0x38, 0x30, 0x31, 0x21, 0x32, 
-  0x1c, 0x18, 0x31, 0x01, 0x2f, 0x3e, 0x78, 0x6b, 0x53, 0x2f, 0x03, 0x04, 0x79, 0x05, 0x05, 0x38, 
-  0x65, 0x42, 0x23, 0x30, 0x76, 0x6c, 0x74, 0x84, 0x43, 0x8b, 0x55, 0x3d, 0x40, 0x34, 0x3c, 0x1d, 
-  0x2e, 0x18, 0x21, 0x3f, 0x2a, 0x00, 0x01, 0x00, 0x1b, 0x00, 0x00, 0x02, 0x1b, 0x02, 0xca, 0x00, 
-  0x06, 0x00, 0x00, 0x33, 0x01, 0x21, 0x35, 0x21, 0x15, 0x01, 0x6f, 0x01, 0x0c, 0xfe, 0xa0, 0x02, 
-  0x00, 0xfe, 0xf2, 0x02, 0x4b, 0x7f, 0x5f, 0xfd, 0x95, 0x00, 0x03, 0x00, 0x23, 0xff, 0xf6, 0x02, 
-  0x18, 0x02, 0xd3, 0x00, 0x1b, 0x00, 0x27, 0x00, 0x35, 0x00, 0x00, 0x01, 0x32, 0x16, 0x16, 0x15, 
-  0x14, 0x06, 0x07, 0x1e, 0x02, 0x15, 0x14, 0x06, 0x06, 0x23, 0x22, 0x26, 0x35, 0x34, 0x36, 0x37, 
-  0x26, 0x26, 0x35, 0x34, 0x36, 0x36, 0x17, 0x22, 0x06, 0x15, 0x14, 0x16, 0x17, 0x36, 0x36, 0x35, 
-  0x34, 0x26, 0x03, 0x14, 0x16, 0x33, 0x32, 0x36, 0x35, 0x34, 0x26, 0x26, 0x27, 0x27, 0x06, 0x06, 
-  0x01, 0x1e, 0x3e, 0x67, 0x3f, 0x49, 0x37, 0x26, 0x45, 0x2b, 0x3f, 0x71, 0x4a, 0x78, 0x83, 0x50, 
-  0x39, 0x30, 0x43, 0x40, 0x69, 0x3b, 0x25, 0x31, 0x34, 0x23, 0x22, 0x34, 0x31, 0x94, 0x37, 0x36, 
-  0x38, 0x38, 0x20, 0x2f, 0x19, 0x0d, 0x2e, 0x3a, 0x02, 0xd3, 0x26, 0x4c, 0x3a, 0x40, 0x53, 0x1b, 
-  0x14, 0x35, 0x47, 0x30, 0x3b, 0x58, 0x30, 0x66, 0x59, 0x4a, 0x5a, 0x1c, 0x1e, 0x55, 0x40, 0x39, 
-  0x4c, 0x26, 0x6e, 0x26, 0x23, 0x25, 0x2e, 0x11, 0x10, 0x2d, 0x27, 0x23, 0x26, 0xfe, 0x59, 0x27, 
-  0x32, 0x30, 0x28, 0x1b, 0x29, 0x21, 0x0e, 0x07, 0x16, 0x3a, 0x00, 0x02, 0x00, 0x20, 0xff, 0xf6, 
-  0x02, 0x18, 0x02, 0xd2, 0x00, 0x1e, 0x00, 0x2c, 0x00, 0x00, 0x01, 0x14, 0x0e, 0x03, 0x23, 0x22, 
-  0x26, 0x27, 0x35, 0x16, 0x16, 0x33, 0x32, 0x36, 0x36, 0x37, 0x23, 0x06, 0x06, 0x23, 0x22, 0x26, 
-  0x35, 0x34, 0x36, 0x33, 0x32, 0x16, 0x16, 0x25, 0x22, 0x06, 0x15, 0x14, 0x16, 0x33, 0x32, 0x36, 
-  0x36, 0x35, 0x34, 0x26, 0x26, 0x02, 0x18, 0x12, 0x2d, 0x51, 0x7d, 0x59, 0x15, 0x38, 0x13, 0x14, 
-  0x2c, 0x16, 0x59, 0x61, 0x28, 0x03, 0x06, 0x15, 0x45, 0x44, 0x5b, 0x6e, 0x83, 0x70, 0x49, 0x76, 
-  0x46, 0xfe, 0xfe, 0x2c, 0x38, 0x30, 0x31, 0x22, 0x31, 0x1c, 0x18, 0x30, 0x01, 0x99, 0x3d, 0x79, 
-  0x6b, 0x53, 0x2f, 0x03, 0x04, 0x79, 0x04, 0x06, 0x39, 0x64, 0x42, 0x23, 0x30, 0x76, 0x6c, 0x74, 
-  0x84, 0x43, 0x8b, 0x55, 0x3c, 0x41, 0x34, 0x3c, 0x1e, 0x2d, 0x18, 0x21, 0x40, 0x29, 0x00, 0x02, 
-  0x00, 0x39, 0xff, 0xf3, 0x00, 0xe4, 0x02, 0x2c, 0x00, 0x0b, 0x00, 0x17, 0x00, 0x00, 0x13, 0x34, 
-  0x36, 0x33, 0x32, 0x16, 0x15, 0x14, 0x06, 0x23, 0x22, 0x26, 0x11, 0x34, 0x36, 0x33, 0x32, 0x16, 
-  0x15, 0x14, 0x06, 0x23, 0x22, 0x26, 0x39, 0x32, 0x24, 0x23, 0x32, 0x32, 0x23, 0x24, 0x32, 0x32, 
-  0x24, 0x23, 0x32, 0x32, 0x23, 0x24, 0x32, 0x01, 0xd9, 0x2e, 0x25, 0x25, 0x2e, 0x2c, 0x27, 0x27, 
-  0xfe, 0x99, 0x2e, 0x25, 0x25, 0x2e, 0x2c, 0x27, 0x27, 0x00, 0x02, 0x00, 0x1f, 0xff, 0x7f, 0x00, 
-  0xe4, 0x02, 0x2c, 0x00, 0x0b, 0x00, 0x14, 0x00, 0x00, 0x13, 0x34, 0x36, 0x33, 0x32, 0x16, 0x15, 
-  0x14, 0x06, 0x23, 0x22, 0x26, 0x13, 0x06, 0x06, 0x07, 0x23, 0x36, 0x36, 0x37, 0x33, 0x39, 0x32, 
-  0x24, 0x23, 0x32, 0x32, 0x23, 0x24, 0x32, 0xa7, 0x0d, 0x30, 0x19, 0x6b, 0x0e, 0x1c, 0x07, 0x89, 
-  0x01, 0xd9, 0x2e, 0x25, 0x25, 0x2e, 0x2c, 0x27, 0x27, 0xfe, 0xbc, 0x35, 0x7e, 0x37, 0x3b, 0x86, 
-  0x34, 0x00, 0x01, 0x00, 0x2b, 0x00, 0x63, 0x02, 0x10, 0x02, 0x71, 0x00, 0x06, 0x00, 0x00, 0x25, 
-  0x25, 0x35, 0x25, 0x15, 0x05, 0x05, 0x02, 0x10, 0xfe, 0x1b, 0x01, 0xe5, 0xfe, 0xb2, 0x01, 0x4e, 
-  0x63, 0xd6, 0x46, 0xf2, 0x75, 0x9b, 0x89, 0x00, 0x02, 0x00, 0x2b, 0x00, 0xcc, 0x02, 0x10, 0x01, 
-  0xf4, 0x00, 0x03, 0x00, 0x07, 0x00, 0x00, 0x13, 0x35, 0x21, 0x15, 0x05, 0x35, 0x21, 0x15, 0x2b, 
-  0x01, 0xe5, 0xfe, 0x1b, 0x01, 0xe5, 0x01, 0x8a, 0x6a, 0x6a, 0xbe, 0x6b, 0x6b, 0x00, 0x01, 0x00, 
-  0x2b, 0x00, 0x63, 0x02, 0x10, 0x02, 0x71, 0x00, 0x06, 0x00, 0x00, 0x37, 0x25, 0x25, 0x35, 0x05, 
-  0x15, 0x05, 0x2b, 0x01, 0x4e, 0xfe, 0xb2, 0x01, 0xe5, 0xfe, 0x1b, 0xd8, 0x89, 0x9b, 0x75, 0xf2, 
-  0x46, 0xd6, 0x00, 0x02, 0x00, 0x03, 0xff, 0xf3, 0x01, 0xc5, 0x02, 0xd4, 0x00, 0x1d, 0x00, 0x29, 
-  0x00, 0x00, 0x13, 0x34, 0x36, 0x37, 0x36, 0x36, 0x35, 0x34, 0x26, 0x23, 0x22, 0x06, 0x07, 0x27, 
-  0x36, 0x36, 0x33, 0x32, 0x16, 0x15, 0x14, 0x06, 0x06, 0x07, 0x0e, 0x02, 0x15, 0x15, 0x23, 0x07, 
-  0x34, 0x36, 0x33, 0x32, 0x16, 0x15, 0x14, 0x06, 0x23, 0x22, 0x26, 0x87, 0x2a, 0x33, 0x2d, 0x27, 
-  0x2f, 0x2a, 0x2a, 0x52, 0x2b, 0x35, 0x31, 0x72, 0x44, 0x68, 0x73, 0x1a, 0x34, 0x27, 0x1d, 0x20, 
-  0x0b, 0x81, 0x10, 0x32, 0x24, 0x23, 0x32, 0x32, 0x23, 0x24, 0x32, 0x01, 0x11, 0x32, 0x44, 0x25, 
-  0x20, 0x2f, 0x20, 0x20, 0x21, 0x1a, 0x16, 0x6b, 0x1b, 0x22, 0x64, 0x4d, 0x29, 0x3c, 0x33, 0x1d, 
-  0x15, 0x1e, 0x1c, 0x15, 0x1d, 0xa7, 0x2e, 0x25, 0x25, 0x2e, 0x2c, 0x27, 0x27, 0x00, 0x02, 0x00, 
-  0x32, 0xff, 0xac, 0x03, 0x4f, 0x02, 0xca, 0x00, 0x3f, 0x00, 0x4d, 0x00, 0x00, 0x01, 0x14, 0x0e, 
-  0x02, 0x23, 0x22, 0x26, 0x27, 0x23, 0x06, 0x06, 0x23, 0x22, 0x26, 0x35, 0x34, 0x36, 0x36, 0x33, 
-  0x32, 0x16, 0x17, 0x07, 0x06, 0x14, 0x15, 0x14, 0x16, 0x33, 0x32, 0x36, 0x36, 0x35, 0x34, 0x26, 
-  0x26, 0x23, 0x22, 0x06, 0x06, 0x15, 0x14, 0x16, 0x33, 0x32, 0x36, 0x37, 0x15, 0x06, 0x06, 0x23, 
-  0x22, 0x26, 0x26, 0x35, 0x34, 0x3e, 0x02, 0x33, 0x32, 0x16, 0x16, 0x05, 0x14, 0x16, 0x33, 0x32, 
-  0x36, 0x37, 0x37, 0x26, 0x26, 0x23, 0x22, 0x06, 0x06, 0x03, 0x4f, 0x16, 0x2d, 0x44, 0x2e, 0x25, 
-  0x38, 0x0b, 0x08, 0x14, 0x43, 0x2f, 0x59, 0x61, 0x3a, 0x6a, 0x48, 0x2f, 0x65, 0x1c, 0x0a, 0x01, 
-  0x17, 0x0e, 0x17, 0x1e, 0x0f, 0x44, 0x75, 0x4b, 0x69, 0x8f, 0x4a, 0x91, 0x88, 0x3a, 0x7e, 0x34, 
-  0x30, 0x76, 0x42, 0x7c, 0xb0, 0x5d, 0x3c, 0x71, 0x9e, 0x62, 0x6b, 0xa6, 0x5f, 0xfe, 0x0c, 0x2e, 
-  0x26, 0x32, 0x29, 0x04, 0x06, 0x0b, 0x1c, 0x11, 0x2f, 0x39, 0x19, 0x01, 0x66, 0x2e, 0x5a, 0x4a, 
-  0x2b, 0x23, 0x1c, 0x19, 0x26, 0x6b, 0x57, 0x43, 0x67, 0x3b, 0x11, 0x0a, 0xcd, 0x0a, 0x15, 0x03, 
-  0x29, 0x1b, 0x2d, 0x4b, 0x2d, 0x54, 0x75, 0x3e, 0x57, 0x96, 0x61, 0x87, 0x90, 0x1a, 0x13, 0x5e, 
-  0x14, 0x18, 0x58, 0xa5, 0x74, 0x5b, 0x9c, 0x75, 0x41, 0x56, 0xa0, 0xab, 0x37, 0x30, 0x49, 0x3b, 
-  0x6c, 0x02, 0x03, 0x29, 0x41, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0xb2, 0x02, 0xcd, 0x00, 
-  0x07, 0x00, 0x12, 0x00, 0x00, 0x21, 0x27, 0x21, 0x07, 0x23, 0x13, 0x33, 0x13, 0x01, 0x2e, 0x02, 
-  0x27, 0x0e, 0x02, 0x07, 0x07, 0x33, 0x02, 0x0f, 0x34, 0xfe, 0xfc, 0x34, 0xa3, 0xfc, 0xb9, 0xfd, 
-  0xfe, 0xd1, 0x05, 0x10, 0x10, 0x05, 0x05, 0x11, 0x0f, 0x04, 0x33, 0xba, 0xaa, 0xaa, 0x02, 0xcd, 
-  0xfd, 0x33, 0x01, 0xcf, 0x11, 0x34, 0x36, 0x14, 0x14, 0x3b, 0x35, 0x0b, 0xa6, 0x00, 0x03, 0x00, 
-  0x5a, 0x00, 0x00, 0x02, 0x6b, 0x02, 0xca, 0x00, 0x10, 0x00, 0x19, 0x00, 0x22, 0x00, 0x00, 0x01, 
-  0x32, 0x16, 0x15, 0x14, 0x06, 0x07, 0x15, 0x1e, 0x02, 0x15, 0x14, 0x06, 0x23, 0x21, 0x11, 0x13, 
-  0x32, 0x36, 0x35, 0x34, 0x26, 0x23, 0x23, 0x1d, 0x02, 0x33, 0x32, 0x36, 0x35, 0x34, 0x26, 0x23, 
-  0x01, 0x38, 0x8f, 0x92, 0x39, 0x35, 0x24, 0x3a, 0x22, 0x8c, 0x7a, 0xfe, 0xf5, 0xef, 0x42, 0x33, 
-  0x3c, 0x41, 0x50, 0x63, 0x44, 0x36, 0x37, 0x48, 0x02, 0xca, 0x50, 0x65, 0x3d, 0x54, 0x09, 0x05, 
-  0x07, 0x24, 0x44, 0x38, 0x61, 0x6e, 0x02, 0xca, 0xfe, 0xe5, 0x2a, 0x28, 0x29, 0x24, 0x9f, 0x78, 
-  0xba, 0x35, 0x2c, 0x28, 0x31, 0x00, 0x01, 0x00, 0x3a, 0xff, 0xf6, 0x02, 0x5a, 0x02, 0xd4, 0x00, 
-  0x1b, 0x00, 0x00, 0x01, 0x22, 0x06, 0x15, 0x14, 0x16, 0x33, 0x32, 0x36, 0x37, 0x15, 0x06, 0x06, 
-  0x23, 0x22, 0x26, 0x26, 0x35, 0x34, 0x36, 0x36, 0x33, 0x32, 0x16, 0x17, 0x07, 0x26, 0x26, 0x01, 
-  0x89, 0x57, 0x5c, 0x55, 0x5e, 0x2c, 0x57, 0x33, 0x2f, 0x5c, 0x39, 0x6e, 0x8f, 0x44, 0x4e, 0x95, 
-  0x6c, 0x35, 0x6b, 0x31, 0x31, 0x28, 0x51, 0x02, 0x56, 0x82, 0x71, 0x72, 0x7d, 0x14, 0x12, 0x7f, 
-  0x13, 0x12, 0x5b, 0xa5, 0x6e, 0x6c, 0xa6, 0x5e, 0x1b, 0x17, 0x7b, 0x13, 0x1c, 0x00, 0x02, 0x00, 
-  0x5a, 0x00, 0x00, 0x02, 0xaa, 0x02, 0xca, 0x00, 0x09, 0x00, 0x11, 0x00, 0x00, 0x01, 0x14, 0x06, 
-  0x23, 0x23, 0x11, 0x33, 0x32, 0x16, 0x16, 0x07, 0x34, 0x26, 0x23, 0x23, 0x11, 0x33, 0x32, 0x02, 
-  0xaa, 0xcd, 0xb9, 0xca, 0xe0, 0x70, 0xa5, 0x5b, 0x9d, 0x68, 0x63, 0x51, 0x41, 0xdb, 0x01, 0x6c, 
-  0xb5, 0xb7, 0x02, 0xca, 0x50, 0x9b, 0x77, 0x77, 0x6f, 0xfe, 0x2f, 0x00, 0x01, 0x00, 0x5a, 0x00, 
-  0x00, 0x01, 0xf5, 0x02, 0xca, 0x00, 0x0b, 0x00, 0x00, 0x21, 0x21, 0x11, 0x21, 0x15, 0x21, 0x15, 
-  0x33, 0x15, 0x23, 0x15, 0x21, 0x01, 0xf5, 0xfe, 0x65, 0x01, 0x9b, 0xfe, 0xfc, 0xf2, 0xf2, 0x01, 
-  0x04, 0x02, 0xca, 0x7c, 0x9d, 0x7c, 0xb8, 0x00, 0x01, 0x00, 0x5a, 0x00, 0x00, 0x01, 0xf3, 0x02, 
-  0xca, 0x00, 0x09, 0x00, 0x00, 0x33, 0x23, 0x11, 0x21, 0x15, 0x21, 0x15, 0x33, 0x15, 0x23, 0xef, 
-  0x95, 0x01, 0x99, 0xfe, 0xfc, 0xf2, 0xf2, 0x02, 0xca, 0x7c, 0xb8, 0x7c, 0x00, 0x01, 0x00, 0x3a, 
-  0xff, 0xf6, 0x02, 0x84, 0x02, 0xd4, 0x00, 0x20, 0x00, 0x00, 0x01, 0x21, 0x11, 0x06, 0x06, 0x23, 
-  0x22, 0x26, 0x35, 0x34, 0x36, 0x36, 0x33, 0x32, 0x16, 0x17, 0x07, 0x26, 0x26, 0x23, 0x22, 0x06, 
-  0x06, 0x15, 0x14, 0x16, 0x16, 0x33, 0x32, 0x36, 0x37, 0x35, 0x23, 0x01, 0x69, 0x01, 0x1b, 0x38, 
-  0x79, 0x4d, 0xa0, 0xac, 0x57, 0xa6, 0x78, 0x39, 0x6e, 0x2d, 0x32, 0x21, 0x54, 0x2e, 0x42, 0x61, 
-  0x35, 0x26, 0x52, 0x42, 0x20, 0x2d, 0x13, 0x87, 0x01, 0x91, 0xfe, 0x8e, 0x13, 0x16, 0xbc, 0xb4, 
-  0x70, 0xa4, 0x5a, 0x18, 0x14, 0x79, 0x11, 0x16, 0x3c, 0x6d, 0x4a, 0x46, 0x6c, 0x3d, 0x06, 0x04, 
-  0x95, 0x00, 0x01, 0x00, 0x5a, 0x00, 0x00, 0x02, 0xa3, 0x02, 0xca, 0x00, 0x0b, 0x00, 0x00, 0x21, 
-  0x23, 0x11, 0x21, 0x11, 0x23, 0x11, 0x33, 0x11, 0x21, 0x11, 0x33, 0x02, 0xa3, 0x97, 0xfe, 0xe5, 
-  0x97, 0x97, 0x01, 0x1b, 0x97, 0x01, 0x34, 0xfe, 0xcc, 0x02, 0xca, 0xfe, 0xe8, 0x01, 0x18, 0x00, 
-  0x01, 0x00, 0x20, 0x00, 0x00, 0x01, 0x65, 0x02, 0xca, 0x00, 0x0b, 0x00, 0x00, 0x21, 0x21, 0x35, 
-  0x37, 0x11, 0x27, 0x35, 0x21, 0x15, 0x07, 0x11, 0x17, 0x01, 0x65, 0xfe, 0xbb, 0x57, 0x57, 0x01, 
-  0x45, 0x57, 0x57, 0x56, 0x28, 0x01, 0xce, 0x28, 0x56, 0x56, 0x28, 0xfe, 0x32, 0x28, 0x00, 0x01, 
-  0xff, 0xb6, 0xff, 0x2e, 0x00, 0xf1, 0x02, 0xca, 0x00, 0x11, 0x00, 0x00, 0x17, 0x22, 0x26, 0x27, 
-  0x35, 0x16, 0x16, 0x33, 0x32, 0x36, 0x36, 0x35, 0x11, 0x33, 0x11, 0x14, 0x06, 0x06, 0x0f, 0x1d, 
-  0x2c, 0x10, 0x10, 0x23, 0x14, 0x1a, 0x2b, 0x18, 0x97, 0x39, 0x66, 0xd2, 0x07, 0x04, 0x7e, 0x04, 
-  0x06, 0x14, 0x38, 0x34, 0x02, 0x9d, 0xfd, 0x64, 0x5c, 0x71, 0x33, 0x00, 0x01, 0x00, 0x5a, 0x00, 
-  0x00, 0x02, 0x98, 0x02, 0xca, 0x00, 0x0e, 0x00, 0x00, 0x21, 0x23, 0x03, 0x07, 0x15, 0x23, 0x11, 
-  0x33, 0x11, 0x36, 0x36, 0x37, 0x37, 0x33, 0x03, 0x02, 0x98, 0xac, 0xbb, 0x40, 0x97, 0x97, 0x0f, 
-  0x1e, 0x0f, 0xc1, 0xa8, 0xf9, 0x01, 0x2d, 0x2e, 0xff, 0x02, 0xca, 0xfe, 0xb9, 0x15, 0x2a, 0x15, 
-  0xf3, 0xfe, 0xc4, 0x00, 0x01, 0x00, 0x5a, 0x00, 0x00, 0x02, 0x13, 0x02, 0xca, 0x00, 0x05, 0x00, 
-  0x00, 0x33, 0x11, 0x33, 0x11, 0x21, 0x15, 0x5a, 0x97, 0x01, 0x22, 0x02, 0xca, 0xfd, 0xb3, 0x7d, 
-  0x00, 0x01, 0x00, 0x5a, 0x00, 0x00, 0x03, 0x55, 0x02, 0xca, 0x00, 0x17, 0x00, 0x00, 0x21, 0x03, 
-  0x23, 0x1e, 0x02, 0x15, 0x11, 0x23, 0x11, 0x33, 0x13, 0x33, 0x13, 0x33, 0x11, 0x23, 0x11, 0x34, 
-  0x36, 0x36, 0x37, 0x23, 0x03, 0x01, 0x88, 0xac, 0x04, 0x01, 0x04, 0x04, 0x87, 0xce, 0xa9, 0x03, 
-  0xb3, 0xce, 0x8d, 0x03, 0x03, 0x01, 0x04, 0xb8, 0x02, 0x30, 0x14, 0x50, 0x5b, 0x25, 0xfe, 0xb4, 
-  0x02, 0xca, 0xfd, 0xde, 0x02, 0x22, 0xfd, 0x36, 0x01, 0x52, 0x22, 0x58, 0x4f, 0x14, 0xfd, 0xd1, 
-  0x00, 0x01, 0x00, 0x5a, 0x00, 0x00, 0x02, 0xd3, 0x02, 0xca, 0x00, 0x11, 0x00, 0x00, 0x21, 0x23, 
-  0x01, 0x23, 0x16, 0x16, 0x17, 0x11, 0x23, 0x11, 0x33, 0x01, 0x33, 0x26, 0x26, 0x27, 0x11, 0x33, 
-  0x02, 0xd3, 0xc0, 0xfe, 0xc9, 0x04, 0x02, 0x05, 0x02, 0x87, 0xbf, 0x01, 0x36, 0x03, 0x01, 0x04, 
-  0x02, 0x88, 0x02, 0x1c, 0x33, 0x66, 0x33, 0xfe, 0xb0, 0x02, 0xca, 0xfd, 0xe9, 0x32, 0x62, 0x31, 
-  0x01, 0x52, 0x00, 0x02, 0x00, 0x3a, 0xff, 0xf6, 0x02, 0xe2, 0x02, 0xd5, 0x00, 0x0f, 0x00, 0x1b, 
-  0x00, 0x00, 0x01, 0x14, 0x06, 0x06, 0x23, 0x22, 0x26, 0x26, 0x35, 0x34, 0x36, 0x36, 0x33, 0x32, 
-  0x16, 0x16, 0x05, 0x14, 0x16, 0x33, 0x32, 0x36, 0x35, 0x34, 0x26, 0x23, 0x22, 0x06, 0x02, 0xe2, 
-  0x49, 0x96, 0x75, 0x74, 0x97, 0x49, 0x49, 0x97, 0x75, 0x74, 0x96, 0x49, 0xfd, 0xf7, 0x56, 0x5f, 
-  0x61, 0x54, 0x54, 0x60, 0x60, 0x56, 0x01, 0x66, 0x6f, 0xa5, 0x5c, 0x5c, 0xa6, 0x6f, 0x6f, 0xa4, 
-  0x5b, 0x5b, 0xa5, 0x6f, 0x70, 0x81, 0x81, 0x70, 0x71, 0x80, 0x80, 0x00, 0x02, 0x00, 0x5a, 0x00, 
-  0x00, 0x02, 0x47, 0x02, 0xca, 0x00, 0x0b, 0x00, 0x13, 0x00, 0x00, 0x01, 0x32, 0x16, 0x15, 0x14, 
-  0x06, 0x06, 0x23, 0x23, 0x15, 0x23, 0x11, 0x17, 0x23, 0x15, 0x33, 0x32, 0x36, 0x35, 0x34, 0x01, 
-  0x3e, 0x8a, 0x7f, 0x34, 0x79, 0x68, 0x41, 0x97, 0xdc, 0x45, 0x32, 0x40, 0x4b, 0x02, 0xca, 0x77, 
-  0x68, 0x3e, 0x6d, 0x42, 0xfe, 0x02, 0xca, 0x7c, 0xd4, 0x33, 0x39, 0x68, 0x00, 0x02, 0x00, 0x3a, 
-  0xff, 0x56, 0x02, 0xe2, 0x02, 0xd5, 0x00, 0x12, 0x00, 0x1e, 0x00, 0x00, 0x01, 0x14, 0x06, 0x07, 
-  0x17, 0x23, 0x27, 0x23, 0x22, 0x26, 0x26, 0x35, 0x34, 0x36, 0x36, 0x33, 0x32, 0x16, 0x16, 0x05, 
-  0x14, 0x16, 0x33, 0x32, 0x36, 0x35, 0x34, 0x26, 0x23, 0x22, 0x06, 0x02, 0xe2, 0x56, 0x5a, 0xac, 
-  0xc2, 0x83, 0x0b, 0x74, 0x97, 0x49, 0x49, 0x97, 0x75, 0x74, 0x96, 0x49, 0xfd, 0xf7, 0x56, 0x5f, 
-  0x61, 0x54, 0x54, 0x60, 0x60, 0x56, 0x01, 0x66, 0x78, 0xaf, 0x29, 0xc0, 0xa0, 0x5c, 0xa6, 0x6f, 
-  0x6f, 0xa4, 0x5b, 0x5b, 0xa5, 0x6f, 0x70, 0x81, 0x81, 0x70, 0x71, 0x80, 0x80, 0x00, 0x02, 0x00, 
-  0x5a, 0x00, 0x00, 0x02, 0x94, 0x02, 0xca, 0x00, 0x0e, 0x00, 0x17, 0x00, 0x00, 0x01, 0x32, 0x16, 
-  0x15, 0x14, 0x06, 0x06, 0x07, 0x13, 0x23, 0x03, 0x23, 0x11, 0x23, 0x11, 0x17, 0x23, 0x15, 0x33, 
-  0x32, 0x36, 0x35, 0x34, 0x26, 0x01, 0x2a, 0x92, 0x8b, 0x25, 0x3d, 0x23, 0xd2, 0xa8, 0xaa, 0x51, 
-  0x97, 0xc5, 0x2e, 0x31, 0x4b, 0x41, 0x45, 0x02, 0xca, 0x6a, 0x6c, 0x31, 0x49, 0x33, 0x10, 0xfe, 
-  0xc9, 0x01, 0x12, 0xfe, 0xee, 0x02, 0xca, 0x7c, 0xc1, 0x32, 0x31, 0x33, 0x2b, 0x00, 0x01, 0x00, 
-  0x2e, 0xff, 0xf6, 0x01, 0xff, 0x02, 0xd4, 0x00, 0x28, 0x00, 0x00, 0x25, 0x14, 0x06, 0x23, 0x22, 
-  0x27, 0x35, 0x16, 0x16, 0x33, 0x32, 0x36, 0x35, 0x34, 0x26, 0x26, 0x27, 0x2e, 0x03, 0x35, 0x34, 
-  0x36, 0x33, 0x32, 0x16, 0x17, 0x07, 0x26, 0x26, 0x23, 0x22, 0x06, 0x15, 0x14, 0x16, 0x17, 0x1e, 
-  0x02, 0x01, 0xff, 0x89, 0x7e, 0x71, 0x59, 0x33, 0x6d, 0x36, 0x38, 0x2f, 0x25, 0x3e, 0x28, 0x19, 
-  0x3a, 0x35, 0x22, 0x82, 0x70, 0x38, 0x65, 0x37, 0x31, 0x31, 0x4e, 0x29, 0x2b, 0x2e, 0x44, 0x43, 
-  0x37, 0x4d, 0x2a, 0xc6, 0x5f, 0x71, 0x2b, 0x8d, 0x16, 0x25, 0x2b, 0x21, 0x1b, 0x26, 0x21, 0x13, 
-  0x0c, 0x21, 0x31, 0x46, 0x31, 0x60, 0x6b, 0x1a, 0x18, 0x76, 0x14, 0x16, 0x28, 0x20, 0x26, 0x2c, 
-  0x20, 0x1a, 0x38, 0x4c, 0x00, 0x01, 0x00, 0x14, 0x00, 0x00, 0x02, 0x2f, 0x02, 0xca, 0x00, 0x07, 
-  0x00, 0x00, 0x21, 0x23, 0x11, 0x23, 0x35, 0x21, 0x15, 0x23, 0x01, 0x6d, 0x97, 0xc2, 0x02, 0x1b, 
-  0xc2, 0x02, 0x4c, 0x7e, 0x7e, 0x00, 0x01, 0x00, 0x55, 0xff, 0xf6, 0x02, 0x9f, 0x02, 0xca, 0x00, 
-  0x12, 0x00, 0x00, 0x25, 0x14, 0x06, 0x06, 0x23, 0x22, 0x26, 0x35, 0x11, 0x33, 0x11, 0x14, 0x16, 
-  0x33, 0x32, 0x36, 0x35, 0x11, 0x33, 0x02, 0x9f, 0x41, 0x83, 0x64, 0x8e, 0x94, 0x97, 0x48, 0x47, 
-  0x4a, 0x43, 0x97, 0xfc, 0x4a, 0x77, 0x45, 0x91, 0x77, 0x01, 0xcc, 0xfe, 0x4b, 0x58, 0x48, 0x4e, 
-  0x53, 0x01, 0xb4, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x8a, 0x02, 0xca, 0x00, 0x0e, 0x00, 
-  0x00, 0x01, 0x03, 0x23, 0x03, 0x33, 0x13, 0x1e, 0x02, 0x17, 0x3e, 0x02, 0x37, 0x13, 0x02, 0x8a, 
-  0xf3, 0xa5, 0xf2, 0x99, 0x86, 0x04, 0x0f, 0x10, 0x03, 0x03, 0x0f, 0x10, 0x03, 0x87, 0x02, 0xca, 
-  0xfd, 0x36, 0x02, 0xca, 0xfe, 0x57, 0x0b, 0x3b, 0x41, 0x16, 0x16, 0x41, 0x3b, 0x0b, 0x01, 0xa9, 
-  0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0xc7, 0x02, 0xca, 0x00, 0x26, 0x00, 0x00, 0x01, 0x03, 
-  0x23, 0x03, 0x2e, 0x03, 0x27, 0x0e, 0x03, 0x07, 0x03, 0x23, 0x03, 0x33, 0x13, 0x1e, 0x02, 0x17, 
-  0x3e, 0x02, 0x37, 0x13, 0x33, 0x13, 0x1e, 0x02, 0x17, 0x3e, 0x02, 0x37, 0x13, 0x03, 0xc7, 0xb6, 
-  0xac, 0x61, 0x03, 0x09, 0x0b, 0x08, 0x02, 0x01, 0x09, 0x0a, 0x0a, 0x03, 0x60, 0xac, 0xb6, 0x95, 
-  0x5b, 0x06, 0x0e, 0x0c, 0x03, 0x03, 0x0c, 0x0d, 0x05, 0x68, 0x8f, 0x68, 0x05, 0x0d, 0x0c, 0x03, 
-  0x03, 0x0c, 0x0f, 0x05, 0x5b, 0x02, 0xca, 0xfd, 0x36, 0x01, 0x77, 0x0b, 0x2c, 0x34, 0x2f, 0x0d, 
-  0x0d, 0x2f, 0x33, 0x2d, 0x0c, 0xfe, 0x8a, 0x02, 0xca, 0xfe, 0x7a, 0x17, 0x46, 0x46, 0x18, 0x19, 
-  0x45, 0x41, 0x12, 0x01, 0x90, 0xfe, 0x70, 0x11, 0x42, 0x46, 0x18, 0x19, 0x45, 0x46, 0x17, 0x01, 
-  0x86, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x9b, 0x02, 0xca, 0x00, 0x0b, 0x00, 0x00, 0x21, 
-  0x23, 0x03, 0x03, 0x23, 0x13, 0x03, 0x33, 0x13, 0x13, 0x33, 0x03, 0x02, 0x9b, 0xad, 0xa6, 0xa6, 
-  0xa2, 0xed, 0xde, 0xa7, 0x9a, 0x97, 0xa3, 0xe0, 0x01, 0x0e, 0xfe, 0xf2, 0x01, 0x70, 0x01, 0x5a, 
-  0xfe, 0xff, 0x01, 0x01, 0xfe, 0x9e, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x70, 0x02, 0xca, 
-  0x00, 0x08, 0x00, 0x00, 0x01, 0x13, 0x33, 0x03, 0x11, 0x23, 0x11, 0x03, 0x33, 0x01, 0x38, 0x95, 
-  0xa3, 0xed, 0x96, 0xed, 0xa4, 0x01, 0xa4, 0x01, 0x26, 0xfe, 0x4c, 0xfe, 0xea, 0x01, 0x11, 0x01, 
-  0xb9, 0x00, 0x01, 0x00, 0x18, 0x00, 0x00, 0x02, 0x2b, 0x02, 0xca, 0x00, 0x09, 0x00, 0x00, 0x21, 
-  0x21, 0x35, 0x01, 0x21, 0x35, 0x21, 0x15, 0x01, 0x21, 0x02, 0x2b, 0xfd, 0xed, 0x01, 0x56, 0xfe, 
-  0xb3, 0x02, 0x01, 0xfe, 0xaa, 0x01, 0x5f, 0x62, 0x01, 0xeb, 0x7d, 0x62, 0xfe, 0x15, 0x00, 0x01, 
-  0x00, 0x46, 0xff, 0x62, 0x01, 0x32, 0x02, 0xca, 0x00, 0x07, 0x00, 0x00, 0x05, 0x23, 0x11, 0x33, 
-  0x15, 0x23, 0x11, 0x33, 0x01, 0x32, 0xec, 0xec, 0x6d, 0x6d, 0x9e, 0x03, 0x68, 0x67, 0xfd, 0x66, 
-  0x00, 0x01, 0x00, 0x06, 0x00, 0x00, 0x01, 0x97, 0x02, 0xca, 0x00, 0x03, 0x00, 0x00, 0x13, 0x01, 
-  0x23, 0x01, 0x8d, 0x01, 0x0a, 0x87, 0xfe, 0xf6, 0x02, 0xca, 0xfd, 0x36, 0x02, 0xca, 0x00, 0x01, 
-  0x00, 0x19, 0xff, 0x62, 0x01, 0x05, 0x02, 0xca, 0x00, 0x07, 0x00, 0x00, 0x17, 0x33, 0x11, 0x23, 
-  0x35, 0x33, 0x11, 0x23, 0x19, 0x6d, 0x6d, 0xec, 0xec, 0x37, 0x02, 0x9a, 0x67, 0xfc, 0x98, 0x00, 
-  0x01, 0x00, 0x17, 0x00, 0xfe, 0x02, 0x25, 0x02, 0xce, 0x00, 0x06, 0x00, 0x00, 0x37, 0x13, 0x33, 
-  0x13, 0x23, 0x03, 0x03, 0x17, 0xd6, 0x46, 0xf2, 0x75, 0x9d, 0x89, 0xfe, 0x01, 0xd0, 0xfe, 0x30, 
-  0x01, 0x3a, 0xfe, 0xc6, 0x00, 0x01, 0xff, 0xfe, 0xff, 0x62, 0x01, 0x9d, 0xff, 0xa6, 0x00, 0x03, 
-  0x00, 0x00, 0x05, 0x21, 0x35, 0x21, 0x01, 0x9d, 0xfe, 0x61, 0x01, 0x9f, 0x9e, 0x44, 0x00, 0x01, 
-  0x00, 0x28, 0x02, 0x5e, 0x01, 0x42, 0x02, 0xfe, 0x00, 0x0c, 0x00, 0x00, 0x13, 0x1e, 0x02, 0x17, 
-  0x15, 0x23, 0x2e, 0x03, 0x27, 0x35, 0xcf, 0x0f, 0x29, 0x2b, 0x10, 0x63, 0x13, 0x33, 0x35, 0x2e, 
-  0x0e, 0x02, 0xfe, 0x16, 0x37, 0x33, 0x13, 0x0d, 0x0d, 0x27, 0x2c, 0x28, 0x0e, 0x0a, 0x00, 0x02, 
-  0x00, 0x2a, 0xff, 0xf6, 0x02, 0x11, 0x02, 0x2d, 0x00, 0x1b, 0x00, 0x26, 0x00, 0x00, 0x01, 0x32, 
-  0x16, 0x15, 0x11, 0x23, 0x27, 0x23, 0x06, 0x06, 0x23, 0x22, 0x26, 0x35, 0x34, 0x36, 0x37, 0x37, 
-  0x35, 0x34, 0x26, 0x23, 0x22, 0x06, 0x07, 0x27, 0x36, 0x36, 0x13, 0x06, 0x06, 0x15, 0x14, 0x16, 
-  0x33, 0x32, 0x36, 0x35, 0x35, 0x01, 0x2e, 0x6e, 0x75, 0x68, 0x1d, 0x04, 0x23, 0x4e, 0x44, 0x49, 
-  0x60, 0x7a, 0x7a, 0x5f, 0x2d, 0x28, 0x28, 0x4c, 0x26, 0x31, 0x2c, 0x6b, 0x4f, 0x48, 0x38, 0x28, 
-  0x20, 0x30, 0x42, 0x02, 0x2d, 0x5f, 0x62, 0xfe, 0x94, 0x4a, 0x2c, 0x28, 0x55, 0x58, 0x57, 0x53, 
-  0x04, 0x03, 0x18, 0x2b, 0x28, 0x17, 0x11, 0x65, 0x17, 0x1a, 0xfe, 0xce, 0x02, 0x30, 0x27, 0x22, 
-  0x1d, 0x39, 0x34, 0x2d, 0x00, 0x02, 0x00, 0x4e, 0xff, 0xf6, 0x02, 0x4c, 0x02, 0xf8, 0x00, 0x15, 
-  0x00, 0x22, 0x00, 0x00, 0x13, 0x14, 0x06, 0x07, 0x33, 0x36, 0x36, 0x33, 0x32, 0x16, 0x15, 0x14, 
-  0x06, 0x23, 0x22, 0x26, 0x27, 0x23, 0x07, 0x23, 0x11, 0x33, 0x13, 0x22, 0x06, 0x07, 0x15, 0x14, 
-  0x16, 0x33, 0x32, 0x36, 0x35, 0x34, 0x26, 0xe3, 0x04, 0x02, 0x06, 0x16, 0x4a, 0x3b, 0x5c, 0x72, 
-  0x74, 0x5e, 0x3c, 0x45, 0x16, 0x0a, 0x19, 0x72, 0x95, 0x6b, 0x3a, 0x2f, 0x02, 0x2f, 0x3e, 0x2e, 
-  0x36, 0x37, 0x02, 0x47, 0x1f, 0x3c, 0x11, 0x22, 0x2f, 0x8f, 0x8b, 0x8c, 0x90, 0x2b, 0x1b, 0x3c, 
-  0x02, 0xf8, 0xfe, 0xbd, 0x48, 0x4a, 0x10, 0x4f, 0x55, 0x55, 0x50, 0x50, 0x51, 0x00, 0x01, 0x00, 
-  0x2d, 0xff, 0xf6, 0x01, 0xe3, 0x02, 0x2c, 0x00, 0x19, 0x00, 0x00, 0x05, 0x22, 0x26, 0x35, 0x34, 
-  0x36, 0x36, 0x33, 0x32, 0x16, 0x17, 0x07, 0x26, 0x26, 0x23, 0x22, 0x15, 0x14, 0x16, 0x33, 0x32, 
-  0x36, 0x37, 0x15, 0x06, 0x06, 0x01, 0x2c, 0x7a, 0x85, 0x44, 0x79, 0x4f, 0x38, 0x53, 0x1f, 0x2c, 
-  0x23, 0x3d, 0x1e, 0x74, 0x3d, 0x37, 0x2f, 0x48, 0x22, 0x22, 0x4b, 0x0a, 0x87, 0x91, 0x64, 0x7e, 
-  0x3c, 0x16, 0x0f, 0x73, 0x0e, 0x12, 0xa5, 0x52, 0x4e, 0x19, 0x16, 0x7f, 0x16, 0x13, 0x00, 0x02, 
-  0x00, 0x2d, 0xff, 0xf6, 0x02, 0x2b, 0x02, 0xf8, 0x00, 0x15, 0x00, 0x22, 0x00, 0x00, 0x17, 0x22, 
-  0x26, 0x35, 0x34, 0x36, 0x33, 0x32, 0x16, 0x17, 0x33, 0x26, 0x26, 0x35, 0x35, 0x33, 0x11, 0x23, 
-  0x27, 0x23, 0x06, 0x06, 0x27, 0x32, 0x36, 0x37, 0x35, 0x34, 0x26, 0x23, 0x22, 0x06, 0x15, 0x14, 
-  0x16, 0xfb, 0x5b, 0x73, 0x74, 0x5e, 0x3b, 0x4c, 0x16, 0x05, 0x03, 0x08, 0x95, 0x72, 0x1d, 0x06, 
-  0x16, 0x4a, 0x07, 0x3e, 0x32, 0x01, 0x31, 0x42, 0x31, 0x38, 0x38, 0x0a, 0x8f, 0x8b, 0x8c, 0x90, 
-  0x2e, 0x22, 0x10, 0x3d, 0x20, 0xaf, 0xfd, 0x08, 0x47, 0x22, 0x2f, 0x77, 0x49, 0x49, 0x10, 0x50, 
-  0x54, 0x55, 0x50, 0x50, 0x51, 0x00, 0x02, 0x00, 0x2d, 0xff, 0xf6, 0x02, 0x24, 0x02, 0x2c, 0x00, 
-  0x16, 0x00, 0x1d, 0x00, 0x00, 0x01, 0x32, 0x16, 0x15, 0x15, 0x21, 0x16, 0x16, 0x33, 0x32, 0x36, 
-  0x37, 0x15, 0x06, 0x06, 0x23, 0x22, 0x26, 0x26, 0x35, 0x34, 0x36, 0x36, 0x17, 0x22, 0x06, 0x07, 
-  0x33, 0x26, 0x26, 0x01, 0x2f, 0x71, 0x84, 0xfe, 0xa0, 0x02, 0x47, 0x3f, 0x35, 0x56, 0x2e, 0x28, 
-  0x59, 0x3f, 0x52, 0x7e, 0x48, 0x41, 0x74, 0x4e, 0x2b, 0x39, 0x05, 0xd1, 0x01, 0x32, 0x02, 0x2c, 
-  0x81, 0x77, 0x48, 0x3f, 0x48, 0x15, 0x16, 0x73, 0x14, 0x13, 0x3d, 0x7c, 0x5e, 0x60, 0x7f, 0x40, 
-  0x6a, 0x38, 0x3b, 0x32, 0x41, 0x00, 0x01, 0x00, 0x14, 0x00, 0x00, 0x01, 0xb0, 0x02, 0xfd, 0x00, 
-  0x18, 0x00, 0x00, 0x01, 0x23, 0x11, 0x23, 0x11, 0x23, 0x35, 0x37, 0x35, 0x34, 0x36, 0x36, 0x33, 
-  0x32, 0x16, 0x17, 0x07, 0x26, 0x26, 0x23, 0x22, 0x06, 0x15, 0x15, 0x33, 0x01, 0x7c, 0x81, 0x95, 
-  0x52, 0x52, 0x2f, 0x57, 0x3b, 0x2c, 0x47, 0x16, 0x26, 0x11, 0x28, 0x1a, 0x1f, 0x1d, 0x81, 0x01, 
-  0xb2, 0xfe, 0x4e, 0x01, 0xb2, 0x48, 0x28, 0x28, 0x46, 0x4d, 0x20, 0x0e, 0x09, 0x6d, 0x05, 0x09, 
-  0x26, 0x1d, 0x22, 0x00, 0x02, 0x00, 0x2d, 0xff, 0x10, 0x02, 0x2b, 0x02, 0x2c, 0x00, 0x1e, 0x00, 
-  0x29, 0x00, 0x00, 0x13, 0x32, 0x17, 0x33, 0x37, 0x33, 0x11, 0x14, 0x06, 0x23, 0x22, 0x26, 0x27, 
-  0x35, 0x16, 0x33, 0x32, 0x35, 0x35, 0x34, 0x36, 0x37, 0x23, 0x06, 0x06, 0x23, 0x22, 0x26, 0x35, 
-  0x34, 0x36, 0x17, 0x22, 0x15, 0x14, 0x33, 0x32, 0x36, 0x35, 0x35, 0x34, 0x26, 0xff, 0x65, 0x39, 
-  0x04, 0x0c, 0x7e, 0x8a, 0x87, 0x3a, 0x63, 0x2f, 0x65, 0x70, 0x73, 0x03, 0x01, 0x04, 0x1c, 0x4e, 
-  0x31, 0x61, 0x6d, 0x70, 0x91, 0x69, 0x6b, 0x39, 0x37, 0x36, 0x02, 0x2c, 0x50, 0x46, 0xfd, 0xdd, 
-  0x75, 0x7a, 0x0e, 0x12, 0x77, 0x2a, 0x7c, 0x0b, 0x11, 0x24, 0x0e, 0x2b, 0x26, 0x95, 0x85, 0x86, 
-  0x96, 0x79, 0xa5, 0xa3, 0x41, 0x51, 0x12, 0x58, 0x4c, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00, 0x02, 
-  0x46, 0x02, 0xf8, 0x00, 0x16, 0x00, 0x00, 0x13, 0x14, 0x06, 0x07, 0x33, 0x36, 0x36, 0x33, 0x32, 
-  0x16, 0x15, 0x11, 0x23, 0x11, 0x34, 0x23, 0x22, 0x06, 0x15, 0x11, 0x23, 0x11, 0x33, 0xe3, 0x05, 
-  0x02, 0x08, 0x1a, 0x52, 0x32, 0x59, 0x6b, 0x95, 0x58, 0x43, 0x33, 0x95, 0x95, 0x02, 0x5d, 0x28, 
-  0x4a, 0x0f, 0x2a, 0x26, 0x5f, 0x69, 0xfe, 0x9c, 0x01, 0x3f, 0x76, 0x5d, 0x57, 0xfe, 0xff, 0x02, 
-  0xf8, 0x00, 0x02, 0x00, 0x48, 0x00, 0x00, 0x00, 0xea, 0x02, 0xf8, 0x00, 0x0b, 0x00, 0x0f, 0x00, 
-  0x00, 0x13, 0x32, 0x16, 0x15, 0x14, 0x06, 0x23, 0x22, 0x26, 0x35, 0x34, 0x36, 0x17, 0x11, 0x23, 
-  0x11, 0x99, 0x21, 0x30, 0x30, 0x21, 0x22, 0x2f, 0x2f, 0x6c, 0x95, 0x02, 0xf8, 0x1f, 0x2a, 0x29, 
-  0x20, 0x20, 0x29, 0x2a, 0x1f, 0xd6, 0xfd, 0xde, 0x02, 0x22, 0x00, 0x02, 0xff, 0xc0, 0xff, 0x10, 
-  0x00, 0xea, 0x02, 0xf8, 0x00, 0x0b, 0x00, 0x1c, 0x00, 0x00, 0x13, 0x34, 0x36, 0x33, 0x32, 0x16, 
-  0x15, 0x14, 0x06, 0x23, 0x22, 0x26, 0x03, 0x22, 0x26, 0x27, 0x35, 0x16, 0x16, 0x33, 0x32, 0x36, 
-  0x35, 0x11, 0x33, 0x11, 0x14, 0x06, 0x06, 0x48, 0x2f, 0x22, 0x21, 0x30, 0x30, 0x21, 0x22, 0x2f, 
-  0x26, 0x19, 0x37, 0x12, 0x12, 0x20, 0x14, 0x1e, 0x2a, 0x95, 0x26, 0x55, 0x02, 0xaf, 0x2a, 0x1f, 
-  0x1f, 0x2a, 0x29, 0x20, 0x20, 0xfc, 0x8a, 0x07, 0x05, 0x75, 0x04, 0x05, 0x22, 0x31, 0x02, 0x47, 
-  0xfd, 0xa3, 0x32, 0x52, 0x31, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00, 0x02, 0x6c, 0x02, 0xf8, 0x00, 
-  0x12, 0x00, 0x00, 0x13, 0x14, 0x06, 0x07, 0x33, 0x36, 0x36, 0x37, 0x37, 0x33, 0x07, 0x13, 0x23, 
-  0x27, 0x07, 0x15, 0x23, 0x11, 0x33, 0xe3, 0x05, 0x03, 0x02, 0x0f, 0x20, 0x12, 0x99, 0xa8, 0xd9, 
-  0xe6, 0xac, 0x9d, 0x40, 0x95, 0x95, 0x01, 0xa4, 0x1f, 0x3d, 0x1f, 0x15, 0x2b, 0x13, 0xa6, 0xed, 
-  0xfe, 0xcb, 0xdd, 0x33, 0xaa, 0x02, 0xf8, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00, 0x00, 0xe3, 0x02, 
-  0xf8, 0x00, 0x03, 0x00, 0x00, 0x33, 0x23, 0x11, 0x33, 0xe3, 0x95, 0x95, 0x02, 0xf8, 0x00, 0x01, 
-  0x00, 0x4e, 0x00, 0x00, 0x03, 0x8b, 0x02, 0x2c, 0x00, 0x22, 0x00, 0x00, 0x01, 0x32, 0x16, 0x15, 
-  0x11, 0x23, 0x11, 0x34, 0x23, 0x22, 0x06, 0x15, 0x11, 0x23, 0x11, 0x34, 0x23, 0x22, 0x06, 0x15, 
-  0x11, 0x23, 0x11, 0x33, 0x17, 0x33, 0x36, 0x36, 0x33, 0x32, 0x16, 0x17, 0x33, 0x36, 0x36, 0x02, 
-  0xcf, 0x5d, 0x5f, 0x95, 0x52, 0x3b, 0x32, 0x95, 0x52, 0x3e, 0x2f, 0x95, 0x72, 0x14, 0x08, 0x19, 
-  0x57, 0x2f, 0x3c, 0x54, 0x16, 0x0d, 0x19, 0x59, 0x02, 0x2c, 0x5f, 0x69, 0xfe, 0x9c, 0x01, 0x3f, 
-  0x76, 0x54, 0x4f, 0xfe, 0xee, 0x01, 0x3f, 0x76, 0x5d, 0x57, 0xfe, 0xff, 0x02, 0x22, 0x46, 0x2a, 
-  0x26, 0x27, 0x29, 0x2a, 0x26, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00, 0x02, 0x46, 0x02, 0x2c, 0x00, 
-  0x14, 0x00, 0x00, 0x01, 0x32, 0x16, 0x15, 0x11, 0x23, 0x11, 0x34, 0x26, 0x23, 0x22, 0x06, 0x15, 
-  0x11, 0x23, 0x11, 0x33, 0x17, 0x33, 0x36, 0x36, 0x01, 0x84, 0x58, 0x6a, 0x95, 0x2a, 0x2e, 0x44, 
-  0x32, 0x95, 0x72, 0x14, 0x08, 0x1a, 0x5b, 0x02, 0x2c, 0x5f, 0x69, 0xfe, 0x9c, 0x01, 0x3f, 0x3b, 
-  0x3b, 0x5d, 0x57, 0xfe, 0xff, 0x02, 0x22, 0x46, 0x2a, 0x26, 0x00, 0x02, 0x00, 0x2d, 0xff, 0xf6, 
-  0x02, 0x3e, 0x02, 0x2c, 0x00, 0x0d, 0x00, 0x19, 0x00, 0x00, 0x01, 0x14, 0x06, 0x23, 0x22, 0x26, 
-  0x26, 0x35, 0x34, 0x36, 0x33, 0x32, 0x16, 0x16, 0x05, 0x14, 0x16, 0x33, 0x32, 0x36, 0x35, 0x34, 
-  0x26, 0x23, 0x22, 0x06, 0x02, 0x3e, 0x8f, 0x7b, 0x4c, 0x77, 0x44, 0x8e, 0x7c, 0x4d, 0x76, 0x44, 
-  0xfe, 0x87, 0x35, 0x3c, 0x3b, 0x35, 0x35, 0x3c, 0x3b, 0x35, 0x01, 0x12, 0x88, 0x94, 0x42, 0x7f, 
-  0x5b, 0x88, 0x92, 0x42, 0x7d, 0x5b, 0x51, 0x53, 0x53, 0x51, 0x51, 0x51, 0x51, 0x00, 0x02, 0x00, 
-  0x4e, 0xff, 0x10, 0x02, 0x4c, 0x02, 0x2c, 0x00, 0x14, 0x00, 0x20, 0x00, 0x00, 0x01, 0x32, 0x16, 
-  0x15, 0x14, 0x06, 0x23, 0x22, 0x26, 0x27, 0x23, 0x16, 0x15, 0x15, 0x23, 0x11, 0x33, 0x17, 0x33, 
-  0x36, 0x36, 0x17, 0x22, 0x06, 0x07, 0x15, 0x14, 0x16, 0x33, 0x32, 0x36, 0x35, 0x34, 0x01, 0x7e, 
-  0x5c, 0x72, 0x76, 0x5c, 0x3b, 0x46, 0x16, 0x08, 0x08, 0x95, 0x79, 0x15, 0x07, 0x16, 0x4a, 0x0b, 
-  0x3a, 0x2f, 0x02, 0x2f, 0x3e, 0x33, 0x31, 0x02, 0x2c, 0x8f, 0x8b, 0x8b, 0x91, 0x2b, 0x1b, 0x2a, 
-  0x26, 0xdc, 0x03, 0x12, 0x47, 0x21, 0x30, 0x77, 0x48, 0x4a, 0x10, 0x4f, 0x55, 0x55, 0x50, 0xa1, 
-  0x00, 0x02, 0x00, 0x2d, 0xff, 0x10, 0x02, 0x2b, 0x02, 0x2c, 0x00, 0x14, 0x00, 0x20, 0x00, 0x00, 
-  0x05, 0x34, 0x37, 0x23, 0x06, 0x06, 0x23, 0x22, 0x26, 0x35, 0x34, 0x36, 0x33, 0x32, 0x16, 0x17, 
-  0x33, 0x37, 0x33, 0x11, 0x23, 0x03, 0x32, 0x36, 0x37, 0x35, 0x34, 0x26, 0x23, 0x22, 0x06, 0x15, 
-  0x14, 0x01, 0x96, 0x06, 0x06, 0x15, 0x4a, 0x3c, 0x5c, 0x72, 0x74, 0x5d, 0x3c, 0x4b, 0x17, 0x04, 
-  0x0d, 0x7e, 0x95, 0x66, 0x3e, 0x31, 0x01, 0x31, 0x41, 0x35, 0x34, 0x0b, 0x2a, 0x28, 0x22, 0x2f, 
-  0x8f, 0x8b, 0x8c, 0x90, 0x2e, 0x22, 0x46, 0xfc, 0xee, 0x01, 0x5b, 0x49, 0x49, 0x12, 0x50, 0x54, 
-  0x55, 0x50, 0xa3, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00, 0x01, 0xb1, 0x02, 0x2c, 0x00, 0x13, 0x00, 
-  0x00, 0x01, 0x32, 0x16, 0x17, 0x07, 0x26, 0x26, 0x23, 0x22, 0x06, 0x06, 0x15, 0x11, 0x23, 0x11, 
-  0x33, 0x17, 0x33, 0x36, 0x36, 0x01, 0x7f, 0x0b, 0x1e, 0x09, 0x0b, 0x07, 0x1b, 0x0a, 0x26, 0x46, 
-  0x2b, 0x95, 0x71, 0x16, 0x07, 0x18, 0x54, 0x02, 0x2c, 0x02, 0x02, 0x8c, 0x02, 0x03, 0x1b, 0x3c, 
-  0x34, 0xfe, 0xea, 0x02, 0x22, 0x5c, 0x2a, 0x3c, 0x00, 0x01, 0x00, 0x2d, 0xff, 0xf6, 0x01, 0xcb, 
-  0x02, 0x2c, 0x00, 0x28, 0x00, 0x00, 0x25, 0x14, 0x06, 0x23, 0x22, 0x26, 0x27, 0x35, 0x16, 0x16, 
-  0x33, 0x32, 0x36, 0x35, 0x34, 0x26, 0x26, 0x27, 0x2e, 0x02, 0x35, 0x34, 0x36, 0x33, 0x32, 0x16, 
-  0x17, 0x07, 0x26, 0x26, 0x23, 0x22, 0x15, 0x14, 0x16, 0x16, 0x17, 0x1e, 0x02, 0x01, 0xcb, 0x75, 
-  0x74, 0x39, 0x52, 0x29, 0x2c, 0x66, 0x27, 0x2c, 0x25, 0x0f, 0x32, 0x35, 0x33, 0x42, 0x20, 0x76, 
-  0x62, 0x33, 0x5c, 0x31, 0x2d, 0x28, 0x48, 0x25, 0x42, 0x11, 0x31, 0x30, 0x2f, 0x44, 0x25, 0xa2, 
-  0x53, 0x59, 0x0f, 0x11, 0x7b, 0x14, 0x1a, 0x1a, 0x15, 0x0e, 0x16, 0x1c, 0x16, 0x16, 0x2b, 0x3d, 
-  0x2e, 0x4c, 0x4c, 0x14, 0x17, 0x6b, 0x11, 0x17, 0x24, 0x0d, 0x15, 0x18, 0x14, 0x13, 0x29, 0x3d, 
-  0x00, 0x01, 0x00, 0x17, 0xff, 0xf6, 0x01, 0x92, 0x02, 0x96, 0x00, 0x18, 0x00, 0x00, 0x25, 0x32, 
-  0x36, 0x37, 0x15, 0x06, 0x06, 0x23, 0x22, 0x26, 0x26, 0x35, 0x11, 0x23, 0x35, 0x37, 0x37, 0x33, 
-  0x15, 0x33, 0x15, 0x23, 0x11, 0x14, 0x16, 0x01, 0x34, 0x19, 0x2e, 0x17, 0x18, 0x47, 0x2a, 0x31, 
-  0x4d, 0x2d, 0x47, 0x52, 0x2b, 0x5f, 0x99, 0x99, 0x24, 0x6d, 0x0a, 0x07, 0x6f, 0x0a, 0x0f, 0x20, 
-  0x4f, 0x46, 0x01, 0x07, 0x3f, 0x32, 0x73, 0x74, 0x70, 0xfe, 0xf9, 0x1f, 0x1f, 0x00, 0x01, 0x00, 
-  0x4b, 0xff, 0xf6, 0x02, 0x43, 0x02, 0x22, 0x00, 0x14, 0x00, 0x00, 0x01, 0x11, 0x23, 0x27, 0x23, 
-  0x06, 0x06, 0x23, 0x22, 0x26, 0x35, 0x11, 0x33, 0x11, 0x14, 0x16, 0x33, 0x32, 0x36, 0x35, 0x11, 
-  0x02, 0x43, 0x72, 0x14, 0x08, 0x1a, 0x5b, 0x33, 0x58, 0x6a, 0x95, 0x2a, 0x2e, 0x44, 0x32, 0x02, 
-  0x22, 0xfd, 0xde, 0x46, 0x2a, 0x26, 0x5f, 0x69, 0x01, 0x64, 0xfe, 0xc1, 0x3a, 0x3c, 0x5d, 0x57, 
-  0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x39, 0x02, 0x22, 0x00, 0x0c, 0x00, 0x00, 
-  0x33, 0x03, 0x33, 0x13, 0x16, 0x16, 0x17, 0x33, 0x36, 0x37, 0x13, 0x33, 0x03, 0xd0, 0xd0, 0x9c, 
-  0x69, 0x09, 0x0b, 0x01, 0x04, 0x03, 0x13, 0x69, 0x9c, 0xd0, 0x02, 0x22, 0xfe, 0xc9, 0x1c, 0x3c, 
-  0x18, 0x36, 0x3a, 0x01, 0x37, 0xfd, 0xde, 0x00, 0x01, 0x00, 0x0a, 0x00, 0x00, 0x03, 0x4e, 0x02, 
-  0x22, 0x00, 0x2a, 0x00, 0x00, 0x25, 0x2e, 0x03, 0x27, 0x23, 0x0e, 0x03, 0x07, 0x07, 0x23, 0x03, 
-  0x33, 0x17, 0x1e, 0x02, 0x17, 0x33, 0x3e, 0x03, 0x37, 0x13, 0x33, 0x13, 0x1e, 0x02, 0x15, 0x33, 
-  0x3e, 0x02, 0x37, 0x37, 0x33, 0x03, 0x23, 0x01, 0xe5, 0x04, 0x0f, 0x12, 0x10, 0x03, 0x04, 0x03, 
-  0x0f, 0x12, 0x10, 0x04, 0x2c, 0xa0, 0x9b, 0x94, 0x3f, 0x07, 0x0b, 0x0a, 0x02, 0x04, 0x01, 0x06, 
-  0x09, 0x07, 0x02, 0x43, 0xa4, 0x40, 0x04, 0x0b, 0x09, 0x04, 0x02, 0x0a, 0x0d, 0x07, 0x41, 0x92, 
-  0x9d, 0xa2, 0xbf, 0x11, 0x43, 0x4d, 0x41, 0x0f, 0x0f, 0x41, 0x4d, 0x44, 0x12, 0xbd, 0x02, 0x22, 
-  0xf2, 0x19, 0x46, 0x41, 0x13, 0x0e, 0x2f, 0x32, 0x29, 0x07, 0x01, 0x06, 0xfe, 0xfa, 0x0e, 0x3e, 
-  0x40, 0x13, 0x11, 0x41, 0x48, 0x19, 0xf2, 0xfd, 0xde, 0x00, 0x01, 0x00, 0x05, 0x00, 0x00, 0x02, 
-  0x3d, 0x02, 0x22, 0x00, 0x0b, 0x00, 0x00, 0x13, 0x03, 0x33, 0x17, 0x37, 0x33, 0x03, 0x13, 0x23, 
-  0x27, 0x07, 0x23, 0xbe, 0xb0, 0xa9, 0x6a, 0x6b, 0xa9, 0xb2, 0xba, 0xa9, 0x73, 0x73, 0xa9, 0x01, 
-  0x17, 0x01, 0x0b, 0xae, 0xae, 0xfe, 0xf5, 0xfe, 0xe9, 0xbb, 0xbb, 0x00, 0x01, 0x00, 0x00, 0xff, 
-  0x10, 0x02, 0x39, 0x02, 0x22, 0x00, 0x1a, 0x00, 0x00, 0x11, 0x33, 0x13, 0x16, 0x16, 0x17, 0x33, 
-  0x36, 0x36, 0x37, 0x13, 0x33, 0x03, 0x06, 0x06, 0x23, 0x22, 0x26, 0x27, 0x35, 0x16, 0x16, 0x33, 
-  0x32, 0x36, 0x37, 0x37, 0xa3, 0x67, 0x08, 0x08, 0x02, 0x03, 0x03, 0x0b, 0x07, 0x65, 0xa0, 0xe7, 
-  0x1f, 0x77, 0x4e, 0x19, 0x25, 0x0e, 0x0b, 0x1f, 0x11, 0x2f, 0x37, 0x0d, 0x09, 0x02, 0x22, 0xfe, 
-  0xcd, 0x16, 0x2f, 0x1a, 0x1a, 0x2f, 0x16, 0x01, 0x33, 0xfd, 0x98, 0x55, 0x55, 0x05, 0x03, 0x76, 
-  0x02, 0x04, 0x39, 0x28, 0x1b, 0x00, 0x01, 0x00, 0x1b, 0x00, 0x00, 0x01, 0xca, 0x02, 0x22, 0x00, 
-  0x09, 0x00, 0x00, 0x21, 0x21, 0x35, 0x13, 0x23, 0x35, 0x21, 0x15, 0x03, 0x33, 0x01, 0xca, 0xfe, 
-  0x51, 0xfd, 0xee, 0x01, 0x97, 0xf6, 0xff, 0x58, 0x01, 0x58, 0x72, 0x61, 0xfe, 0xb1, 0x00, 0x01, 
-  0x00, 0x0f, 0xff, 0x62, 0x01, 0x62, 0x02, 0xca, 0x00, 0x1f, 0x00, 0x00, 0x05, 0x22, 0x26, 0x26, 
-  0x35, 0x35, 0x34, 0x26, 0x23, 0x35, 0x32, 0x36, 0x35, 0x35, 0x34, 0x36, 0x36, 0x33, 0x15, 0x06, 
-  0x06, 0x15, 0x15, 0x14, 0x07, 0x15, 0x16, 0x15, 0x15, 0x14, 0x16, 0x17, 0x01, 0x62, 0x55, 0x5d, 
-  0x24, 0x40, 0x3d, 0x3d, 0x40, 0x24, 0x5d, 0x55, 0x27, 0x2e, 0x72, 0x72, 0x2e, 0x27, 0x9e, 0x1c, 
-  0x3c, 0x30, 0x9a, 0x2f, 0x28, 0x75, 0x28, 0x2f, 0x9b, 0x30, 0x3c, 0x1c, 0x6e, 0x01, 0x1a, 0x2a, 
-  0x92, 0x5b, 0x11, 0x06, 0x11, 0x5b, 0x92, 0x2a, 0x1a, 0x01, 0x00, 0x01, 0x00, 0xde, 0xff, 0x1d, 
-  0x01, 0x49, 0x02, 0xf5, 0x00, 0x03, 0x00, 0x00, 0x13, 0x33, 0x11, 0x23, 0xde, 0x6b, 0x6b, 0x02, 
-  0xf5, 0xfc, 0x28, 0x00, 0x01, 0x00, 0x28, 0xff, 0x62, 0x01, 0x7b, 0x02, 0xca, 0x00, 0x1f, 0x00, 
-  0x00, 0x17, 0x36, 0x36, 0x35, 0x35, 0x34, 0x37, 0x35, 0x26, 0x35, 0x35, 0x34, 0x26, 0x27, 0x35, 
-  0x32, 0x16, 0x16, 0x15, 0x15, 0x14, 0x16, 0x33, 0x15, 0x22, 0x06, 0x15, 0x15, 0x14, 0x06, 0x06, 
-  0x23, 0x28, 0x27, 0x2e, 0x72, 0x72, 0x2e, 0x27, 0x56, 0x5c, 0x24, 0x40, 0x3d, 0x3d, 0x40, 0x24, 
-  0x5c, 0x56, 0x30, 0x01, 0x1a, 0x2a, 0x92, 0x5b, 0x11, 0x06, 0x11, 0x5b, 0x92, 0x2a, 0x1a, 0x01, 
-  0x6e, 0x1c, 0x3c, 0x30, 0x9b, 0x2f, 0x28, 0x75, 0x28, 0x2f, 0x9a, 0x30, 0x3c, 0x1c, 0x00, 0x01, 
-  0x00, 0x2b, 0x01, 0x0d, 0x02, 0x10, 0x01, 0xb4, 0x00, 0x17, 0x00, 0x00, 0x01, 0x26, 0x26, 0x23, 
-  0x22, 0x06, 0x07, 0x35, 0x36, 0x33, 0x32, 0x16, 0x17, 0x16, 0x16, 0x33, 0x32, 0x36, 0x37, 0x15, 
-  0x06, 0x23, 0x22, 0x26, 0x01, 0x0c, 0x25, 0x33, 0x17, 0x1c, 0x3d, 0x19, 0x32, 0x4b, 0x1d, 0x3b, 
-  0x2f, 0x25, 0x34, 0x16, 0x1d, 0x3c, 0x19, 0x32, 0x4b, 0x1d, 0x3b, 0x01, 0x2d, 0x10, 0x0b, 0x22, 
-  0x19, 0x71, 0x35, 0x0b, 0x14, 0x10, 0x0b, 0x22, 0x19, 0x71, 0x35, 0x0c, 0x00, 0x01, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0xf3, 0x66, 0xcb, 0x35, 0x5f, 0x0f, 0x3c, 0xf5, 0x00, 0x03, 0x08, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0xdf, 0x93, 0x35, 0xf6, 0x00, 0x00, 0x00, 0x00, 0xdf, 0x93, 0x35, 0xf6, 
-  0xfd, 0x68, 0xfe, 0x76, 0x0a, 0xf0, 0x05, 0x43, 0x00, 0x01, 0x00, 0x06, 0x00, 0x02, 0x00, 0x01, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xd6, 
-  0xff, 0xb6, 0xff, 0xd3, 0x03, 0xc7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x02, 0x58, 0x00, 0x00, 0x01, 0x1e, 0x00, 0x39, 
-  0x01, 0xd8, 0x00, 0x41, 0x02, 0x86, 0x00, 0x16, 0x02, 0x3c, 0x00, 0x2b, 0x03, 0x85, 0x00, 0x1f, 
-  0x02, 0xee, 0x00, 0x28, 0x01, 0x0a, 0x00, 0x41, 0x01, 0x53, 0x00, 0x28, 0x01, 0x53, 0x00, 0x1e, 
-  0x02, 0x21, 0x00, 0x1f, 0x02, 0x3c, 0x00, 0x2b, 0x01, 0x1d, 0x00, 0x1f, 0x01, 0x42, 0x00, 0x1e, 
-  0x01, 0x1d, 0x00, 0x39, 0x01, 0x9d, 0x00, 0x07, 0x02, 0x3c, 0x00, 0x24, 0x02, 0x3c, 0x00, 0x3b, 
-  0x02, 0x3c, 0x00, 0x26, 0x02, 0x3c, 0x00, 0x26, 0x02, 0x3c, 0x00, 0x11, 0x02, 0x3c, 0x00, 0x31, 
-  0x02, 0x3c, 0x00, 0x23, 0x02, 0x3c, 0x00, 0x1b, 0x02, 0x3c, 0x00, 0x23, 0x02, 0x3c, 0x00, 0x20, 
-  0x01, 0x1d, 0x00, 0x39, 0x01, 0x1d, 0x00, 0x1f, 0x02, 0x3c, 0x00, 0x2b, 0x02, 0x3c, 0x00, 0x2b, 
-  0x02, 0x3c, 0x00, 0x2b, 0x01, 0xdd, 0x00, 0x03, 0x03, 0x81, 0x00, 0x32, 0x02, 0xb2, 0x00, 0x00, 
-  0x02, 0xa0, 0x00, 0x5a, 0x02, 0x7d, 0x00, 0x3a, 0x02, 0xe4, 0x00, 0x5a, 0x02, 0x30, 0x00, 0x5a, 
-  0x02, 0x25, 0x00, 0x5a, 0x02, 0xd4, 0x00, 0x3a, 0x02, 0xfd, 0x00, 0x5a, 0x01, 0x85, 0x00, 0x20, 
-  0x01, 0x4b, 0xff, 0xb6, 0x02, 0x98, 0x00, 0x5a, 0x02, 0x35, 0x00, 0x5a, 0x03, 0xaf, 0x00, 0x5a, 
-  0x03, 0x2d, 0x00, 0x5a, 0x03, 0x1c, 0x00, 0x3a, 0x02, 0x74, 0x00, 0x5a, 0x03, 0x1c, 0x00, 0x3a, 
-  0x02, 0x94, 0x00, 0x5a, 0x02, 0x27, 0x00, 0x2e, 0x02, 0x43, 0x00, 0x14, 0x02, 0xf4, 0x00, 0x55, 
-  0x02, 0x8a, 0x00, 0x00, 0x03, 0xc7, 0x00, 0x00, 0x02, 0x9b, 0x00, 0x00, 0x02, 0x70, 0x00, 0x00, 
-  0x02, 0x43, 0x00, 0x18, 0x01, 0x4b, 0x00, 0x46, 0x01, 0x9d, 0x00, 0x06, 0x01, 0x4b, 0x00, 0x19, 
-  0x02, 0x3c, 0x00, 0x17, 0x01, 0x9b, 0xff, 0xfe, 0x01, 0x6a, 0x00, 0x28, 0x02, 0x5c, 0x00, 0x2a, 
-  0x02, 0x79, 0x00, 0x4e, 0x02, 0x02, 0x00, 0x2d, 0x02, 0x79, 0x00, 0x2d, 0x02, 0x4f, 0x00, 0x2d, 
-  0x01, 0x83, 0x00, 0x14, 0x02, 0x79, 0x00, 0x2d, 0x02, 0x91, 0x00, 0x4e, 0x01, 0x31, 0x00, 0x48, 
-  0x01, 0x31, 0xff, 0xc0, 0x02, 0x6c, 0x00, 0x4e, 0x01, 0x31, 0x00, 0x4e, 0x03, 0xd6, 0x00, 0x4e, 
-  0x02, 0x91, 0x00, 0x4e, 0x02, 0x6b, 0x00, 0x2d, 0x02, 0x79, 0x00, 0x4e, 0x02, 0x79, 0x00, 0x2d, 
-  0x01, 0xc6, 0x00, 0x4e, 0x01, 0xf1, 0x00, 0x2d, 0x01, 0xb2, 0x00, 0x17, 0x02, 0x91, 0x00, 0x4b, 
-  0x02, 0x39, 0x00, 0x00, 0x03, 0x58, 0x00, 0x0a, 0x02, 0x42, 0x00, 0x05, 0x02, 0x39, 0x00, 0x00, 
-  0x01, 0xe8, 0x00, 0x1b, 0x01, 0x8a, 0x00, 0x0f, 0x02, 0x27, 0x00, 0xde, 0x01, 0x8a, 0x00, 0x28, 
-  0x02, 0x3c, 0x00, 0x2b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x71, 
-  0x00, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x01, 0x8a, 0x00, 0x00, 0x02, 0x0f, 
-  0x00, 0x00, 0x02, 0xb8, 0x00, 0x00, 0x02, 0xd4, 0x00, 0x00, 0x03, 0x08, 0x00, 0x00, 0x03, 0x3d, 
-  0x00, 0x00, 0x03, 0x7a, 0x00, 0x00, 0x03, 0xa3, 0x00, 0x00, 0x03, 0xca, 0x00, 0x00, 0x03, 0xe2, 
-  0x00, 0x00, 0x04, 0x0d, 0x00, 0x00, 0x04, 0x2c, 0x00, 0x00, 0x04, 0x7f, 0x00, 0x00, 0x04, 0xb1, 
-  0x00, 0x00, 0x05, 0x0d, 0x00, 0x00, 0x05, 0x8b, 0x00, 0x00, 0x05, 0xd6, 0x00, 0x00, 0x06, 0x36, 
-  0x00, 0x00, 0x06, 0xb9, 0x00, 0x00, 0x06, 0xdd, 0x00, 0x00, 0x07, 0x7e, 0x00, 0x00, 0x08, 0x02, 
-  0x00, 0x00, 0x08, 0x4d, 0x00, 0x00, 0x08, 0x95, 0x00, 0x00, 0x08, 0xbb, 0x00, 0x00, 0x08, 0xe1, 
-  0x00, 0x00, 0x09, 0x06, 0x00, 0x00, 0x09, 0x81, 0x00, 0x00, 0x0a, 0x59, 0x00, 0x00, 0x0a, 0xa1, 
-  0x00, 0x00, 0x0b, 0x09, 0x00, 0x00, 0x0b, 0x61, 0x00, 0x00, 0x0b, 0x9f, 0x00, 0x00, 0x0b, 0xcb, 
-  0x00, 0x00, 0x0b, 0xf0, 0x00, 0x00, 0x0c, 0x55, 0x00, 0x00, 0x0c, 0x83, 0x00, 0x00, 0x0c, 0xb2, 
-  0x00, 0x00, 0x0c, 0xef, 0x00, 0x00, 0x0d, 0x27, 0x00, 0x00, 0x0d, 0x44, 0x00, 0x00, 0x0d, 0x94, 
-  0x00, 0x00, 0x0d, 0xd6, 0x00, 0x00, 0x0e, 0x2f, 0x00, 0x00, 0x0e, 0x70, 0x00, 0x00, 0x0e, 0xd1, 
-  0x00, 0x00, 0x0f, 0x21, 0x00, 0x00, 0x0f, 0x98, 0x00, 0x00, 0x0f, 0xb9, 0x00, 0x00, 0x0f, 0xf7, 
-  0x00, 0x00, 0x10, 0x34, 0x00, 0x00, 0x10, 0xb5, 0x00, 0x00, 0x10, 0xea, 0x00, 0x00, 0x11, 0x15, 
-  0x00, 0x00, 0x11, 0x42, 0x00, 0x00, 0x11, 0x64, 0x00, 0x00, 0x11, 0x82, 0x00, 0x00, 0x11, 0xa3, 
-  0x00, 0x00, 0x11, 0xc8, 0x00, 0x00, 0x11, 0xe2, 0x00, 0x00, 0x12, 0x12, 0x00, 0x00, 0x12, 0x88, 
-  0x00, 0x00, 0x12, 0xf1, 0x00, 0x00, 0x13, 0x42, 0x00, 0x00, 0x13, 0xa9, 0x00, 0x00, 0x14, 0x09, 
-  0x00, 0x00, 0x14, 0x57, 0x00, 0x00, 0x14, 0xcd, 0x00, 0x00, 0x15, 0x15, 0x00, 0x00, 0x15, 0x4e, 
-  0x00, 0x00, 0x15, 0xa9, 0x00, 0x00, 0x15, 0xeb, 0x00, 0x00, 0x16, 0x02, 0x00, 0x00, 0x16, 0x69, 
-  0x00, 0x00, 0x16, 0xae, 0x00, 0x00, 0x17, 0x01, 0x00, 0x00, 0x17, 0x64, 0x00, 0x00, 0x17, 0xc7, 
-  0x00, 0x00, 0x18, 0x0c, 0x00, 0x00, 0x18, 0x84, 0x00, 0x00, 0x18, 0xd1, 0x00, 0x00, 0x19, 0x16, 
-  0x00, 0x00, 0x19, 0x4b, 0x00, 0x00, 0x19, 0xcd, 0x00, 0x00, 0x19, 0xff, 0x00, 0x00, 0x1a, 0x59, 
-  0x00, 0x00, 0x1a, 0x82, 0x00, 0x00, 0x1a, 0xde, 0x00, 0x00, 0x1a, 0xf7, 0x00, 0x00, 0x1b, 0x52, 
-  0x00, 0x00, 0x1b, 0xa0, 0x00, 0x01, 0x00, 0x00, 0x00, 0x5f, 0x10, 0x00, 0x04, 0x00, 0x00, 0xff, 
-  0x00, 0xff, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0xff, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x96, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x01, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x04, 
-  0x00, 0x0d, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x1e, 0x00, 0x11, 0x00, 0x01, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x0d, 0x00, 0x2f, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x05, 0x00, 0x03, 0x00, 0x3c, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x0d, 
-  0x00, 0x3f, 0x00, 0x03, 0x00, 0x01, 0x04, 0x09, 0x00, 0x01, 0x00, 0x1a, 0x00, 0x4c, 0x00, 0x03, 
-  0x00, 0x01, 0x04, 0x09, 0x00, 0x02, 0x00, 0x08, 0x00, 0x66, 0x00, 0x03, 0x00, 0x01, 0x04, 0x09, 
-  0x00, 0x03, 0x00, 0x3c, 0x00, 0x6e, 0x00, 0x03, 0x00, 0x01, 0x04, 0x09, 0x00, 0x04, 0x00, 0x1a, 
-  0x00, 0xaa, 0x00, 0x03, 0x00, 0x01, 0x04, 0x09, 0x00, 0x05, 0x00, 0x06, 0x00, 0xc4, 0x00, 0x03, 
-  0x00, 0x01, 0x04, 0x09, 0x00, 0x06, 0x00, 0x1a, 0x00, 0xca, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 
-  0x74, 0x65, 0x64, 0x46, 0x6f, 0x6e, 0x74, 0x42, 0x6f, 0x6c, 0x64, 0x47, 0x65, 0x6e, 0x65, 0x72, 
-  0x61, 0x74, 0x65, 0x64, 0x46, 0x6f, 0x6e, 0x74, 0x20, 0x42, 0x6f, 0x6c, 0x64, 0x3a, 0x56, 0x65, 
-  0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x31, 0x2e, 0x30, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 
-  0x65, 0x64, 0x46, 0x6f, 0x6e, 0x74, 0x31, 0x2e, 0x30, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 
-  0x65, 0x64, 0x46, 0x6f, 0x6e, 0x74, 0x00, 0x47, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x72, 
-  0x00, 0x61, 0x00, 0x74, 0x00, 0x65, 0x00, 0x64, 0x00, 0x46, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x74, 
-  0x00, 0x42, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x64, 0x00, 0x47, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x65, 
-  0x00, 0x72, 0x00, 0x61, 0x00, 0x74, 0x00, 0x65, 0x00, 0x64, 0x00, 0x46, 0x00, 0x6f, 0x00, 0x6e, 
-  0x00, 0x74, 0x00, 0x20, 0x00, 0x42, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x64, 0x00, 0x3a, 0x00, 0x56, 
-  0x00, 0x65, 0x00, 0x72, 0x00, 0x73, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x31, 
-  0x00, 0x2e, 0x00, 0x30, 0x00, 0x47, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, 
-  0x00, 0x74, 0x00, 0x65, 0x00, 0x64, 0x00, 0x46, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x31, 
-  0x00, 0x2e, 0x00, 0x30, 0x00, 0x47, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, 
-  0x00, 0x74, 0x00, 0x65, 0x00, 0x64, 0x00, 0x46, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x00, 
-  0x00, 0x03, 0x02, 0x68, 0x02, 0xbc, 0x00, 0x05, 0x00, 0x08, 0x02, 0x8a, 0x02, 0x58, 0x00, 0x00, 
-  0x00, 0x4b, 0x02, 0x8a, 0x02, 0x58, 0x00, 0x00, 0x01, 0x5e, 0x00, 0x32, 0x01, 0x48, 0x00, 0x00, 
-  0x02, 0x0b, 0x08, 0x02, 0x04, 0x05, 0x04, 0x02, 0x02, 0x04, 0xe0, 0x00, 0x82, 0xff, 0x40, 0x00, 
-  0x20, 0x5f, 0x08, 0x00, 0x00, 0x29, 0x00, 0x10, 0x00, 0x00, 0x47, 0x4f, 0x4f, 0x47, 0x00, 0xa0, 
-  0x00, 0x00, 0xff, 0xfd, 0x04, 0x2d, 0xfe, 0xdb, 0x00, 0x00, 0x05, 0x43, 0x01, 0x8b, 0x00, 0x00, 
-  0x01, 0x9f, 0x00, 0x00, 0x00, 0x00, 0x02, 0x22, 0x02, 0xca, 0x00, 0x00, 0x00, 0x20, 0x00, 0x04, 
-  0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xb8, 0x01, 0xff, 0x85, 0xb0, 0x04, 0x8d, 0x00
-};

examples/Smooth Graphics/Colour_Wheel/Colour_Wheel.ino

@@ -1,47 +0,0 @@
-// Arc drawing example - draw a colour wheel
-
-#include <TFT_eSPI.h>       // Include the graphics library
-TFT_eSPI tft = TFT_eSPI();  // Create object "tft"
-
-uint16_t colors[12];
-
-// -------------------------------------------------------------------------
-// Setup
-// -------------------------------------------------------------------------
-void setup(void) {
-  Serial.begin(115200);
-  tft.init();
-  tft.fillScreen(TFT_BLACK);
-
-  // Create the outer ring colours
-  for (uint8_t c = 0; c < 2; c++) {
-    colors[c + 10] = tft.alphaBlend(128 + c * 127, TFT_RED,     TFT_MAGENTA);
-    colors[c +  8] = tft.alphaBlend(128 + c * 127, TFT_MAGENTA, TFT_BLUE);
-    colors[c +  6] = tft.alphaBlend(128 + c * 127, TFT_BLUE,    TFT_GREEN);
-    colors[c +  4] = tft.alphaBlend(128 + c * 127, TFT_GREEN,   TFT_YELLOW);
-    colors[c +  2] = tft.alphaBlend(128 + c * 127, TFT_YELLOW,  TFT_ORANGE);
-    colors[c +  0] = tft.alphaBlend(128 + c * 127, TFT_ORANGE,  TFT_RED);
-  }
-}
-
-// -------------------------------------------------------------------------
-// Main loop
-// -------------------------------------------------------------------------
-void loop() {
-  uint16_t rDelta = (tft.width() - 1) / 10;
-  uint16_t x = tft.width() / 2;
-  uint16_t y = tft.height() / 2;
-  bool smooth = true;
-
-  // Draw rings as a series of arcs, increasingly blend colour with white towards middle
-  for (uint16_t i = 5; i > 0; i--) {
-    for (uint16_t angle = 0; angle <= 330; angle += 30) {
-      uint16_t radius = i * rDelta;
-      uint16_t wheelColor = tft.alphaBlend((i * 255.0)/5.0, colors[angle / 30], TFT_WHITE);
-      tft.drawArc(x, y, radius, radius - rDelta, angle, angle + 30, wheelColor, TFT_BLACK, smooth);
-    }
-    smooth = false;  // Only outer ring is smooth
-  }
-
-  while (1) delay(100);
-}

examples/Smooth Graphics/Draw_Arc/Draw_Arc.ino

@@ -1,53 +0,0 @@
-// Example for drawArc function. This is intended for arc based meters.
-// (See arcMeter example)
-
-// Draws arcs without smooth ends, suitable for dynamically changing arc
-// angles to avoid residual anti-alias pixels at the arc segment joints.
-
-// The sides of the arc can optionally be smooth or not. Smooth arcs have
-// a much better appearance, especially at small sizes.
-
-#include <TFT_eSPI.h>       // Include the graphics library
-TFT_eSPI tft = TFT_eSPI();  // Create object "tft"
-
-// -------------------------------------------------------------------------
-// Setup
-// -------------------------------------------------------------------------
-void setup(void) {
-  Serial.begin(115200);
-
-  tft.init();
-  tft.setRotation(1);
-  tft.fillScreen(TFT_BLACK);
-}
-
-// -------------------------------------------------------------------------
-// Main loop
-// -------------------------------------------------------------------------
-void loop()
-{
-  static uint32_t count = 0;
-
-  uint16_t fg_color = random(0x10000);
-  uint16_t bg_color = TFT_BLACK;       // This is the background colour used for smoothing (anti-aliasing)
-
-  uint16_t x = random(tft.width());  // Position of centre of arc
-  uint16_t y = random(tft.height());
-
-  uint8_t radius       = random(20, tft.width() / 4); // Outer arc radius
-  uint8_t thickness    = random(1, radius / 4);     // Thickness
-  uint8_t inner_radius = radius - thickness;        // Calculate inner radius (can be 0 for circle segment)
-
-  // 0 degrees is at 6 o'clock position
-  // Arcs are drawn clockwise from start_angle to end_angle
-  // Start angle can be greater than end angle, the arc will then be drawn through 0 degrees
-  uint16_t start_angle = random(361); // Start angle must be in range 0 to 360
-  uint16_t end_angle   = random(361); // End angle must be in range 0 to 360
-
-  bool smooth = random(2); // true = smooth sides, false = no smooth sides
-
-  tft.drawArc(x, y, radius, inner_radius, start_angle, end_angle, fg_color, bg_color, smooth);
-
-  count++;
-  if (count < 30) delay(500); // After 15s draw as fast as possible!
-}

examples/Smooth Graphics/Draw_Smooth_Circles/Draw_Smooth_Circles.ino

@@ -1,98 +0,0 @@
-// Example for drawSmoothCircle function. Which draws anti-aliased circles
-// The circle periphery has a "thickness" of ~3 pixles to minimise the
-// "braiding" effect present in narrow anti-aliased lines.
-
-// For thicker or thinner circle outlines use the drawArc function.
-
-#include <TFT_eSPI.h>       // Include the graphics library
-TFT_eSPI tft = TFT_eSPI();  // Create object "tft"
-
-// -------------------------------------------------------------------------
-// Setup
-// -------------------------------------------------------------------------
-void setup(void) {
-  Serial.begin(115200);
-  tft.init();
-  tft.fillScreen(TFT_BLACK);
-}
-
-// -------------------------------------------------------------------------
-// Main loop
-// -------------------------------------------------------------------------
-void loop()
-{
-  static uint32_t radius = 2;
-  static uint32_t index = 0;
-
-  uint16_t fg_color = rainbow(index);
-  uint16_t bg_color = TFT_BLACK;       // This is the background colour used for smoothing (anti-aliasing)
-
-  uint16_t x = tft.width() / 2; // Position of centre of arc
-  uint16_t y = tft.height() / 2;
-
-  tft.drawSmoothCircle(x, y, radius, fg_color, bg_color);
-
-  radius += 11;
-  index += 5;
-  index = index%192;
-
-  if (radius > tft.height()/2) {
-    delay (1000);
-    radius = 2;
-  }
-}
-
-
-// -------------------------------------------------------------------------
-// Return a 16 bit rainbow colour
-// -------------------------------------------------------------------------
-unsigned int rainbow(byte value)
-{
-  // If 'value' is in the range 0-159 it is converted to a spectrum colour
-  // from 0 = red through to 127 = blue to 159 = violet
-  // Extending the range to 0-191 adds a further violet to red band
- 
-  value = value%192;
-  
-  byte red   = 0; // Red is the top 5 bits of a 16 bit colour value
-  byte green = 0; // Green is the middle 6 bits, but only top 5 bits used here
-  byte blue  = 0; // Blue is the bottom 5 bits
-
-  byte sector = value >> 5;
-  byte amplit = value & 0x1F;
-
-  switch (sector)
-  {
-    case 0:
-      red   = 0x1F;
-      green = amplit; // Green ramps up
-      blue  = 0;
-      break;
-    case 1:
-      red   = 0x1F - amplit; // Red ramps down
-      green = 0x1F;
-      blue  = 0;
-      break;
-    case 2:
-      red   = 0;
-      green = 0x1F;
-      blue  = amplit; // Blue ramps up
-      break;
-    case 3:
-      red   = 0;
-      green = 0x1F - amplit; // Green ramps down
-      blue  = 0x1F;
-      break;
-    case 4:
-      red   = amplit; // Red ramps up
-      green = 0;
-      blue  = 0x1F;
-      break;
-    case 5:
-      red   = 0x1F;
-      green = 0;
-      blue  = 0x1F - amplit; // Blue ramps down
-      break;
-  }
-  return red << 11 | green << 6 | blue;
-}

examples/Smooth Graphics/Smooth_Arc/Smooth_Arc.ino

@@ -1,46 +0,0 @@
-// Example for drawSmoothArc function.
-// Draws smooth arcs with rounded or square smooth ends
-
-#include <TFT_eSPI.h>       // Include the graphics library
-TFT_eSPI tft = TFT_eSPI();  // Create object "tft"
-
-// -------------------------------------------------------------------------
-// Setup
-// -------------------------------------------------------------------------
-void setup(void) {
-  Serial.begin(115200);
-
-  tft.init();
-  tft.setRotation(1);
-  tft.fillScreen(TFT_BLACK);
-}
-
-// -------------------------------------------------------------------------
-// Main loop
-// -------------------------------------------------------------------------
-void loop()
-{
-  static uint32_t count = 0;
-
-  uint16_t fg_color = random(0x10000);
-  uint16_t bg_color = TFT_BLACK;       // This is the background colour used for smoothing (anti-aliasing)
-
-  uint16_t x = random(tft.width());  // Position of centre of arc
-  uint16_t y = random(tft.height());
-
-  uint8_t radius       = random(20, tft.width()/4); // Outer arc radius
-  uint8_t thickness    = random(1, radius / 4);     // Thickness
-  uint8_t inner_radius = radius - thickness;        // Calculate inner radius (can be 0 for circle segment)
-
-  // 0 degrees is at 6 o'clock position
-  // Arcs are drawn clockwise from start_angle to end_angle
-  uint16_t start_angle = random(361); // Start angle must be in range 0 to 360
-  uint16_t end_angle   = random(361); // End angle must be in range 0 to 360
-
-  bool arc_end = random(2);           // true = round ends, false = square ends (arc_end parameter can be omitted, ends will then be square)
-
-  tft.drawSmoothArc(x, y, radius, inner_radius, start_angle, end_angle, fg_color, bg_color, arc_end);
-
-  count++;
-  if (count < 30) delay(500); // After 15s draw as fast as possible!
-}

examples/Smooth Graphics/Smooth_Rounded_Rectangles/Smooth_Rounded_Rectangles.ino

@@ -1,50 +0,0 @@
-// Draw random coloured smooth (anti-aliased) rounded rectangles on the TFT
-
-#include <TFT_eSPI.h>
-
-TFT_eSPI tft = TFT_eSPI();
-
-void setup(void) {
-  tft.init();
-  tft.fillScreen(TFT_BLACK); // Background is black
-}
-
-void loop() {
-  tft.fillScreen(TFT_BLACK);
-  tft.setCursor(0, 0);
-
-  // Draw some random smooth rounded rectangles
-  for (int i = 0; i < 20; i++)
-  {
-    int radius = random(60);
-    int w = random(2 * radius, 160);
-    int h = random(2 * radius, 160);
-    int t = random(1, radius / 3);
-    int x = random(tft.width() - w);
-    int y = random(tft.height() - h);
-
-    // Random colour is anti-aliased (blended) with background colour (black in this case)
-    tft.drawSmoothRoundRect(x, y, radius, radius - t, w, h, random(0x10000), TFT_BLACK);
-  }
-  tft.print("Variable thickness");
-  delay(2000);
-
-  tft.fillScreen(TFT_BLACK);
-  tft.setCursor(0, 0);
-
-  // Draw some random minimum thickness smooth rounded rectangles
-  for (int i = 0; i < 20; i++)
-  {
-    int radius = random(60);
-    int w = random(2 * radius, 160);
-    int h = random(2 * radius, 160);
-    int t = 0;
-    int x = random(tft.width() - w);
-    int y = random(tft.height() - h);
-
-    // Random colour is anti-aliased (blended) with background colour (black in this case)
-    tft.drawSmoothRoundRect(x, y, radius, radius - t, w, h, random(0x10000), TFT_BLACK);
-  }
-  tft.print("Minimum thickness");
-  delay(2000);
-}

examples/Test and diagnostics/Read_User_Setup/Read_User_Setup.ino

@@ -19,7 +19,7 @@
 
 TFT_eSPI tft = TFT_eSPI(); // Invoke library
 
-#ifdef ARDUINO_ARCH_ESP8266
+#ifdef ESP8266
   ADC_MODE(ADC_VCC); // Read the supply voltage
 #endif
 
@@ -45,15 +45,15 @@ Serial.print("\n[code]\n");
 
 Serial.print ("TFT_eSPI ver = "); Serial.println(user.version);
 printProcessorName();
-#if defined (ESP32) || defined (ARDUINO_ARCH_ESP8266)
+#if defined (ESP32) || defined (ESP8266)
   if (user.esp < 0x32F000 || user.esp > 0x32FFFF) { Serial.print("Frequency    = "); Serial.print(ESP.getCpuFreqMHz());Serial.println("MHz"); }
 #endif
-#ifdef ARDUINO_ARCH_ESP8266
+#ifdef ESP8266
   Serial.print("Voltage      = "); Serial.print(ESP.getVcc() / 918.0); Serial.println("V"); // 918 empirically determined
 #endif
 Serial.print("Transactions = "); Serial.println((user.trans  ==  1) ? "Yes" : "No");
 Serial.print("Interface    = "); Serial.println((user.serial ==  1) ? "SPI" : "Parallel");
-#ifdef ARDUINO_ARCH_ESP8266
+#ifdef ESP8266
 if (user.serial ==  1){ Serial.print("SPI overlap  = "); Serial.println((user.overlap == 1) ? "Yes\n" : "No\n"); }
 #endif
 if (user.tft_driver != 0xE9D) // For ePaper displays the size is defined in the sketch
@@ -78,7 +78,7 @@ if (user.pin_tft_mosi != -1) { Serial.print("MOSI    = "); Serial.print("GPIO ")
 if (user.pin_tft_miso != -1) { Serial.print("MISO    = "); Serial.print("GPIO "); Serial.println(getPinName(user.pin_tft_miso)); }
 if (user.pin_tft_clk  != -1) { Serial.print("SCK     = "); Serial.print("GPIO "); Serial.println(getPinName(user.pin_tft_clk)); }
 
-#ifdef ARDUINO_ARCH_ESP8266
+#ifdef ESP8266
 if (user.overlap == true)
 {
   Serial.println("Overlap selected, following pins MUST be used:");
@@ -92,7 +92,7 @@ if (user.overlap == true)
 }
 #endif
 String pinNameRef = "GPIO ";
-#ifdef ARDUINO_ARCH_ESP8266
+#ifdef ESP8266
   pinNameRef = "PIN_D";
 #endif
 

keywords.txt

@@ -18,9 +18,6 @@ pushColor	KEYWORD2
 
 setRotation	KEYWORD2
 getRotation	KEYWORD2
-setOrigin	KEYWORD2
-getOriginX	KEYWORD2
-getOriginY	KEYWORD2
 invertDisplay	KEYWORD2
 setAddrWindow	KEYWORD2
 
@@ -47,8 +44,6 @@ end_SDA_Read	KEYWORD2
 fillScreen	KEYWORD2
 
 drawRect	KEYWORD2
-fillRectHGradient	KEYWORD2
-fillRectVGradient	KEYWORD2
 drawRoundRect	KEYWORD2
 fillRoundRect	KEYWORD2
 
@@ -74,7 +69,6 @@ getPivotY	KEYWORD2
 readRect	KEYWORD2
 pushRect	KEYWORD2
 pushImage	KEYWORD2
-pushMaskedImage	KEYWORD2
 readRectRGB	KEYWORD2
 
 drawNumber	KEYWORD2
@@ -146,12 +140,10 @@ calibrateTouch	KEYWORD2
 setTouch	KEYWORD2
 
 # Smooth (anti-aliased) graphics functions
-drawSmoothCircle	KEYWORD2
+fillRectHGradient	KEYWORD2
+fillRectVGradient	KEYWORD2
 fillSmoothCircle	KEYWORD2
-drawSmoothRoundRect	KEYWORD2
 fillSmoothRoundRect	KEYWORD2
-drawSmoothArc	KEYWORD2
-drawArc	KEYWORD2
 drawSpot	KEYWORD2
 drawWideLine	KEYWORD2
 drawWedgeLine	KEYWORD2

library.json

@@ -1,8 +1,8 @@
 {
   "name": "TFT_eSPI",
-  "version": "2.5.21",
+  "version": "2.4.72",
   "keywords": "Arduino, tft, display, ttgo, LilyPi, WT32-SC01, ePaper, display, Pico, RP2040 Nano Connect, RP2040, STM32, ESP8266, NodeMCU, ESP32, M5Stack, ILI9341, ST7735, ILI9163, S6D02A1, ILI9481, ILI9486, ILI9488, ST7789, ST7796, RM68140, SSD1351, SSD1963, ILI9225, HX8357D, GC9A01, R61581",
-  "description": "A TFT and ePaper (SPI or parallel interface) graphics library with optimisation for Raspberry Pi Pico, RP2040, ESP8266, ESP32 and STM32 processors",
+  "description": "A TFT and ePaper SPI graphics library with optimisation for Raspberry Pi Pico, RP2040, ESP8266, ESP32 and STM32",
   "repository":
   {
     "type": "git",

library.properties

@@ -1,9 +1,9 @@
 name=TFT_eSPI
-version=2.5.21
+version=2.4.72
 author=Bodmer
 maintainer=Bodmer
 sentence=TFT graphics library for Arduino processors with performance optimisation for RP2040, STM32, ESP8266 and ESP32
-paragraph=Supports TFT displays using drivers (ILI9341 etc) that operate with hardware SPI or 8/16 bit parallel.
+paragraph=Supports TFT displays using drivers (ILI9341 etc) that operate with hardware SPI or 8 bit parallel.
 category=Display
 url=https://github.com/Bodmer/TFT_eSPI
 architectures=*