Fix #1148 (RP2040 pgmspace.h warnings)

This commit is contained in:
Bodmer 2021-04-21 22:48:21 +01:00
parent f33674c1a2
commit 715b4de525
39 changed files with 43 additions and 89 deletions

View File

@ -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;

View File

@ -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 <User_Setup_Select.h>
// 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 <avr/pgmspace.h>
#elif defined(ESP8266) || defined(ESP32)
#include <pgmspace.h>
@ -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)

View File

@ -1,5 +1,4 @@
// We need this header file to use FLASH as storage with PROGMEM directive
#include <pgmspace.h>
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,

View File

@ -1,5 +1,4 @@
// We need this header file to use FLASH as storage with PROGMEM directive
#include <pgmspace.h>
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,

View File

@ -1,5 +1,4 @@
// We need this header file to use FLASH as storage with PROGMEM directive
#include <pgmspace.h>
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,

View File

@ -1,5 +1,4 @@
// We need this header file to use FLASH as storage with PROGMEM directive
#include <pgmspace.h>
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,

View File

@ -1,5 +1,4 @@
// We need this header file to use FLASH as storage with PROGMEM directive
#include <pgmspace.h>
// Here is the 320 x 480 jpeg image data
const uint8_t Baboon40[] PROGMEM = {

View File

@ -1,5 +1,4 @@
// We need this header file to use FLASH as storage with PROGMEM directive
#include <pgmspace.h>
// Here is the 320 x 480 jpeg image data
const uint8_t Mouse480[] PROGMEM = {

View File

@ -1,5 +1,4 @@
// We need this header file to use FLASH as storage with PROGMEM directive
#include <pgmspace.h>
// Here is the 320 x 480 jpeg image data
const uint8_t lena20k[] PROGMEM = {

View File

@ -1,5 +1,4 @@
// We need this header file to use FLASH as storage with PROGMEM directive
#include <pgmspace.h>
// Here is the 300 x 300 jpeg image data
const uint8_t EagleEye[] PROGMEM = {

View File

@ -1,5 +1,4 @@
// We need this header file to use FLASH as storage with PROGMEM directive:
#include <pgmspace.h>
// Icon width and height
const uint16_t alertWidth = 32;

View File

@ -9,7 +9,6 @@
Paste the array into a new tabe, top and tail the array from the
tool to look like the one below with:
#include <pgmspace.h>
const uint8_t name[] PROGMEM = {
to start and and end with:
@ -22,7 +21,6 @@
*/
#include <pgmspace.h>
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,

View File

@ -1,7 +1,6 @@
#define SCLERA_WIDTH 200
#define SCLERA_HEIGHT 200
#include <pgmspace.h>
const uint16_t sclera[SCLERA_HEIGHT * SCLERA_WIDTH] PROGMEM= {
0X6901, 0X6901, 0X6901, 0X6901, 0X6901, 0X6901, 0X6901, 0X6901,

View File

@ -1,7 +1,6 @@
#define SCLERA_WIDTH 160
#define SCLERA_HEIGHT 160
#include <pgmspace.h>
const uint16_t sclera[SCLERA_HEIGHT*SCLERA_WIDTH] PROGMEM= {
0X0000, 0X0000, 0X0000, 0X0000, 0X0000, 0X0000, 0X0000, 0X0000,

View File

@ -1,7 +1,6 @@
#define SCLERA_WIDTH 128
#define SCLERA_HEIGHT 128
#include <pgmspace.h>
const uint16_t sclera[SCLERA_HEIGHT * SCLERA_WIDTH] PROGMEM= {
0X0000, 0X0000, 0X0000, 0X0000, 0X0000, 0X0000, 0X0000, 0X0000,

View File

@ -1,7 +1,6 @@
#define SCLERA_WIDTH 160
#define SCLERA_HEIGHT 160
#include <pgmspace.h>
const uint16_t sclera[SCLERA_HEIGHT * SCLERA_WIDTH] PROGMEM= {
0X0000, 0X0000, 0X0000, 0X0000, 0X0000, 0X0000, 0X0000, 0X0000,

View File

@ -1,5 +1,4 @@
// We need this header file to use FLASH as storage with PROGMEM directive:
#include <pgmspace.h>
// Icon width and height
const uint16_t alertWidth = 32;

View File

@ -1,5 +1,4 @@
// We need this header file to use FLASH as storage with PROGMEM directive:
#include <pgmspace.h>
// Icon width and height
const uint16_t closeWidth = 32;

View File

@ -1,5 +1,4 @@
// We need this header file to use FLASH as storage with PROGMEM directive:
#include <pgmspace.h>
// Icon width and height
const uint16_t infoWidth = 32;

View File

@ -11,8 +11,6 @@
// Example of the correct format is shown below
#include <pgmspace.h> // PROGMEM support header
// Espressif logo 50 x 50 pixel array in XBM format
#define logoWidth 50 // logo width
#define logoHeight 50 // logo height

View File

@ -5,7 +5,6 @@
Paste the byte array into a sketch tab and add two lines
at the start with a unique font name:
#include <pgmspace.h>
const uint8_t fontName[] PROGMEM = {
At the end add:
@ -17,7 +16,6 @@
#include "NotoSansBold15.h"
*/
#include <pgmspace.h>
const uint8_t NotoSansBold15[] PROGMEM = {
0x00, 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00,

View File

@ -5,7 +5,6 @@
Paste the byte array into a sketch tab and add two lines
at the start with a unique font name:
#include <pgmspace.h>
const uint8_t fontName[] PROGMEM = {
At the end add:
@ -17,7 +16,6 @@
#include "NotoSansBold36.h"
*/
#include <pgmspace.h>
const uint8_t NotoSansBold36[] PROGMEM = {
0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00,

View File

@ -5,7 +5,6 @@
Paste the byte array into a sketch tab and add two lines
at the start with a unique font name:
#include <pgmspace.h>
const uint8_t fontName[] PROGMEM = {
At the end add:
@ -17,7 +16,6 @@
#include "NotoSansBold15.h"
*/
#include <pgmspace.h>
const uint8_t NotoSansBold15[] PROGMEM = {
0x00, 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00,

View File

@ -5,7 +5,6 @@
Paste the byte array into a sketch tab and add two lines
at the start with a unique font name:
#include <pgmspace.h>
const uint8_t fontName[] PROGMEM = {
At the end add:
@ -17,7 +16,6 @@
#include "NotoSansBold36.h"
*/
#include <pgmspace.h>
const uint8_t NotoSansBold36[] PROGMEM = {
0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00,

View File

@ -5,7 +5,6 @@
Paste the byte array into a sketch tab and add two lines
at the start with a unique font name:
#include <pgmspace.h>
const uint8_t fontName[] PROGMEM = {
At the end add:
@ -17,7 +16,6 @@
#include "NotoSansBold15.h"
*/
#include <pgmspace.h>
const uint8_t NotoSansBold15[] PROGMEM = {
0x00, 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00,

View File

@ -5,7 +5,6 @@
Paste the byte array into a sketch tab and add two lines
at the start with a unique font name:
#include <pgmspace.h>
const uint8_t fontName[] PROGMEM = {
At the end add:
@ -17,7 +16,6 @@
#include "NotoSansBold36.h"
*/
#include <pgmspace.h>
const uint8_t NotoSansBold36[] PROGMEM = {
0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00,

View File

@ -5,7 +5,6 @@
Paste the byte array into a sketch tab and add two lines
at the start with a unique font name:
#include <pgmspace.h>
const uint8_t fontName[] PROGMEM = {
At the end add:
@ -17,7 +16,6 @@
#include "NotoSansMonoSCB20.h"
*/
#include <pgmspace.h>
const uint8_t NotoSansMonoSCB20[] PROGMEM = {
0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00,

View File

@ -5,7 +5,6 @@
Paste the byte array into a sketch tab and add two lines
at the start with a unique font name:
#include <pgmspace.h>
const uint8_t fontName[] PROGMEM = {
At the end add:
@ -17,7 +16,6 @@
#include "NotoSansBold15.h"
*/
#include <pgmspace.h>
const uint8_t NotoSansBold15[] PROGMEM = {
0x00, 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00,

View File

@ -5,7 +5,6 @@
Paste the byte array into a sketch tab and add two lines
at the start with a unique font name:
#include <pgmspace.h>
const uint8_t fontName[] PROGMEM = {
At the end add:
@ -17,7 +16,6 @@
#include "NotoSansBold36.h"
*/
#include <pgmspace.h>
const uint8_t NotoSansBold36[] PROGMEM = {
0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00,

View File

@ -5,7 +5,6 @@
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 <pgmspace.h>
const uint8_t fontName[] PROGMEM = {
Insert byte array here
@ -17,7 +16,6 @@
#include "fontName.h"
*/
#include <pgmspace.h>
const uint8_t Final_Frontier_28[] PROGMEM = {
0x00, 0x00, 0x00, 0x5A, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x00,

View File

@ -5,7 +5,6 @@
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 <pgmspace.h>
const uint8_t fontName[] PROGMEM = {
Insert byte array here
@ -17,7 +16,6 @@
#include "fontName.h"
*/
#include <pgmspace.h>
const uint8_t NotoSansBold15[] PROGMEM = {
0x00, 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00,

View File

@ -5,7 +5,6 @@
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 <pgmspace.h>
const uint8_t fontName[] PROGMEM = {
Insert byte array here
@ -17,7 +16,6 @@
#include "fontName.h"
*/
#include <pgmspace.h>
const uint8_t NotoSansBold36[] PROGMEM = {
0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00,

View File

@ -5,7 +5,6 @@
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 <pgmspace.h>
const uint8_t fontName[] PROGMEM = {
Insert byte array here
@ -17,7 +16,6 @@
#include "fontName.h"
*/
#include <pgmspace.h>
const uint8_t NotoSansBold15[] PROGMEM = {
0x00, 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00,

View File

@ -5,7 +5,6 @@
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 <pgmspace.h>
const uint8_t fontName[] PROGMEM = {
Insert byte array here
@ -17,7 +16,6 @@
#include "fontName.h"
*/
#include <pgmspace.h>
const uint8_t NotoSansBold36[] PROGMEM = {
0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00,

View File

@ -5,7 +5,6 @@
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 <pgmspace.h>
const uint8_t fontName[] PROGMEM = {
Insert byte array here
@ -17,7 +16,6 @@
#include "fontName.h"
*/
#include <pgmspace.h>
const uint8_t Final_Frontier_28[] PROGMEM = {
0x00, 0x00, 0x00, 0x5A, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x00,

View File

@ -5,7 +5,6 @@
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 <pgmspace.h>
const uint8_t fontName[] PROGMEM = {
Insert byte array here
@ -17,7 +16,6 @@
#include "fontName.h"
*/
#include <pgmspace.h>
const uint8_t Latin_Hiragana_24[] PROGMEM = {
0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00,

View File

@ -5,7 +5,6 @@
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 <pgmspace.h>
const uint8_t fontName[] PROGMEM = {
Insert byte array here
@ -17,7 +16,6 @@
#include "fontName.h"
*/
#include <pgmspace.h>
const uint8_t Unicode_Test_72[] PROGMEM = {
0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x00,

View File

@ -5,7 +5,6 @@
Paste the byte array into a sketch tab and add two lines
at the start with a unique font name:
#include <pgmspace.h>
const uint8_t fontName[] PROGMEM = {
At the end add:
@ -17,7 +16,6 @@
#include "NotoSansBold36.h"
*/
#include <pgmspace.h>
// 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,

View File

@ -5,7 +5,6 @@
Paste the byte array into a sketch tab "jpeg_name" and add
two lines at the start with a unique array name:
#include <pgmspace.h>
const uint8_t jpeg_name[] PROGMEM = {
At the end add:
@ -17,7 +16,6 @@
#include "jpeg_name.h"
*/
#include <pgmspace.h>
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,