diff --git a/Coverage.md b/Coverage.md index 28db7a2..61443e9 100644 --- a/Coverage.md +++ b/Coverage.md @@ -3,17 +3,17 @@ Test of the examples -*General examples target rp2040:rp2040:rpipico* +* General examples target rp2040:rp2040:rpipico -*EXT4 examples target SiliconLabs:silabs:nano_matter* +* EXT4 examples target SiliconLabs:silabs:nano_matter -*File examples target teensy:avr:teensy36* +* File examples target teensy:avr:teensy36 -*Font16 examples target rp2040:rp2040:rpipico2* +* Font16 examples target rp2040:rp2040:rpipico2 -Report generated 2026-08-04 20:05:19 +Report generated 2026-09-10 18:22:15 -Version: 10.0.9 +Version: 10.1.0 Example |Board | Result --- | --- | --- @@ -40,7 +40,6 @@ EXT4_Matter_RGB.ino | SiliconLabs:silabs:nano_matter | OK EXT4_WS2813C.ino | SiliconLabs:silabs:nano_matter | OK EXT4_LargeFont.ino | SiliconLabs:silabs:nano_matter | OK EXT4_ScreenSizes.ino | SiliconLabs:silabs:nano_matter | OK -EXT4_NFC.ino | SiliconLabs:silabs:nano_matter | OK EXT4_Weather.ino | SiliconLabs:silabs:nano_matter | OK EXT4_WhoAmI.ino | SiliconLabs:silabs:nano_matter | OK EXT4_Accelerometer.ino | SiliconLabs:silabs:nano_matter | OK @@ -50,6 +49,6 @@ Touch_TicTacToe.ino | rp2040:rp2040:rpipico | OK --- -Report completed 2026-08-04 20:09:17 +Report completed 2026-09-10 18:24:48 -. Elapsed time 238 seconds +. Elapsed time 153 seconds diff --git a/src/PDLS_Basic.h b/src/PDLS_Basic.h index 6df668c..4fbaf0c 100755 --- a/src/PDLS_Basic.h +++ b/src/PDLS_Basic.h @@ -1,12 +1,12 @@ /// /// @file PDLS_Basic.h -/// @brief Driver for Pervasive Displays screens, extension boards and development kits +/// @brief Text and graphics primitives for Pervasive Displays screens, extension boards and development kits /// /// @details Project Pervasive Displays Library Suite /// @n Based on highView technology /// -/// @date 21 Aug 2026 -/// @version 1009 +/// @date 21 Sep 2026 +/// @version 1010 /// /// @copyright (c) Pervasive Displays Inc., 2021-2026 /// @copyright (c) Etigues, 2010-2026 @@ -35,8 +35,8 @@ // SDK and configuration #include "PDLS_Common.h" -#if (PDLS_COMMON_RELEASE < 1004) -#error Required PDLS_COMMON_RELEASE 1004 +#if (PDLS_COMMON_RELEASE < 1009) +#error Required PDLS_COMMON_RELEASE 1009 #endif // PDLS_COMMON_RELEASE #ifndef EDITION_BASIC @@ -47,7 +47,7 @@ /// /// @brief Library release number /// -#define PDLS_BASIC_RELEASE 1009 +#define PDLS_BASIC_RELEASE 1010 #include "Screen_EPD.h" diff --git a/src/Screen_EPD.cpp b/src/Screen_EPD.cpp index 52b3686..a068816 100755 --- a/src/Screen_EPD.cpp +++ b/src/Screen_EPD.cpp @@ -261,44 +261,39 @@ void Screen_EPD::begin() // v_touchTrim = 0x00; // no touch v_touchEvent = false; // no touch event - - v_touchTrim = 0x10; // standard threshold - v_touchEvent = true; - - // v_touchXmax and v_touchYmax hard-coded v_touchXmin = 0; v_touchYmin = 0; - // if ((SCREEN_EXTRA(s_driver->u_eScreen_EPD) & EXTRA_TOUCH) != EXTRA_TOUCH) - // { - // hV_HAL_Serial_crlf(); - // hV_HAL_log(LEVEL_CRITICAL, "Screen %i-%cS-0%c does not have touch", u_codeSize, u_codeFilm, u_codeDriver); - // hV_HAL_exit(RESULT_ERROR); - // } - - switch (SCREEN_SIZE(s_driver->u_eScreen_EPD)) + if ((u_codeExtra & EXTRA_TOUCH) == EXTRA_TOUCH) { - case SIZE_271: + v_touchTrim = 0x10; // standard threshold + v_touchEvent = true; - v_touchXmax = 176; // Xmax - v_touchYmax = 264; // Ymax - break; + switch (SCREEN_SIZE(s_driver->u_eScreen_EPD)) + { + case SIZE_271: + + v_touchXmax = 176; // Xmax + v_touchYmax = 264; // Ymax + break; - case SIZE_343: + case SIZE_343: - v_touchXmax = 455; // Xmax, hardware hard-coded in controller - v_touchYmax = 391; // Ymax, hardware hard-coded in controller - break; + v_touchXmax = 455; // Xmax, hardware hard-coded in controller + v_touchYmax = 391; // Ymax, hardware hard-coded in controller + break; - case SIZE_370: + case SIZE_370: - v_touchXmax = 239; // Xmax, hardware hard-coded in controller - v_touchYmax = 415; // Ymax, hardware hard-coded in controller - break; + v_touchXmax = 239; // Xmax, hardware hard-coded in controller + v_touchYmax = 415; // Ymax, hardware hard-coded in controller + break; - default: + default: - break; + hV_HAL_log(LEVEL_CRITICAL, "Screen %i-%cS-0%c touch size is not supported", u_codeSize, u_codeFilm, u_codeDriver); + break; + } } // // === End of Touch section