Skip to content

Commit

Permalink
raising version 1.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
lovyan03 committed Jan 9, 2023
1 parent caac1e2 commit 80eb0e8
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 43 deletions.
25 changes: 13 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -79,6 +79,7 @@ This library has the following advantages.
- ILI9486
- ILI9488 (Makerfabs Touch with Camera)
- IT8951 (M5Paper)
- NT35510/OTM8009A
- R61529
- RA8875
- RM68120
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion library.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
50 changes: 22 additions & 28 deletions src/LovyanGFX.hpp
Original file line number Diff line number Diff line change
@@ -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_
Expand All @@ -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
2 changes: 1 addition & 1 deletion src/lgfx/v1/gitTagVersion.h
Original file line number Diff line number Diff line change
@@ -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 )

0 comments on commit 80eb0e8

Please sign in to comment.