From edee2ad3639f0c3bb5b31390cd05769991c432b1 Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Thu, 29 Nov 2018 11:22:26 +0100 Subject: [PATCH] Fix LCD lib to compile under gcc 8 --- components/lcd/Adafruit-GFX-Library/Adafruit_GFX.cpp | 2 +- .../lcd/Adafruit-GFX-Library/{glcdfont.c => glcdfont.h} | 0 components/lcd/iot_lcd.cpp | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename components/lcd/Adafruit-GFX-Library/{glcdfont.c => glcdfont.h} (100%) diff --git a/components/lcd/Adafruit-GFX-Library/Adafruit_GFX.cpp b/components/lcd/Adafruit-GFX-Library/Adafruit_GFX.cpp index 53c7ad3..cf50d73 100755 --- a/components/lcd/Adafruit-GFX-Library/Adafruit_GFX.cpp +++ b/components/lcd/Adafruit-GFX-Library/Adafruit_GFX.cpp @@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE. */ #include "Adafruit_GFX.h" -#include "glcdfont.c" +#include "glcdfont.h" #ifdef __AVR__ #include #elif defined(ESP8266) || defined(ESP32) diff --git a/components/lcd/Adafruit-GFX-Library/glcdfont.c b/components/lcd/Adafruit-GFX-Library/glcdfont.h similarity index 100% rename from components/lcd/Adafruit-GFX-Library/glcdfont.c rename to components/lcd/Adafruit-GFX-Library/glcdfont.h diff --git a/components/lcd/iot_lcd.cpp b/components/lcd/iot_lcd.cpp index a3a51f3..6c0606e 100644 --- a/components/lcd/iot_lcd.cpp +++ b/components/lcd/iot_lcd.cpp @@ -551,7 +551,7 @@ int CEspLcd::drawStringSevSeg(const char *string, uint16_t poX, uint16_t poY, ui int CEspLcd::drawNumberSevSeg(int long_num, uint16_t poX, uint16_t poY, uint8_t size) { - char tmp[10]; + char tmp[12]; if (long_num < 0) { snprintf(tmp, sizeof(tmp), "%d", long_num); } else { @@ -619,7 +619,7 @@ int CEspLcd::drawString(const char *string, uint16_t x, uint16_t y) int CEspLcd::drawNumber(int long_num, uint16_t poX, uint16_t poY) { - char tmp[10]; + char tmp[12]; if (long_num < 0) { snprintf(tmp, sizeof(tmp), "%d", long_num); } else {