From bbacd3a8a3f7af6cf67d89d92109ec65f959bef4 Mon Sep 17 00:00:00 2001 From: Bodmer Date: Thu, 22 Mar 2018 22:27:02 +0000 Subject: [PATCH] Fix issue in #110 Array name close[] clashes with a ESP32 function name. Renamed array to closeX[] --- examples/160 x 128/Flash_Bitmap2/Close.h | 2 +- examples/160 x 128/Flash_Bitmap2/Flash_Bitmap2.ino | 6 +++--- examples/320 x 240/TFT_Flash_Bitmap/Close.h | 2 +- examples/320 x 240/TFT_Flash_Bitmap/TFT_Flash_Bitmap.ino | 6 +++--- examples/480 x 320/Flash_Bitmap/Close.h | 2 +- examples/480 x 320/Flash_Bitmap/Flash_Bitmap.ino | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/160 x 128/Flash_Bitmap2/Close.h b/examples/160 x 128/Flash_Bitmap2/Close.h index c16d522..ce676c9 100644 --- a/examples/160 x 128/Flash_Bitmap2/Close.h +++ b/examples/160 x 128/Flash_Bitmap2/Close.h @@ -6,7 +6,7 @@ const uint16_t closeWidth = 32; const uint16_t closeHeight = 32; // The icon file can be created with the "UTFT ImageConverter 565" bitmap to .c file creation utility, more can be pasted in here -const unsigned short close[1024] PROGMEM={ +const unsigned short closeX[1024] PROGMEM={ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x30C3,0x4124,0x61C7,0x61C7,0x4124,0x30E3,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // row 0, 32 pixels 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x48E3,0xA249,0xEB8E,0xFCB2,0xFD14,0xFD75,0xFD96,0xFD34,0xFCF3,0xEBEF,0xA28A,0x4904,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // row 1, 64 pixels 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x58E3,0xC228,0xFC10,0xFD34,0xFE18,0xFE59,0xFE79,0xFE9A,0xFE9A,0xFE9A,0xFE9A,0xFE59,0xFD75,0xFC51,0xC28A,0x5904,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // row 2, 96 pixels diff --git a/examples/160 x 128/Flash_Bitmap2/Flash_Bitmap2.ino b/examples/160 x 128/Flash_Bitmap2/Flash_Bitmap2.ino index 09fe021..42099e9 100644 --- a/examples/160 x 128/Flash_Bitmap2/Flash_Bitmap2.ino +++ b/examples/160 x 128/Flash_Bitmap2/Flash_Bitmap2.ino @@ -28,7 +28,7 @@ TFT_eSPI tft = TFT_eSPI(); // Invoke library, pins defined in User_Setup.h // Include the header files that contain the icons -#include "alert.h" +#include "Alert.h" #include "Close.h" #include "Info.h" @@ -45,7 +45,7 @@ void setup() // Draw the icons drawIcon(info, (tft.width() - infoWidth)/2 - 50, (tft.height() - infoHeight)/2, infoWidth, infoHeight); drawIcon(alert, (tft.width() - alertWidth)/2, (tft.height() - alertHeight)/2, alertWidth, alertHeight); - drawIcon(close, (tft.width() - closeWidth)/2 + 50, (tft.height() - closeHeight)/2, closeWidth, closeHeight); + drawIcon(closeX, (tft.width() - closeWidth)/2 + 50, (tft.height() - closeHeight)/2, closeWidth, closeHeight); // Pause here to admire the icons! delay(4000); @@ -57,7 +57,7 @@ void loop() // Loop filling and clearing screen drawIcon(info, random(tft.width() - infoWidth), random(tft.height() - infoHeight), infoWidth, infoHeight); drawIcon(alert, random(tft.width() - alertWidth), random(tft.height() - alertHeight), alertWidth, alertHeight); - drawIcon(close, random(tft.width() - closeWidth), random(tft.height() - closeHeight), alertWidth, closeHeight); + drawIcon(closeX, random(tft.width() - closeWidth), random(tft.height() - closeHeight), alertWidth, closeHeight); // Clear screen after 100 x 3 = 300 icons drawn if (100 == count++) { diff --git a/examples/320 x 240/TFT_Flash_Bitmap/Close.h b/examples/320 x 240/TFT_Flash_Bitmap/Close.h index b58ec12..dc2a4fd 100644 --- a/examples/320 x 240/TFT_Flash_Bitmap/Close.h +++ b/examples/320 x 240/TFT_Flash_Bitmap/Close.h @@ -5,7 +5,7 @@ const uint16_t closeWidth = 32; const uint16_t closeHeight = 32; -const unsigned short close[1024] PROGMEM={ +const unsigned short closeX[1024] PROGMEM={ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x30C3,0x4124,0x61C7,0x61C7,0x4124,0x30E3,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // row 0, 32 pixels 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x48E3,0xA249,0xEB8E,0xFCB2,0xFD14,0xFD75,0xFD96,0xFD34,0xFCF3,0xEBEF,0xA28A,0x4904,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // row 1, 64 pixels 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x58E3,0xC228,0xFC10,0xFD34,0xFE18,0xFE59,0xFE79,0xFE9A,0xFE9A,0xFE9A,0xFE9A,0xFE59,0xFD75,0xFC51,0xC28A,0x5904,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // row 2, 96 pixels diff --git a/examples/320 x 240/TFT_Flash_Bitmap/TFT_Flash_Bitmap.ino b/examples/320 x 240/TFT_Flash_Bitmap/TFT_Flash_Bitmap.ino index 780dab1..82e09eb 100644 --- a/examples/320 x 240/TFT_Flash_Bitmap/TFT_Flash_Bitmap.ino +++ b/examples/320 x 240/TFT_Flash_Bitmap/TFT_Flash_Bitmap.ino @@ -24,7 +24,7 @@ TFT_eSPI tft = TFT_eSPI(); // Invoke custom library // Include the header files that contain the icons -#include "alert.h" +#include "Alert.h" #include "Close.h" #include "Info.h" @@ -41,7 +41,7 @@ void setup() // Draw the icons drawIcon(info, 100, 100, infoWidth, infoHeight); drawIcon(alert, 140, 100, alertWidth, alertHeight); - drawIcon(close, 180, 100, closeWidth, closeHeight); + drawIcon(closeX, 180, 100, closeWidth, closeHeight); // Pause here to admire the icons! delay(2000); @@ -53,7 +53,7 @@ void loop() // Loop filling and clearing screen drawIcon(info, random(tft.width() - infoWidth), random(tft.height() - infoHeight), infoWidth, infoHeight); drawIcon(alert, random(tft.width() - alertWidth), random(tft.height() - alertHeight), alertWidth, alertHeight); - drawIcon(close, random(tft.width() - closeWidth), random(tft.height() - closeHeight), alertWidth, closeHeight); + drawIcon(closeX, random(tft.width() - closeWidth), random(tft.height() - closeHeight), alertWidth, closeHeight); // Clear screen after 100 x 3 = 300 icons drawn if (100 == count++) { diff --git a/examples/480 x 320/Flash_Bitmap/Close.h b/examples/480 x 320/Flash_Bitmap/Close.h index c16d522..ce676c9 100644 --- a/examples/480 x 320/Flash_Bitmap/Close.h +++ b/examples/480 x 320/Flash_Bitmap/Close.h @@ -6,7 +6,7 @@ const uint16_t closeWidth = 32; const uint16_t closeHeight = 32; // The icon file can be created with the "UTFT ImageConverter 565" bitmap to .c file creation utility, more can be pasted in here -const unsigned short close[1024] PROGMEM={ +const unsigned short closeX[1024] PROGMEM={ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x30C3,0x4124,0x61C7,0x61C7,0x4124,0x30E3,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // row 0, 32 pixels 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x48E3,0xA249,0xEB8E,0xFCB2,0xFD14,0xFD75,0xFD96,0xFD34,0xFCF3,0xEBEF,0xA28A,0x4904,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // row 1, 64 pixels 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x58E3,0xC228,0xFC10,0xFD34,0xFE18,0xFE59,0xFE79,0xFE9A,0xFE9A,0xFE9A,0xFE9A,0xFE59,0xFD75,0xFC51,0xC28A,0x5904,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // row 2, 96 pixels diff --git a/examples/480 x 320/Flash_Bitmap/Flash_Bitmap.ino b/examples/480 x 320/Flash_Bitmap/Flash_Bitmap.ino index fb58180..d3ca697 100644 --- a/examples/480 x 320/Flash_Bitmap/Flash_Bitmap.ino +++ b/examples/480 x 320/Flash_Bitmap/Flash_Bitmap.ino @@ -31,7 +31,7 @@ TFT_eSPI tft = TFT_eSPI(); // Invoke custom library with default width and height // Include the header files that contain the icons -#include "alert.h" +#include "Alert.h" #include "Close.h" #include "Info.h" @@ -48,7 +48,7 @@ void setup() // Draw the icons drawIcon(info, (tft.width() - infoWidth)/2 - 50, (tft.height() - infoHeight)/2, infoWidth, infoHeight); drawIcon(alert, (tft.width() - alertWidth)/2, (tft.height() - alertHeight)/2, alertWidth, alertHeight); - drawIcon(close, (tft.width() - closeWidth)/2 + 50, (tft.height() - closeHeight)/2, closeWidth, closeHeight); + drawIcon(closeX, (tft.width() - closeWidth)/2 + 50, (tft.height() - closeHeight)/2, closeWidth, closeHeight); // Pause here to admire the icons! delay(4000); @@ -60,7 +60,7 @@ void loop() // Loop filling and clearing screen drawIcon(info, random(tft.width() - infoWidth), random(tft.height() - infoHeight), infoWidth, infoHeight); drawIcon(alert, random(tft.width() - alertWidth), random(tft.height() - alertHeight), alertWidth, alertHeight); - drawIcon(close, random(tft.width() - closeWidth), random(tft.height() - closeHeight), alertWidth, closeHeight); + drawIcon(closeX, random(tft.width() - closeWidth), random(tft.height() - closeHeight), alertWidth, closeHeight); // Clear screen after 100 x 3 = 300 icons drawn if (100 == count++) {