From 1052dee7904b20118586d4a41a6d9ade1d27b380 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Fri, 4 Jul 2014 16:29:45 +0200 Subject: [PATCH] TFT: Update PROGMEM for compatibily with newer gccutility/Adafruit_ST7735.cpp --- libraries/TFT/src/utility/Adafruit_ST7735.cpp | 6 +++--- libraries/TFT/src/utility/Adafruit_ST7735.h | 4 ++-- libraries/TFT/src/utility/glcdfont.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/TFT/src/utility/Adafruit_ST7735.cpp b/libraries/TFT/src/utility/Adafruit_ST7735.cpp index 4cf084c3bb1..df91f7d27c8 100644 --- a/libraries/TFT/src/utility/Adafruit_ST7735.cpp +++ b/libraries/TFT/src/utility/Adafruit_ST7735.cpp @@ -100,7 +100,7 @@ void Adafruit_ST7735::writedata(uint8_t c) { // formatting -- storage-wise this is hundreds of bytes more compact // than the equivalent code. Companion function follows. #define DELAY 0x80 -PROGMEM static prog_uchar +PROGMEM const static unsigned char Bcmd[] = { // Initialization commands for 7735B screens 18, // 18 commands in list: ST7735_SWRESET, DELAY, // 1: Software reset, no args, w/delay @@ -293,7 +293,7 @@ PROGMEM static prog_uchar // Companion code to the above tables. Reads and issues // a series of LCD commands stored in PROGMEM byte array. -void Adafruit_ST7735::commandList(uint8_t *addr) { +void Adafruit_ST7735::commandList(const uint8_t *addr) { uint8_t numCommands, numArgs; uint16_t ms; @@ -318,7 +318,7 @@ void Adafruit_ST7735::commandList(uint8_t *addr) { // Initialization code common to both 'B' and 'R' type displays -void Adafruit_ST7735::commonInit(uint8_t *cmdList) { +void Adafruit_ST7735::commonInit(const uint8_t *cmdList) { colstart = rowstart = 0; // May be overridden in init func diff --git a/libraries/TFT/src/utility/Adafruit_ST7735.h b/libraries/TFT/src/utility/Adafruit_ST7735.h index 29c1ae2aedc..df52dd8a9d2 100644 --- a/libraries/TFT/src/utility/Adafruit_ST7735.h +++ b/libraries/TFT/src/utility/Adafruit_ST7735.h @@ -130,8 +130,8 @@ class Adafruit_ST7735 : public Adafruit_GFX { void spiwrite(uint8_t), writecommand(uint8_t c), writedata(uint8_t d), - commandList(uint8_t *addr), - commonInit(uint8_t *cmdList); + commandList(const uint8_t *addr), + commonInit(const uint8_t *cmdList); //uint8_t spiread(void); boolean hwSPI; diff --git a/libraries/TFT/src/utility/glcdfont.c b/libraries/TFT/src/utility/glcdfont.c index a325057214f..9527e35588d 100644 --- a/libraries/TFT/src/utility/glcdfont.c +++ b/libraries/TFT/src/utility/glcdfont.c @@ -8,7 +8,7 @@ // standard ascii 5x7 font -static unsigned char font[] PROGMEM = { +static const unsigned char font[] PROGMEM = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x3E, 0x6B, 0x4F, 0x6B, 0x3E,