From 2945702efe92aace8f77ffd6a449208d09606efb Mon Sep 17 00:00:00 2001
From: Ludovic Pouzenc <ludovic@pouzenc.fr>
Date: Sun, 13 Jun 2021 12:45:16 +0200
Subject: MultiLCD: avoid all gcc warnings
---
libraries/MultiLCD/ILI9325D.cpp | 6 +++---
libraries/MultiLCD/ILI9341.cpp | 4 ++--
libraries/MultiLCD/MultiLCD.h | 28 ++++++++++++++--------------
libraries/MultiLCD/R61581.cpp | 6 +++---
libraries/MultiLCD/SSD1289.cpp | 6 +++---
5 files changed, 25 insertions(+), 25 deletions(-)
(limited to 'libraries')
diff --git a/libraries/MultiLCD/ILI9325D.cpp b/libraries/MultiLCD/ILI9325D.cpp
index 375ad21..908f38d 100644
--- a/libraries/MultiLCD/ILI9325D.cpp
+++ b/libraries/MultiLCD/ILI9325D.cpp
@@ -395,7 +395,7 @@ void LCD_ILI9325D::writeDigit(byte n)
}
}
-void LCD_ILI9325D::draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height)
+void LCD_ILI9325D::draw(const byte* buffer, uint16_t width, uint16_t height)
{
byte rows = height >> 3;
setXY(m_x, m_x + height - 1, m_y, m_y + width - 1);
@@ -411,7 +411,7 @@ void LCD_ILI9325D::draw(const PROGMEM byte* buffer, uint16_t width, uint16_t hei
m_y += width;
}
-void LCD_ILI9325D::draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY)
+void LCD_ILI9325D::draw(const byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY)
{
byte rows = height >> 3;
if (scaleY == 0) scaleY = scaleX;
@@ -432,7 +432,7 @@ void LCD_ILI9325D::draw(const PROGMEM byte* buffer, uint16_t width, uint16_t hei
m_y += width * scaleX;
}
-void LCD_ILI9325D::draw4bpp(const PROGMEM byte* buffer, uint16_t width, uint16_t height)
+void LCD_ILI9325D::draw4bpp(const byte* buffer, uint16_t width, uint16_t height)
{
char buf[240];
setXY(m_x, m_x + height * 2 - 1, m_y, m_y + width * 2- 1);
diff --git a/libraries/MultiLCD/ILI9341.cpp b/libraries/MultiLCD/ILI9341.cpp
index 4f8b64c..a5e56ca 100644
--- a/libraries/MultiLCD/ILI9341.cpp
+++ b/libraries/MultiLCD/ILI9341.cpp
@@ -478,7 +478,7 @@ void LCD_ILI9341::writeDigit(byte n)
}
}
-void LCD_ILI9341::draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height)
+void LCD_ILI9341::draw(const byte* buffer, uint16_t width, uint16_t height)
{
byte rows = height >> 3;
setXY(m_y, m_y + height - 1, m_x, m_x + width - 1);
@@ -495,7 +495,7 @@ void LCD_ILI9341::draw(const PROGMEM byte* buffer, uint16_t width, uint16_t heig
m_x += width;
}
-void LCD_ILI9341::draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte ScaleY)
+void LCD_ILI9341::draw(const byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte ScaleY)
{
byte rows = height >> 3;
setXY(m_y, m_y + height * 2 - 1, m_x, m_x + width * 2 - 1);
diff --git a/libraries/MultiLCD/MultiLCD.h b/libraries/MultiLCD/MultiLCD.h
index 58f7a11..a757946 100644
--- a/libraries/MultiLCD/MultiLCD.h
+++ b/libraries/MultiLCD/MultiLCD.h
@@ -52,9 +52,9 @@ public:
void setFontSize(FONT_SIZE size) { m_font = size; }
void setFlags(byte flags) { m_flags = flags; }
virtual void setBackLight(byte brightness) {}
- virtual void draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height) {}
- virtual void draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY = 0) {}
- virtual void draw4bpp(const PROGMEM byte* buffer, uint16_t width, uint16_t height) {}
+ virtual void draw(const byte* buffer, uint16_t width, uint16_t height) {}
+ virtual void draw(const byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY = 0) {}
+ virtual void draw4bpp(const byte* buffer, uint16_t width, uint16_t height) {}
virtual size_t write(uint8_t c) { return 0; }
virtual byte getLines() { return 0; }
virtual byte getCols() { return 0; }
@@ -113,9 +113,9 @@ public:
}
void begin();
void clear(uint16_t x = 0, uint16_t y = 0, uint16_t width = 320, uint16_t height = 240);
- void draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height);
- void draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY = 0);
- void draw4bpp(const PROGMEM byte* buffer, uint16_t width, uint16_t height);
+ void draw(const byte* buffer, uint16_t width, uint16_t height);
+ void draw(const byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY = 0);
+ void draw4bpp(const byte* buffer, uint16_t width, uint16_t height);
size_t write(uint8_t);
void clearLine(byte line)
{
@@ -186,8 +186,8 @@ public:
void clear(void);
size_t write(uint8_t);
void setBackLight(byte brightness);
- void draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height);
- void draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY = 0);
+ void draw(const byte* buffer, uint16_t width, uint16_t height);
+ void draw(const byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY = 0);
private:
void setXY(uint16_t x0, uint16_t x1, uint16_t y0, uint16_t y1);
void sendPixelData(byte d);
@@ -242,9 +242,9 @@ public:
}
void begin();
void clear(uint16_t x = 0, uint16_t y = 0, uint16_t width = 319, uint16_t height = 239);
- void draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height);
- void draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY = 0);
- void draw4bpp(const PROGMEM byte* buffer, uint16_t width, uint16_t height);
+ void draw(const byte* buffer, uint16_t width, uint16_t height);
+ void draw(const byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY = 0);
+ void draw4bpp(const byte* buffer, uint16_t width, uint16_t height);
size_t write(uint8_t);
void clearLine(byte line)
{
@@ -301,9 +301,9 @@ public:
}
void begin();
void clear(uint16_t x = 0, uint16_t y = 0, uint16_t width = 479, uint16_t height = 319);
- void draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height);
- void draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY = 0);
- void draw2x(const PROGMEM byte* buffer, uint16_t width, uint16_t height);
+ void draw(const byte* buffer, uint16_t width, uint16_t height);
+ void draw(const byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY = 0);
+ void draw2x(const byte* buffer, uint16_t width, uint16_t height);
size_t write(uint8_t);
void clearLine(byte line)
{
diff --git a/libraries/MultiLCD/R61581.cpp b/libraries/MultiLCD/R61581.cpp
index b17d5d5..418de14 100644
--- a/libraries/MultiLCD/R61581.cpp
+++ b/libraries/MultiLCD/R61581.cpp
@@ -370,7 +370,7 @@ void LCD_R61581::writeDigit(byte n)
Disable();
}
-void LCD_R61581::draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height)
+void LCD_R61581::draw(const byte* buffer, uint16_t width, uint16_t height)
{
byte rows = height >> 3;
Enable();
@@ -395,7 +395,7 @@ void LCD_R61581::draw(const PROGMEM byte* buffer, uint16_t width, uint16_t heigh
m_x += width;
}
-void LCD_R61581::draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY)
+void LCD_R61581::draw(const byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY)
{
byte rows = height >> 3;
if (scaleY == 0) scaleY = scaleX;
@@ -427,7 +427,7 @@ void LCD_R61581::draw(const PROGMEM byte* buffer, uint16_t width, uint16_t heigh
m_x += width * scaleX;
}
-void LCD_R61581::draw2x(const PROGMEM byte* buffer, uint16_t width, uint16_t height)
+void LCD_R61581::draw2x(const byte* buffer, uint16_t width, uint16_t height)
{
char buf[240];
Enable();
diff --git a/libraries/MultiLCD/SSD1289.cpp b/libraries/MultiLCD/SSD1289.cpp
index dab0b32..f89c9bd 100644
--- a/libraries/MultiLCD/SSD1289.cpp
+++ b/libraries/MultiLCD/SSD1289.cpp
@@ -302,7 +302,7 @@ void LCD_SSD1289::writeDigit(byte n)
Disable();
}
-void LCD_SSD1289::draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height)
+void LCD_SSD1289::draw(const byte* buffer, uint16_t width, uint16_t height)
{
byte rows = height >> 3;
Enable();
@@ -327,7 +327,7 @@ void LCD_SSD1289::draw(const PROGMEM byte* buffer, uint16_t width, uint16_t heig
m_x += width;
}
-void LCD_SSD1289::draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY)
+void LCD_SSD1289::draw(const byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY)
{
byte rows = height >> 3;
if (scaleY == 0) scaleY = scaleX;
@@ -359,7 +359,7 @@ void LCD_SSD1289::draw(const PROGMEM byte* buffer, uint16_t width, uint16_t heig
m_x += width * scaleX;
}
-void LCD_SSD1289::draw4bpp(const PROGMEM byte* buffer, uint16_t width, uint16_t height)
+void LCD_SSD1289::draw4bpp(const byte* buffer, uint16_t width, uint16_t height)
{
char buf[240];
Enable();
--
cgit v1.2.3