From bf601f3989901118271a6636b1792defb92725e4 Mon Sep 17 00:00:00 2001 From: Rei Vilo Date: Sun, 19 Feb 2023 14:59:36 +0100 Subject: [PATCH] Improved screens names consistency --- examples/Basic_Touch_Draw/Basic_Touch_Draw.ino | 4 ++-- examples/Basic_Touch_GUI/Basic_Touch_GUI.ino | 4 ++-- .../Basic_Touch_TicTacToe.ino | 4 ++-- src/hV_Configuration.h | 14 ++++++++++---- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/examples/Basic_Touch_Draw/Basic_Touch_Draw.ino b/examples/Basic_Touch_Draw/Basic_Touch_Draw.ino index 59a71e5..f3722e4 100755 --- a/examples/Basic_Touch_Draw/Basic_Touch_Draw.ino +++ b/examples/Basic_Touch_Draw/Basic_Touch_Draw.ino @@ -37,8 +37,8 @@ // --- Touch #include "PDLS_EXT3_Basic_Touch.h" -// Screen_EPD_EXT3_Fast myScreen(eScreen_EPD_EXT3_270_Touch, boardRaspberryPiPico_RP2040); -Screen_EPD_EXT3_Fast myScreen(eScreen_EPD_EXT3_370_Touch, boardRaspberryPiPico_RP2040); +// Screen_EPD_EXT3_Fast myScreen(eScreen_EPD_EXT3_271_09_Touch, boardRaspberryPiPico_RP2040); +Screen_EPD_EXT3_Fast myScreen(eScreen_EPD_EXT3_370_0C_Touch, boardRaspberryPiPico_RP2040); // Prototypes diff --git a/examples/Basic_Touch_GUI/Basic_Touch_GUI.ino b/examples/Basic_Touch_GUI/Basic_Touch_GUI.ino index a1c8257..24f1049 100755 --- a/examples/Basic_Touch_GUI/Basic_Touch_GUI.ino +++ b/examples/Basic_Touch_GUI/Basic_Touch_GUI.ino @@ -43,8 +43,8 @@ // Define structures and classes // Define variables and constants -// Screen_EPD_EXT3_Fast myScreen(eScreen_EPD_EXT3_270_Touch, boardRaspberryPiPico_RP2040); -Screen_EPD_EXT3_Fast myScreen(eScreen_EPD_EXT3_370_Touch, boardRaspberryPiPico_RP2040); +// Screen_EPD_EXT3_Fast myScreen(eScreen_EPD_EXT3_271_09_Touch, boardRaspberryPiPico_RP2040); +Screen_EPD_EXT3_Fast myScreen(eScreen_EPD_EXT3_370_0C_Touch, boardRaspberryPiPico_RP2040); uint8_t fontText; diff --git a/examples/Basic_Touch_TicTacToe/Basic_Touch_TicTacToe.ino b/examples/Basic_Touch_TicTacToe/Basic_Touch_TicTacToe.ino index 5319d0e..d06073c 100755 --- a/examples/Basic_Touch_TicTacToe/Basic_Touch_TicTacToe.ino +++ b/examples/Basic_Touch_TicTacToe/Basic_Touch_TicTacToe.ino @@ -41,8 +41,8 @@ // --- Touch #include "PDLS_EXT3_Basic_Touch.h" -// Screen_EPD_EXT3_Fast myScreen(eScreen_EPD_EXT3_270_Touch, boardRaspberryPiPico_RP2040); -Screen_EPD_EXT3_Fast myScreen(eScreen_EPD_EXT3_370_Touch, boardRaspberryPiPico_RP2040); +// Screen_EPD_EXT3_Fast myScreen(eScreen_EPD_EXT3_271_09_Touch, boardRaspberryPiPico_RP2040); +Screen_EPD_EXT3_Fast myScreen(eScreen_EPD_EXT3_370_0C_Touch, boardRaspberryPiPico_RP2040); uint16_t x, y, dx, dy; diff --git a/src/hV_Configuration.h b/src/hV_Configuration.h index 50fcc84..da53675 100755 --- a/src/hV_Configuration.h +++ b/src/hV_Configuration.h @@ -86,17 +86,21 @@ /// * Monochrome touch screens with embedded fast update /// @see https://www.pervasivedisplays.com/products/?_sft_etc_itc=tp /// -#define eScreen_EPD_EXT3_270_Touch (uint32_t)0x032709 ///< reference xTP270PGH0x -#define eScreen_EPD_EXT3_271_Touch (uint32_t)0x032709 ///< reference xTP271PGH0x -#define eScreen_EPD_EXT3_370_Touch (uint32_t)0x03370C ///< reference xTP370PGH0x +#define eScreen_EPD_EXT3_270_09_Touch (uint32_t)0x032709 ///< reference xTP270PGH0x +#define eScreen_EPD_EXT3_271_09_Touch (uint32_t)0x032709 ///< reference xTP271PGH0x +#define eScreen_EPD_EXT3_370_0C_Touch (uint32_t)0x03370C ///< reference xTP370PGH0x +#define eScreen_EPD_EXT3_270_Touch (uint32_t)0x032709 ///< reference xTP270PGH0x, legacy name +#define eScreen_EPD_EXT3_271_Touch (uint32_t)0x032709 ///< reference xTP271PGH0x, legacy name +#define eScreen_EPD_EXT3_370_Touch (uint32_t)0x03370C ///< reference xTP370PGH0x, legacy name /// * Monochrome screens with embedded fast update, fast and partial update /// @see https://www.pervasivedisplays.com/products/?_sft_etc_itc=pu /// -#define eScreen_EPD_EXT3_154_0C_Fast (uint32_t)0x01150C ///< reference xE2154PS0Cx +#define eScreen_EPD_EXT3_154_0C_Fast (uint32_t)0x01150C ///< reference xE2154PS0Cx #define eScreen_EPD_EXT3_213_0E_Fast (uint32_t)0x01210E ///< reference xE2213PS0Ex #define eScreen_EPD_EXT3_266_0C_Fast (uint32_t)0x01260C ///< reference xE2266PS0Cx, not tested #define eScreen_EPD_EXT3_271_09_Fast (uint32_t)0x012709 ///< reference xE2271PS09x +#define eScreen_EPD_EXT3_270_09_Fast (uint32_t)0x012709 ///< reference xE2271PS09x, legacy name #define eScreen_EPD_EXT3_287_09_Fast (uint32_t)0x012809 ///< reference xE2287PS09x #define eScreen_EPD_EXT3_370_0C_Fast (uint32_t)0x01370C ///< reference xE2370PS0Cx #define eScreen_EPD_EXT3_417_0D_Fast (uint32_t)0x01410D ///< reference xE2417PS0Dx, not tested @@ -115,6 +119,7 @@ #define frameSize_EPD_EXT3_154 (uint32_t)(5776) #define frameSize_EPD_EXT3_213 (uint32_t)(5512) #define frameSize_EPD_EXT3_266 (uint32_t)(11248) +#define frameSize_EPD_EXT3_270 (uint32_t)(11616) ///< legacy name #define frameSize_EPD_EXT3_271 (uint32_t)(11616) #define frameSize_EPD_EXT3_287 (uint32_t)(9472) #define frameSize_EPD_EXT3_370 (uint32_t)(24960) @@ -303,6 +308,7 @@ const pins_t boardCC1352 = /// /// @brief Raspberry Pi Zero, 2B, 3B, 4B configuration with RasPiArduino, tested +/// @warning Not recommended /// @see https://github.com/me-no-dev/RasPiArduino /// const pins_t boardRaspberryPiZeroB_RasPiArduino =