From 80eb0e84683163f280a0ddc1d8fde07ca35f17c8 Mon Sep 17 00:00:00 2001 From: lovyan03 <42724151+lovyan03@users.noreply.github.com> Date: Mon, 9 Jan 2023 13:41:35 +0900 Subject: [PATCH] raising version 1.1.2 --- README.md | 25 ++++++++++--------- library.json | 2 +- library.properties | 2 +- src/LovyanGFX.hpp | 50 ++++++++++++++++--------------------- src/lgfx/v1/gitTagVersion.h | 2 +- 5 files changed, 38 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index aa489559..693026c3 100644 --- a/README.md +++ b/README.md @@ -44,16 +44,16 @@ This library has the following advantages. - Composite video signal (NTSC, PAL) output (only ESP32) -| | SPI | I2C | 8bit Para |16bit Para | CVBS | -|:------:|:---:|:---:|:---------:|:---------:|:-----:| -|ESP32 | HW | HW | HW (I2S) | --- |HW(I2S)| -|ESP32-S2| HW | HW | HW (I2S) | HW (I2S) | --- | -|ESP32-S3| HW | HW |HW(LCD/CAM)|HW(LCD/CAM)| --- | -|ESP32-C3| HW | HW | SW | --- | --- | -|ESP8266 | HW | SW | --- | --- | --- | -|SAMD51 | HW | HW | --- | --- | --- | -|SAMD21 | HW | HW | --- | --- | --- | -|RP2040 | HW | --- | --- | --- | --- | +| | SPI | I2C | 8bit Para |16bit Para | RGB | CVBS | +|:------:|:---:|:---:|:---------:|:---------:|:---------:|:--------:| +|ESP32 | HW | HW | HW (I2S) | --- | --- |HW(I2SDAC)| +|ESP32-S2| HW | HW | HW (I2S) | HW (I2S) | --- | --- | +|ESP32-S3| HW | HW |HW(LCD/CAM)|HW(LCD/CAM)|HW(LCD/CAM)| --- | +|ESP32-C3| HW | HW | SW | --- | --- | --- | +|ESP8266 | HW | SW | --- | --- | --- | --- | +|SAMD51 | HW | HW | --- | --- | --- | --- | +|SAMD21 | HW | HW | --- | --- | --- | --- | +|RP2040 | HW | --- | --- | --- | --- | --- | ※ HW = HardWare Peripheral / SW = SoftWare implementation @@ -79,6 +79,7 @@ This library has the following advantages. - ILI9486 - ILI9488 (Makerfabs Touch with Camera) - IT8951 (M5Paper) + - NT35510/OTM8009A - R61529 - RA8875 - RM68120 @@ -544,7 +545,7 @@ TomThumb font : [3-clause BSD](src/lgfx/Fonts/GFXFF/TomThumb.h) Brian J. Swetlan 実装予定 Unimplemented request ---------------- - ディスプレイ Displays - - OTM8009A / NT35510 - SEPS525 - + - LT7680A / LT7685 + - RA8873 / RA8876 diff --git a/library.json b/library.json index 10839db2..67cac662 100644 --- a/library.json +++ b/library.json @@ -11,7 +11,7 @@ "type": "git", "url": "https://github.com/lovyan03/LovyanGFX.git" }, - "version": "0.5.0", + "version": "1.1.2", "frameworks": ["arduino", "espidf"], "platforms": ["espressif32", "espressif8266", "atmelsam"], "headers": "LovyanGFX.hpp", diff --git a/library.properties b/library.properties index 473f705c..a2ee0225 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=LovyanGFX -version=0.5.0 +version=1.1.2 author=lovyan03 maintainer=lovyan03 sentence=TFT LCD Graphics driver with touch for ESP32, ESP8266, SAMD21, SAMD51, RP2040 diff --git a/src/LovyanGFX.hpp b/src/LovyanGFX.hpp index f1402f69..d6a04897 100644 --- a/src/LovyanGFX.hpp +++ b/src/LovyanGFX.hpp @@ -1,23 +1,19 @@ /*----------------------------------------------------------------------------/ Lovyan GFX library - LCD graphics library . - - support platform: - ESP32 (SPI/I2S) with Arduino/ESP-IDF - ATSAMD51 (SPI) with Arduino - -Original Source: - https://github.com/lovyan03/LovyanGFX/ - -Licence: - [BSD](https://github.com/lovyan03/LovyanGFX/blob/master/license.txt) - -Author: - [lovyan03](https://twitter.com/lovyan03) - -Contributors: - [ciniml](https://github.com/ciniml) - [mongonta0716](https://github.com/mongonta0716) - [tobozo](https://github.com/tobozo) + +Original Source: + https://github.com/lovyan03/LovyanGFX/ + +Licence: + [BSD](https://github.com/lovyan03/LovyanGFX/blob/master/license.txt) + +Author: + [lovyan03](https://twitter.com/lovyan03) + +Contributors: + [ciniml](https://github.com/ciniml) + [mongonta0716](https://github.com/mongonta0716) + [tobozo](https://github.com/tobozo) /----------------------------------------------------------------------------*/ #ifndef LOVYANGFX_HPP_ #define LOVYANGFX_HPP_ @@ -26,22 +22,20 @@ Original Source: #undef setFont #endif -#if __has_include("lgfx/v1_init.hpp") && ( defined ( LGFX_USE_V1 ) || !__has_include("lgfx/v0_init.hpp") ) + #if defined ( LGFX_USE_V0 ) && __has_include("lgfx/v0_init.hpp") + + #include "lgfx/v0_init.hpp" - #include "lgfx/v1_init.hpp" + #else - #if defined ( LGFX_AUTODETECT ) + #include "lgfx/v1_init.hpp" - #include "LGFX_AUTODETECT.hpp" + #if defined ( LGFX_AUTODETECT ) - #endif + #include "LGFX_AUTODETECT.hpp" -#else // if defined ( LGFX_USE_V0 ) + #endif - #if __has_include("lgfx/v0_init.hpp") - #include "lgfx/v0_init.hpp" #endif #endif - -#endif diff --git a/src/lgfx/v1/gitTagVersion.h b/src/lgfx/v1/gitTagVersion.h index 6f9b7af2..ad7a4467 100644 --- a/src/lgfx/v1/gitTagVersion.h +++ b/src/lgfx/v1/gitTagVersion.h @@ -1,4 +1,4 @@ #define LGFX_VERSION_MAJOR 1 #define LGFX_VERSION_MINOR 1 -#define LGFX_VERSION_PATCH 0 +#define LGFX_VERSION_PATCH 2 #define LOVYANGFX_VERSION F( LGFX_VERSION_MAJOR "." LGFX_VERSION_MINOR "." LGFX_VERSION_PATCH )