diff --git a/Processors/TFT_eSPI_RP2040.c b/Processors/TFT_eSPI_RP2040.c index b58eb96..9f4c933 100644 --- a/Processors/TFT_eSPI_RP2040.c +++ b/Processors/TFT_eSPI_RP2040.c @@ -301,9 +301,8 @@ void TFT_eSPI::dmaWait(void) /*************************************************************************************** ** Function name: pushPixelsDMA -** Description: Push pixels to TFT (len must be less than 32767) +** Description: Push pixels to TFT ***************************************************************************************/ -// This will byte swap the original image if setSwapBytes(true) was called by sketch. void TFT_eSPI::pushPixelsDMA(uint16_t* image, uint32_t len) { if ((len == 0) || (!DMA_Enabled)) return; @@ -324,9 +323,9 @@ void TFT_eSPI::pushPixelsDMA(uint16_t* image, uint32_t len) /*************************************************************************************** ** Function name: pushImageDMA -** Description: Push image to a window (w*h must be less than 65536) +** Description: Push image to a window ***************************************************************************************/ -// This will clip and also swap bytes if setSwapBytes(true) was called by sketch +// This will clip to the viewport void TFT_eSPI::pushImageDMA(int32_t x, int32_t y, int32_t w, int32_t h, uint16_t* image, uint16_t* buffer) { if ((x >= _vpW) || (y >= _vpH) || (!DMA_Enabled)) return; diff --git a/TFT_eSPI.h b/TFT_eSPI.h index d8ba614..30f69d6 100644 --- a/TFT_eSPI.h +++ b/TFT_eSPI.h @@ -9,14 +9,14 @@ The built-in fonts 4, 6, 7 and 8 are Run Length Encoded (RLE) to reduce the FLASH footprint. - Last review/edit by Bodmer: 01/12/20 + Last review/edit by Bodmer: 21/04/21 ****************************************************/ // Stop fonts etc being loaded multiple times #ifndef _TFT_eSPIH_ #define _TFT_eSPIH_ -#define TFT_ESPI_VERSION "2.3.64" +#define TFT_ESPI_VERSION "2.3.65" // Bit level feature flags // Bit 0 set: viewport capability @@ -39,7 +39,20 @@ #include // Handle FLASH based storage e.g. PROGMEM -#ifdef __AVR__ +#if defined(ARDUINO_ARCH_RP2040) + #undef pgm_read_byte + #define pgm_read_byte(addr) (*(const unsigned char *)(addr)) + #undef pgm_read_word + #define pgm_read_word(addr) ({ \ + typeof(addr) _addr = (addr); \ + *(const unsigned short *)(_addr); \ + }) + #undef pgm_read_dword + #define pgm_read_dword(addr) ({ \ + typeof(addr) _addr = (addr); \ + *(const unsigned long *)(_addr); \ + }) +#elif defined(__AVR__) #include #elif defined(ESP8266) || defined(ESP32) #include @@ -301,7 +314,7 @@ typedef struct { String version = TFT_ESPI_VERSION; int32_t esp; // Processor code -uint8_t trans; // SPI transaction supoort +uint8_t trans; // SPI transaction support uint8_t serial; // Serial (SPI) or parallel uint8_t overlap; // ESP8266 overlap mode @@ -508,9 +521,9 @@ class TFT_eSPI : public Print { friend class TFT_eSprite; // Sprite class has ac // Handle char arrays // Use with setTextDatum() to position string on TFT, and setTextPadding() to blank old displayed strings - drawString(const char *string, int32_t x, int32_t y, uint8_t font), // Draw string using specifed font number + drawString(const char *string, int32_t x, int32_t y, uint8_t font), // Draw string using specified font number drawString(const char *string, int32_t x, int32_t y), // Draw string using current font - drawString(const String& string, int32_t x, int32_t y, uint8_t font),// Draw string using specifed font number + drawString(const String& string, int32_t x, int32_t y, uint8_t font),// Draw string using specified font number drawString(const String& string, int32_t x, int32_t y), // Draw string using current font drawCentreString(const char *string, int32_t x, int32_t y, uint8_t font), // Deprecated, use setTextDatum() and drawString() @@ -655,7 +668,7 @@ class TFT_eSPI : public Print { friend class TFT_eSprite; // Sprite class has ac // Set/get an arbitrary library configuration attribute or option // Use to switch ON/OFF capabilities such as UTF8 decoding - each attribute has a unique ID - // id = 0: reserved - may be used in fuuture to reset all attributes to a default state + // id = 0: reserved - may be used in future to reset all attributes to a default state // id = 1: Turn on (a=true) or off (a=false) GLCD cp437 font character error correction // id = 2: Turn on (a=true) or off (a=false) UTF8 decoding // id = 3: Enable or disable use of ESP32 PSRAM (if available) diff --git a/examples/160 x 128/TFT_flash_jpg/jpeg1.h b/examples/160 x 128/TFT_flash_jpg/jpeg1.h index 66920f9..a22dd5c 100644 --- a/examples/160 x 128/TFT_flash_jpg/jpeg1.h +++ b/examples/160 x 128/TFT_flash_jpg/jpeg1.h @@ -1,5 +1,4 @@ // We need this header file to use FLASH as storage with PROGMEM directive -#include const uint8_t EagleEye[] PROGMEM = { 0xFF,0xD8,0xFF,0xE0,0x00,0x10,0x4A,0x46,0x49,0x46,0x00,0x01,0x01,0x01,0x00,0xB4,0x00,0xB4,0x00,0x00,0xFF,0xDB,0x00,0x43,0x00,0x04,0x03,0x03,0x03,0x03,0x02,0x04, diff --git a/examples/160 x 128/TFT_flash_jpg/jpeg2.h b/examples/160 x 128/TFT_flash_jpg/jpeg2.h index 1240af7..4920740 100644 --- a/examples/160 x 128/TFT_flash_jpg/jpeg2.h +++ b/examples/160 x 128/TFT_flash_jpg/jpeg2.h @@ -1,5 +1,4 @@ // We need this header file to use FLASH as storage with PROGMEM directive -#include const uint8_t Tiger[] PROGMEM = { 0xFF,0xD8,0xFF,0xE0,0x00,0x10,0x4A,0x46,0x49,0x46,0x00,0x01,0x01,0x01,0x00,0xB4,0x00,0xB4,0x00,0x00,0xFF,0xDB,0x00,0x43,0x00,0x04,0x03,0x03,0x03,0x03,0x02,0x04, diff --git a/examples/160 x 128/TFT_flash_jpg/jpeg3.h b/examples/160 x 128/TFT_flash_jpg/jpeg3.h index 3bae8c4..a23a8d2 100644 --- a/examples/160 x 128/TFT_flash_jpg/jpeg3.h +++ b/examples/160 x 128/TFT_flash_jpg/jpeg3.h @@ -1,5 +1,4 @@ // We need this header file to use FLASH as storage with PROGMEM directive -#include const uint8_t Baboon[] PROGMEM = { 0xFF,0xD8,0xFF,0xE0,0x00,0x10,0x4A,0x46,0x49,0x46,0x00,0x01,0x01,0x01,0x00,0x48,0x00,0x48,0x00,0x00,0xFF,0xDB,0x00,0x43,0x00,0x04,0x03,0x03,0x03,0x03,0x02,0x04, diff --git a/examples/160 x 128/TFT_flash_jpg/jpeg4.h b/examples/160 x 128/TFT_flash_jpg/jpeg4.h index ef73296..fdeaa25 100644 --- a/examples/160 x 128/TFT_flash_jpg/jpeg4.h +++ b/examples/160 x 128/TFT_flash_jpg/jpeg4.h @@ -1,5 +1,4 @@ // We need this header file to use FLASH as storage with PROGMEM directive -#include const uint8_t Mouse160[] PROGMEM = { 0xFF,0xD8,0xFF,0xE0,0x00,0x10,0x4A,0x46,0x49,0x46,0x00,0x01,0x01,0x01,0x00,0x48,0x00,0x48,0x00,0x00,0xFF,0xDB,0x00,0x43,0x00,0x04,0x03,0x03,0x03,0x03,0x02,0x04, diff --git a/examples/480 x 320/TFT_flash_jpg/jpeg1.h b/examples/480 x 320/TFT_flash_jpg/jpeg1.h index d9678df..801c509 100644 --- a/examples/480 x 320/TFT_flash_jpg/jpeg1.h +++ b/examples/480 x 320/TFT_flash_jpg/jpeg1.h @@ -1,5 +1,4 @@ // We need this header file to use FLASH as storage with PROGMEM directive -#include // Here is the 320 x 480 jpeg image data const uint8_t Baboon40[] PROGMEM = { diff --git a/examples/480 x 320/TFT_flash_jpg/jpeg2.h b/examples/480 x 320/TFT_flash_jpg/jpeg2.h index cbdbf8c..399848e 100644 --- a/examples/480 x 320/TFT_flash_jpg/jpeg2.h +++ b/examples/480 x 320/TFT_flash_jpg/jpeg2.h @@ -1,5 +1,4 @@ // We need this header file to use FLASH as storage with PROGMEM directive -#include // Here is the 320 x 480 jpeg image data const uint8_t Mouse480[] PROGMEM = { diff --git a/examples/480 x 320/TFT_flash_jpg/jpeg3.h b/examples/480 x 320/TFT_flash_jpg/jpeg3.h index 1fd9458..b59a6a3 100644 --- a/examples/480 x 320/TFT_flash_jpg/jpeg3.h +++ b/examples/480 x 320/TFT_flash_jpg/jpeg3.h @@ -1,5 +1,4 @@ // We need this header file to use FLASH as storage with PROGMEM directive -#include // Here is the 320 x 480 jpeg image data const uint8_t lena20k[] PROGMEM = { diff --git a/examples/480 x 320/TFT_flash_jpg/jpeg4.h b/examples/480 x 320/TFT_flash_jpg/jpeg4.h index b22845d..00902f3 100644 --- a/examples/480 x 320/TFT_flash_jpg/jpeg4.h +++ b/examples/480 x 320/TFT_flash_jpg/jpeg4.h @@ -1,5 +1,4 @@ // We need this header file to use FLASH as storage with PROGMEM directive -#include // Here is the 300 x 300 jpeg image data const uint8_t EagleEye[] PROGMEM = { diff --git a/examples/480 x 320/TFT_ring_meter/Alert.h b/examples/480 x 320/TFT_ring_meter/Alert.h index 54d013d..32ddf78 100644 --- a/examples/480 x 320/TFT_ring_meter/Alert.h +++ b/examples/480 x 320/TFT_ring_meter/Alert.h @@ -1,5 +1,4 @@ // We need this header file to use FLASH as storage with PROGMEM directive: -#include // Icon width and height const uint16_t alertWidth = 32; diff --git a/examples/DMA test/Flash_Jpg_DMA/panda.h b/examples/DMA test/Flash_Jpg_DMA/panda.h index 57c6134..15cc48d 100644 --- a/examples/DMA test/Flash_Jpg_DMA/panda.h +++ b/examples/DMA test/Flash_Jpg_DMA/panda.h @@ -9,8 +9,7 @@ Paste the array into a new tabe, top and tail the array from the tool to look like the one below with: - #include - const uint8_t name[] PROGMEM = { + const uint8_t name[] PROGMEM = { to start and and end with: @@ -22,7 +21,6 @@ */ -#include const uint8_t panda[] PROGMEM = { 0xFF, 0xD8, 0xFF, 0xE0, 0x00, 0x10, 0x4A, 0x46, 0x49, 0x46, 0x00, 0x01, 0x01, 0x01, 0x00, 0xB4, 0x00, 0xB4, 0x00, 0x00, 0xFF, 0xDB, 0x00, 0x43, 0x00, 0x08, 0x06, 0x06, 0x07, 0x06, 0x05, 0x08, diff --git a/examples/Generic/ESP8266_uncannyEyes/defaultEye.h b/examples/Generic/ESP8266_uncannyEyes/defaultEye.h index 078fecf..5d0cd9f 100644 --- a/examples/Generic/ESP8266_uncannyEyes/defaultEye.h +++ b/examples/Generic/ESP8266_uncannyEyes/defaultEye.h @@ -1,7 +1,6 @@ #define SCLERA_WIDTH 200 #define SCLERA_HEIGHT 200 -#include const uint16_t sclera[SCLERA_HEIGHT * SCLERA_WIDTH] PROGMEM= { 0X6901, 0X6901, 0X6901, 0X6901, 0X6901, 0X6901, 0X6901, 0X6901, diff --git a/examples/Generic/ESP8266_uncannyEyes/dragonEye.h b/examples/Generic/ESP8266_uncannyEyes/dragonEye.h index 84c882c..78ee02a 100644 --- a/examples/Generic/ESP8266_uncannyEyes/dragonEye.h +++ b/examples/Generic/ESP8266_uncannyEyes/dragonEye.h @@ -1,7 +1,6 @@ #define SCLERA_WIDTH 160 #define SCLERA_HEIGHT 160 -#include const uint16_t sclera[SCLERA_HEIGHT*SCLERA_WIDTH] PROGMEM= { 0X0000, 0X0000, 0X0000, 0X0000, 0X0000, 0X0000, 0X0000, 0X0000, diff --git a/examples/Generic/ESP8266_uncannyEyes/goatEye.h b/examples/Generic/ESP8266_uncannyEyes/goatEye.h index d80b5b5..9e7cf87 100644 --- a/examples/Generic/ESP8266_uncannyEyes/goatEye.h +++ b/examples/Generic/ESP8266_uncannyEyes/goatEye.h @@ -1,7 +1,6 @@ #define SCLERA_WIDTH 128 #define SCLERA_HEIGHT 128 -#include const uint16_t sclera[SCLERA_HEIGHT * SCLERA_WIDTH] PROGMEM= { 0X0000, 0X0000, 0X0000, 0X0000, 0X0000, 0X0000, 0X0000, 0X0000, diff --git a/examples/Generic/ESP8266_uncannyEyes/noScleraEye.h b/examples/Generic/ESP8266_uncannyEyes/noScleraEye.h index 4c7513f..39fca60 100644 --- a/examples/Generic/ESP8266_uncannyEyes/noScleraEye.h +++ b/examples/Generic/ESP8266_uncannyEyes/noScleraEye.h @@ -1,7 +1,6 @@ #define SCLERA_WIDTH 160 #define SCLERA_HEIGHT 160 -#include const uint16_t sclera[SCLERA_HEIGHT * SCLERA_WIDTH] PROGMEM= { 0X0000, 0X0000, 0X0000, 0X0000, 0X0000, 0X0000, 0X0000, 0X0000, diff --git a/examples/Generic/TFT_Flash_Bitmap/Alert.h b/examples/Generic/TFT_Flash_Bitmap/Alert.h index 0e5a895..88a7af4 100644 --- a/examples/Generic/TFT_Flash_Bitmap/Alert.h +++ b/examples/Generic/TFT_Flash_Bitmap/Alert.h @@ -1,5 +1,4 @@ // We need this header file to use FLASH as storage with PROGMEM directive: -#include // Icon width and height const uint16_t alertWidth = 32; diff --git a/examples/Generic/TFT_Flash_Bitmap/Close.h b/examples/Generic/TFT_Flash_Bitmap/Close.h index dc2a4fd..b5ad527 100644 --- a/examples/Generic/TFT_Flash_Bitmap/Close.h +++ b/examples/Generic/TFT_Flash_Bitmap/Close.h @@ -1,5 +1,4 @@ // We need this header file to use FLASH as storage with PROGMEM directive: -#include // Icon width and height const uint16_t closeWidth = 32; diff --git a/examples/Generic/TFT_Flash_Bitmap/Info.h b/examples/Generic/TFT_Flash_Bitmap/Info.h index bd66aae..87f55ab 100644 --- a/examples/Generic/TFT_Flash_Bitmap/Info.h +++ b/examples/Generic/TFT_Flash_Bitmap/Info.h @@ -1,5 +1,4 @@ // We need this header file to use FLASH as storage with PROGMEM directive: -#include // Icon width and height const uint16_t infoWidth = 32; diff --git a/examples/Generic/drawXBitmap/xbm.h b/examples/Generic/drawXBitmap/xbm.h index 675dc1f..a3a7f91 100644 --- a/examples/Generic/drawXBitmap/xbm.h +++ b/examples/Generic/drawXBitmap/xbm.h @@ -11,8 +11,6 @@ // Example of the correct format is shown below -#include // PROGMEM support header - // Espressif logo 50 x 50 pixel array in XBM format #define logoWidth 50 // logo width #define logoHeight 50 // logo height diff --git a/examples/Smooth Fonts/FLASH_Array/Font_Demo_1_Array/NotoSansBold15.h b/examples/Smooth Fonts/FLASH_Array/Font_Demo_1_Array/NotoSansBold15.h index c356370..aa777b8 100644 --- a/examples/Smooth Fonts/FLASH_Array/Font_Demo_1_Array/NotoSansBold15.h +++ b/examples/Smooth Fonts/FLASH_Array/Font_Demo_1_Array/NotoSansBold15.h @@ -5,8 +5,7 @@ Paste the byte array into a sketch tab and add two lines at the start with a unique font name: - #include - const uint8_t fontName[] PROGMEM = { + const uint8_t fontName[] PROGMEM = { At the end add: @@ -17,7 +16,6 @@ #include "NotoSansBold15.h" */ -#include const uint8_t NotoSansBold15[] PROGMEM = { 0x00, 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, diff --git a/examples/Smooth Fonts/FLASH_Array/Font_Demo_1_Array/NotoSansBold36.h b/examples/Smooth Fonts/FLASH_Array/Font_Demo_1_Array/NotoSansBold36.h index 25df964..0105766 100644 --- a/examples/Smooth Fonts/FLASH_Array/Font_Demo_1_Array/NotoSansBold36.h +++ b/examples/Smooth Fonts/FLASH_Array/Font_Demo_1_Array/NotoSansBold36.h @@ -5,8 +5,7 @@ Paste the byte array into a sketch tab and add two lines at the start with a unique font name: - #include - const uint8_t fontName[] PROGMEM = { + const uint8_t fontName[] PROGMEM = { At the end add: @@ -17,7 +16,6 @@ #include "NotoSansBold36.h" */ -#include const uint8_t NotoSansBold36[] PROGMEM = { 0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, diff --git a/examples/Smooth Fonts/FLASH_Array/Font_Demo_2_Array/NotoSansBold15.h b/examples/Smooth Fonts/FLASH_Array/Font_Demo_2_Array/NotoSansBold15.h index c356370..aa777b8 100644 --- a/examples/Smooth Fonts/FLASH_Array/Font_Demo_2_Array/NotoSansBold15.h +++ b/examples/Smooth Fonts/FLASH_Array/Font_Demo_2_Array/NotoSansBold15.h @@ -5,8 +5,7 @@ Paste the byte array into a sketch tab and add two lines at the start with a unique font name: - #include - const uint8_t fontName[] PROGMEM = { + const uint8_t fontName[] PROGMEM = { At the end add: @@ -17,7 +16,6 @@ #include "NotoSansBold15.h" */ -#include const uint8_t NotoSansBold15[] PROGMEM = { 0x00, 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, diff --git a/examples/Smooth Fonts/FLASH_Array/Font_Demo_2_Array/NotoSansBold36.h b/examples/Smooth Fonts/FLASH_Array/Font_Demo_2_Array/NotoSansBold36.h index 25df964..0105766 100644 --- a/examples/Smooth Fonts/FLASH_Array/Font_Demo_2_Array/NotoSansBold36.h +++ b/examples/Smooth Fonts/FLASH_Array/Font_Demo_2_Array/NotoSansBold36.h @@ -5,8 +5,7 @@ Paste the byte array into a sketch tab and add two lines at the start with a unique font name: - #include - const uint8_t fontName[] PROGMEM = { + const uint8_t fontName[] PROGMEM = { At the end add: @@ -17,7 +16,6 @@ #include "NotoSansBold36.h" */ -#include const uint8_t NotoSansBold36[] PROGMEM = { 0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, diff --git a/examples/Smooth Fonts/FLASH_Array/Font_Demo_3_Array/NotoSansBold15.h b/examples/Smooth Fonts/FLASH_Array/Font_Demo_3_Array/NotoSansBold15.h index c356370..aa777b8 100644 --- a/examples/Smooth Fonts/FLASH_Array/Font_Demo_3_Array/NotoSansBold15.h +++ b/examples/Smooth Fonts/FLASH_Array/Font_Demo_3_Array/NotoSansBold15.h @@ -5,8 +5,7 @@ Paste the byte array into a sketch tab and add two lines at the start with a unique font name: - #include - const uint8_t fontName[] PROGMEM = { + const uint8_t fontName[] PROGMEM = { At the end add: @@ -17,7 +16,6 @@ #include "NotoSansBold15.h" */ -#include const uint8_t NotoSansBold15[] PROGMEM = { 0x00, 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, diff --git a/examples/Smooth Fonts/FLASH_Array/Font_Demo_3_Array/NotoSansBold36.h b/examples/Smooth Fonts/FLASH_Array/Font_Demo_3_Array/NotoSansBold36.h index 25df964..0105766 100644 --- a/examples/Smooth Fonts/FLASH_Array/Font_Demo_3_Array/NotoSansBold36.h +++ b/examples/Smooth Fonts/FLASH_Array/Font_Demo_3_Array/NotoSansBold36.h @@ -5,8 +5,7 @@ Paste the byte array into a sketch tab and add two lines at the start with a unique font name: - #include - const uint8_t fontName[] PROGMEM = { + const uint8_t fontName[] PROGMEM = { At the end add: @@ -17,7 +16,6 @@ #include "NotoSansBold36.h" */ -#include const uint8_t NotoSansBold36[] PROGMEM = { 0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, diff --git a/examples/Smooth Fonts/FLASH_Array/Font_Demo_3_Array/NotoSansMonoSCB20.h b/examples/Smooth Fonts/FLASH_Array/Font_Demo_3_Array/NotoSansMonoSCB20.h index 27a2544..f54a1cb 100644 --- a/examples/Smooth Fonts/FLASH_Array/Font_Demo_3_Array/NotoSansMonoSCB20.h +++ b/examples/Smooth Fonts/FLASH_Array/Font_Demo_3_Array/NotoSansMonoSCB20.h @@ -5,8 +5,7 @@ Paste the byte array into a sketch tab and add two lines at the start with a unique font name: - #include - const uint8_t fontName[] PROGMEM = { + const uint8_t fontName[] PROGMEM = { At the end add: @@ -17,7 +16,6 @@ #include "NotoSansMonoSCB20.h" */ -#include const uint8_t NotoSansMonoSCB20[] PROGMEM = { 0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, diff --git a/examples/Smooth Fonts/FLASH_Array/Font_Demo_4_Array/NotoSansBold15.h b/examples/Smooth Fonts/FLASH_Array/Font_Demo_4_Array/NotoSansBold15.h index c356370..aa777b8 100644 --- a/examples/Smooth Fonts/FLASH_Array/Font_Demo_4_Array/NotoSansBold15.h +++ b/examples/Smooth Fonts/FLASH_Array/Font_Demo_4_Array/NotoSansBold15.h @@ -5,8 +5,7 @@ Paste the byte array into a sketch tab and add two lines at the start with a unique font name: - #include - const uint8_t fontName[] PROGMEM = { + const uint8_t fontName[] PROGMEM = { At the end add: @@ -17,7 +16,6 @@ #include "NotoSansBold15.h" */ -#include const uint8_t NotoSansBold15[] PROGMEM = { 0x00, 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, diff --git a/examples/Smooth Fonts/FLASH_Array/Font_Demo_4_Array/NotoSansBold36.h b/examples/Smooth Fonts/FLASH_Array/Font_Demo_4_Array/NotoSansBold36.h index 25df964..0105766 100644 --- a/examples/Smooth Fonts/FLASH_Array/Font_Demo_4_Array/NotoSansBold36.h +++ b/examples/Smooth Fonts/FLASH_Array/Font_Demo_4_Array/NotoSansBold36.h @@ -5,8 +5,7 @@ Paste the byte array into a sketch tab and add two lines at the start with a unique font name: - #include - const uint8_t fontName[] PROGMEM = { + const uint8_t fontName[] PROGMEM = { At the end add: @@ -17,7 +16,6 @@ #include "NotoSansBold36.h" */ -#include const uint8_t NotoSansBold36[] PROGMEM = { 0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, diff --git a/examples/Smooth Fonts/FLASH_Array/Print_Smooth_Font/Final_Frontier_28.h b/examples/Smooth Fonts/FLASH_Array/Print_Smooth_Font/Final_Frontier_28.h index f739df2..4b1a18e 100644 --- a/examples/Smooth Fonts/FLASH_Array/Print_Smooth_Font/Final_Frontier_28.h +++ b/examples/Smooth Fonts/FLASH_Array/Print_Smooth_Font/Final_Frontier_28.h @@ -5,8 +5,7 @@ Paste the byte array into a sketch tab and add two lines at the start with a unique font name and }; at the end: - #include - const uint8_t fontName[] PROGMEM = { + const uint8_t fontName[] PROGMEM = { Insert byte array here @@ -17,7 +16,6 @@ #include "fontName.h" */ -#include const uint8_t Final_Frontier_28[] PROGMEM = { 0x00, 0x00, 0x00, 0x5A, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x00, diff --git a/examples/Smooth Fonts/FLASH_Array/Smooth_font_gradient/NotoSansBold15.h b/examples/Smooth Fonts/FLASH_Array/Smooth_font_gradient/NotoSansBold15.h index af6d6fa..90e40ac 100644 --- a/examples/Smooth Fonts/FLASH_Array/Smooth_font_gradient/NotoSansBold15.h +++ b/examples/Smooth Fonts/FLASH_Array/Smooth_font_gradient/NotoSansBold15.h @@ -5,8 +5,7 @@ Paste the byte array into a sketch tab and add two lines at the start with a unique font name and }; at the end: - #include - const uint8_t fontName[] PROGMEM = { + const uint8_t fontName[] PROGMEM = { Insert byte array here @@ -17,7 +16,6 @@ #include "fontName.h" */ -#include const uint8_t NotoSansBold15[] PROGMEM = { 0x00, 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, diff --git a/examples/Smooth Fonts/FLASH_Array/Smooth_font_gradient/NotoSansBold36.h b/examples/Smooth Fonts/FLASH_Array/Smooth_font_gradient/NotoSansBold36.h index 0e3339c..3f400cc 100644 --- a/examples/Smooth Fonts/FLASH_Array/Smooth_font_gradient/NotoSansBold36.h +++ b/examples/Smooth Fonts/FLASH_Array/Smooth_font_gradient/NotoSansBold36.h @@ -5,8 +5,7 @@ Paste the byte array into a sketch tab and add two lines at the start with a unique font name and }; at the end: - #include - const uint8_t fontName[] PROGMEM = { + const uint8_t fontName[] PROGMEM = { Insert byte array here @@ -17,7 +16,6 @@ #include "fontName.h" */ -#include const uint8_t NotoSansBold36[] PROGMEM = { 0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, diff --git a/examples/Smooth Fonts/FLASH_Array/Smooth_font_reading_TFT/NotoSansBold15.h b/examples/Smooth Fonts/FLASH_Array/Smooth_font_reading_TFT/NotoSansBold15.h index de10585..6ffd691 100644 --- a/examples/Smooth Fonts/FLASH_Array/Smooth_font_reading_TFT/NotoSansBold15.h +++ b/examples/Smooth Fonts/FLASH_Array/Smooth_font_reading_TFT/NotoSansBold15.h @@ -5,8 +5,7 @@ Paste the byte array into a sketch tab and add two lines at the start with a unique font name and }; at the end: - #include - const uint8_t fontName[] PROGMEM = { + const uint8_t fontName[] PROGMEM = { Insert byte array here @@ -17,7 +16,6 @@ #include "fontName.h" */ -#include const uint8_t NotoSansBold15[] PROGMEM = { 0x00, 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, diff --git a/examples/Smooth Fonts/FLASH_Array/Smooth_font_reading_TFT/NotoSansBold36.h b/examples/Smooth Fonts/FLASH_Array/Smooth_font_reading_TFT/NotoSansBold36.h index e72a668..0419552 100644 --- a/examples/Smooth Fonts/FLASH_Array/Smooth_font_reading_TFT/NotoSansBold36.h +++ b/examples/Smooth Fonts/FLASH_Array/Smooth_font_reading_TFT/NotoSansBold36.h @@ -5,8 +5,7 @@ Paste the byte array into a sketch tab and add two lines at the start with a unique font name and }; at the end: - #include - const uint8_t fontName[] PROGMEM = { + const uint8_t fontName[] PROGMEM = { Insert byte array here @@ -17,7 +16,6 @@ #include "fontName.h" */ -#include const uint8_t NotoSansBold36[] PROGMEM = { 0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, diff --git a/examples/Smooth Fonts/FLASH_Array/Unicode_test/Final_Frontier_28.h b/examples/Smooth Fonts/FLASH_Array/Unicode_test/Final_Frontier_28.h index ea240fc..474fe5c 100644 --- a/examples/Smooth Fonts/FLASH_Array/Unicode_test/Final_Frontier_28.h +++ b/examples/Smooth Fonts/FLASH_Array/Unicode_test/Final_Frontier_28.h @@ -5,8 +5,7 @@ Paste the byte array into a sketch tab and add two lines at the start with a unique font name and }; at the end: - #include - const uint8_t fontName[] PROGMEM = { + const uint8_t fontName[] PROGMEM = { Insert byte array here @@ -17,7 +16,6 @@ #include "fontName.h" */ -#include const uint8_t Final_Frontier_28[] PROGMEM = { 0x00, 0x00, 0x00, 0x5A, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x00, diff --git a/examples/Smooth Fonts/FLASH_Array/Unicode_test/Latin_Hiragana_24.h b/examples/Smooth Fonts/FLASH_Array/Unicode_test/Latin_Hiragana_24.h index aeb29f3..5e7f8e6 100644 --- a/examples/Smooth Fonts/FLASH_Array/Unicode_test/Latin_Hiragana_24.h +++ b/examples/Smooth Fonts/FLASH_Array/Unicode_test/Latin_Hiragana_24.h @@ -5,8 +5,7 @@ Paste the byte array into a sketch tab and add two lines at the start with a unique font name and }; at the end: - #include - const uint8_t fontName[] PROGMEM = { + const uint8_t fontName[] PROGMEM = { Insert byte array here @@ -17,7 +16,6 @@ #include "fontName.h" */ -#include const uint8_t Latin_Hiragana_24[] PROGMEM = { 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, diff --git a/examples/Smooth Fonts/FLASH_Array/Unicode_test/Unicode_Test_72.h b/examples/Smooth Fonts/FLASH_Array/Unicode_test/Unicode_Test_72.h index a88ef62..d76aa67 100644 --- a/examples/Smooth Fonts/FLASH_Array/Unicode_test/Unicode_Test_72.h +++ b/examples/Smooth Fonts/FLASH_Array/Unicode_test/Unicode_Test_72.h @@ -5,8 +5,7 @@ Paste the byte array into a sketch tab and add two lines at the start with a unique font name and }; at the end: - #include - const uint8_t fontName[] PROGMEM = { + const uint8_t fontName[] PROGMEM = { Insert byte array here @@ -17,7 +16,6 @@ #include "fontName.h" */ -#include const uint8_t Unicode_Test_72[] PROGMEM = { 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x00, diff --git a/examples/Sprite/Animated_dial/NotoSansBold36.h b/examples/Sprite/Animated_dial/NotoSansBold36.h index d892788..8c92b19 100644 --- a/examples/Sprite/Animated_dial/NotoSansBold36.h +++ b/examples/Sprite/Animated_dial/NotoSansBold36.h @@ -5,8 +5,7 @@ Paste the byte array into a sketch tab and add two lines at the start with a unique font name: - #include - const uint8_t fontName[] PROGMEM = { + const uint8_t fontName[] PROGMEM = { At the end add: @@ -17,7 +16,6 @@ #include "NotoSansBold36.h" */ -#include // Digits 0-9 and . const uint8_t NotoSansBold36[] PROGMEM = { 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, diff --git a/examples/Sprite/Animated_dial/dial.h b/examples/Sprite/Animated_dial/dial.h index 2321f57..e026bb0 100644 --- a/examples/Sprite/Animated_dial/dial.h +++ b/examples/Sprite/Animated_dial/dial.h @@ -5,8 +5,7 @@ Paste the byte array into a sketch tab "jpeg_name" and add two lines at the start with a unique array name: - #include - const uint8_t jpeg_name[] PROGMEM = { + const uint8_t jpeg_name[] PROGMEM = { At the end add: @@ -17,7 +16,6 @@ #include "jpeg_name.h" */ -#include const uint8_t dial[] PROGMEM = { 0xFF, 0xD8, 0xFF, 0xE0, 0x00, 0x10, 0x4A, 0x46, 0x49, 0x46, 0x00, 0x01, 0x01, 0x01, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0xFF, 0xE1, 0x00, 0x5A, 0x45, 0x78, 0x69, 0x66, 0x00, 0x00, 0x4D, 0x4D,