From 20ba78ea523ebfd1e3d8a5dfc61dbd1ce73bd83f Mon Sep 17 00:00:00 2001 From: fsender Date: Tue, 11 Mar 2025 18:36:59 +0800 Subject: [PATCH] 1.4.2: fix build for arduino-esp32 3.x --- CHANGELOG.md | 7 +++++++ CMakeLists.txt | 46 ++++++++++++++++++++++++++++++++++++++++++++++ README.md | 6 +++--- library.json | 2 +- library.properties | 2 +- src/guy_version.h | 6 +++--- 6 files changed, 61 insertions(+), 8 deletions(-) create mode 100644 CMakeLists.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index dcf1709..f2c9e81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +1.4.2 +## Release 1.4.2 - 2025/3/11 + +1. 现在程序可以在Arduino-ESP32的版本高于3.0.0的Arduino集成环境和ESP-IDF (仍需依赖Arduino component, 但不依赖PlatformIO) 中编译成功 + +2. 示例程序中添加了更多的说明文本 + ## Release 1.4.1 - 2024/12/2 1. 紧急修复了在禁用 `DYNAMIC_PIN_SETTINGS` 之后点不亮屏幕的bug diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..8a13961 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,46 @@ +# Esp-idf component requires this file. +# Even Arduino IDE will ignore it. +file(GLOB READGUY_SRCS + src/*.cpp + src/guy_epaper/*.cpp + src/guy_epaper/guy_154a_290a/*.cpp + src/guy_epaper/guy_154b_270b_290b/*.cpp + src/guy_epaper/guy_154C/*.cpp + src/guy_epaper/guy_213a/*.cpp + src/guy_epaper/guy_213b_266a/*.cpp + src/guy_epaper/guy_370a/*.cpp + src/guy_epaper/guy_370B/*.cpp + src/guy_epaper/guy_420a/*.cpp + src/guy_epaper/guy_420b/*.cpp + src/guy_epaper/guy_426A/*.cpp + src/guy_epaper/guy_583A/*.cpp + src/guy_epaper/guy_583B/*.cpp + src/guy_epaper/guy_750A/*.cpp + src/guy_epaper/guy_1020A/*.cpp + src/guy_epaper/lcdDebug/*.cpp +) +set(READGUY_DIRS + src + src/guy_epaper + src/guy_epaper/guy_154a_290a + src/guy_epaper/guy_154b_270b_290b + src/guy_epaper/guy_154C + src/guy_epaper/guy_213a + src/guy_epaper/guy_213b_266a + src/guy_epaper/guy_370a + src/guy_epaper/guy_370B + src/guy_epaper/guy_420a + src/guy_epaper/guy_420b + src/guy_epaper/guy_426A + src/guy_epaper/guy_583A + src/guy_epaper/guy_583B + src/guy_epaper/guy_750A + src/guy_epaper/guy_1020A + src/guy_epaper/lcdDebug + ../arduino-esp32/libraries/HTTPUpdateServer/src +) +idf_component_register(SRCS ${READGUY_SRCS} + INCLUDE_DIRS "." ${READGUY_DIRS} + REQUIRES arduino-esp32 LovyanGFX spi_flash + ) +#spi flash for read chip \ No newline at end of file diff --git a/README.md b/README.md index c485a78..c6f91a5 100644 --- a/README.md +++ b/README.md @@ -4,17 +4,17 @@ -**版本1.4.1正式发布！欢迎分享、star和fork~** 上面的图是项目看板娘, 盖. 可爱的盖姐在等你哟~ +**版本1.4.2正式发布！欢迎分享、star和fork~** 上面的图是项目看板娘, 盖. 可爱的盖姐在等你哟~ **即将发布7个全新的屏幕驱动: 欢迎支持! (详见后面的驱动表格)** 欢迎克隆, 项目交流QQ群: 926824162 (萌新可以进来问问题的哟), 项目的 Bilibili 主页: [BV1f94y187wz](https://www.bilibili.com/video/BV1f94y187wz/) 记得三连+关注我这个宝藏up主哦~ -注意, 有问题一定要先加群问, 先不要提issue, 提了小影 *(也就是作者FriendshipEnder)* 也不会看的. +注意, 有问题一定要先加群问, 先不要提issue, 提了作者 FriendshipEnder 也不会看的. **依赖的库: [LovyanGFX](https://github.com/lovyan03/LovyanGFX)** -*依赖的环境: Arduino-ESP8266 或者 Arduino-ESP32.* +*依赖的环境: Arduino-ESP8266 或者 Arduino-ESP32. 现已支持使用最新版本的Arduino-ESP32库(2.x和3.x)编译!* ## 在**所有**受支持屏幕上都显示**16级灰度**内容！ diff --git a/library.json b/library.json index 533dbb9..bad2901 100644 --- a/library.json +++ b/library.json @@ -11,7 +11,7 @@ "type": "git", "url": "https://github.com/fsender/readguy" }, - "version": "1.4.1", + "version": "1.4.2", "frameworks": "arduino", "platforms": ["espressif32", "espressif8266"], "headers": "readguy.h", diff --git a/library.properties b/library.properties index 8d689e3..0688e0a 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=readguy -version=1.4.1 +version=1.4.2 author=fsender maintainer=fsender sentence=A free E-paper display driver library supports 16-level greyscale. diff --git a/src/guy_version.h b/src/guy_version.h index 987431f..541c8d4 100644 --- a/src/guy_version.h +++ b/src/guy_version.h @@ -6,7 +6,7 @@ * @file guy_version.h * @author FriendshipEnder (f_ender@163.com), Bilibili: FriendshipEnder * @brief readguy 版本控制文件. - * @version 1.3.2 + * @version 1.4.2 * @date 2023-09-21 * @attention @@ -41,9 +41,9 @@ //另外, 在提交新版本之前, 不要忘记在github上创建release, 否则Arduino IDE会读不到 #define READGUY_V_MAJOR 1 #define READGUY_V_MINOR 4 -#define READGUY_V_PATCH 1 +#define READGUY_V_PATCH 2 #define READGUY_VERSION_VAL (READGUY_V_MAJOR*1000+READGUY_V_MINOR*100+READGUY_V_PATCH*10) -#define READGUY_VERSION "1.4.1" +#define READGUY_VERSION "1.4.2" #ifdef ESP8266 #define _READGUY_PLATFORM "ESP8266"