Merge pull request #358 from lovyan03/develop

1.1.5
lovyan03 · Feb 24, 2023 · 43f2165 · 43f2165
2 parents fa1e250 + 755064c
commit 43f2165
Show file tree

Hide file tree

Showing 53 changed files with 16,671 additions and 15,325 deletions.
diff --git a/.github/workflows/ArduinoBuild.yml b/.github/workflows/ArduinoBuild.yml
@@ -41,10 +41,11 @@ jobs:
           #- 2.0.0
           #- 2.0.1
           #- 2.0.2
-          - 2.0.3
+          #- 2.0.3
           - 2.0.4
           - 2.0.5
           - 2.0.6
+          - 2.0.7
 
         include:
           # 3D matrix doesn't apply to these:

diff --git a/.github/workflows/IDFBuild.yml b/.github/workflows/IDFBuild.yml
@@ -29,21 +29,27 @@ jobs:
           - [email protected]
           - [email protected]
           - [email protected]
-          - [email protected].1
-          - [email protected].1
+          - [email protected].4
+          - [email protected].4
           - [email protected]
           - [email protected]
           - [email protected]
+          - [email protected]
+          - [email protected]
+          - [email protected]
 
         include:
           - { esp-idf-fqbn: [email protected],         idf-board: esp32,   idf-version: v4.1 }
           - { esp-idf-fqbn: [email protected],         idf-board: esp32,   idf-version: v4.2 }
           - { esp-idf-fqbn: [email protected],       idf-board: esp32,   idf-version: v4.3.1 }
-          - { esp-idf-fqbn: [email protected].1,     idf-board: esp32s2, idf-version: v4.4.1 }
-          - { esp-idf-fqbn: [email protected].1,     idf-board: esp32s3, idf-version: v4.4.1 }
+          - { esp-idf-fqbn: [email protected].4,     idf-board: esp32s2, idf-version: v4.4.4 }
+          - { esp-idf-fqbn: [email protected].4,     idf-board: esp32s3, idf-version: v4.4.4 }
           - { esp-idf-fqbn: [email protected],   idf-board: esp32,   idf-version: v5.0 }
           - { esp-idf-fqbn: [email protected], idf-board: esp32s2, idf-version: v5.0 }
           - { esp-idf-fqbn: [email protected], idf-board: esp32s3, idf-version: v5.0 }
+          - { esp-idf-fqbn: [email protected],   idf-board: esp32,   idf-version: v5.0.1 }
+          - { esp-idf-fqbn: [email protected], idf-board: esp32s2, idf-version: v5.0.1 }
+          - { esp-idf-fqbn: [email protected], idf-board: esp32s3, idf-version: v5.0.1 }
 
 
       fail-fast: false

diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml
@@ -34,20 +34,16 @@ jobs:
 
         platform-version:
           - 1.0.6
-          - 2.0.0
-          - 2.0.1
-          - 2.0.2
-          - 2.0.3
+          - 2.0.4
+          - 2.0.5
+          - 2.0.6
+          - 2.0.7
           - default
 
         exclude:
           - { board: esp32-s3, platform-version: 1.0.6 }
-          - { board: esp32-s3, platform-version: 2.0.0 }
-          - { board: esp32-s3, platform-version: 2.0.1 }
-          - { board: esp32-s3, platform-version: 2.0.2 }
           - { board: esp32-s3, platform-version: default } # 2.0.5 => esp32s3/include/newlib/platform_include/assert.h:20:10: fatal error: sdkconfig.h: No such file or directory
           - { board: esp32-s2, platform-version: 1.0.6 }
-          - { board: esp32-s2, platform-version: 2.0.0 }
 
         include:
           - board: esp32
@@ -61,6 +57,7 @@ jobs:
           - { board: esp8266, platform-version: 3.2.0, ... }
           - { board: seeed_wio_terminal, platform-version: default, ... }
           - { board: adafruit_pybadge_m4, platform-version: default, ... }
+          - { board: pico, platform-version: default, ... }
 
       fail-fast: false
 

diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@
 sdkconfig*
 !sdkconfig.defaults
 build
-.vs
+.vs
+.DS_Store
diff --git a/README.md b/README.md
@@ -57,6 +57,16 @@ This library has the following advantages.
 
 ※ HW = HardWare Peripheral / SW = SoftWare implementation
 
+|        |TouchScreens|
+|:------:|:----------:|
+|ESP32   | supported  |
+|ESP32-S2| supported  |
+|ESP32-S3| supported  |
+|ESP32-C3| supported  |
+|ESP8266 | supported  |
+|SAMD51  | supported  |
+|SAMD21  | supported  |
+|RP2040  | ---        |
 
 対応環境 Supported environments
 ---------------
@@ -125,38 +135,45 @@ This library is also compatible with the above models and display panels with a
 // 対応機種がボードマネージャに無い場合 ( TTGO T-Wristband や ESP-WROVER-KIT等 ) は、
 // LovyanGFX.hppのincludeより前に、define LGFX_～ の定義を記述してください。
 
-// #define LGFX_M5STACK               // M5Stack (Basic / Gray / Go / Fire)
-// #define LGFX_M5STACK_CORE2         // M5Stack Core2
-// #define LGFX_M5STACK_COREINK       // M5Stack CoreInk
-// #define LGFX_M5STICK_C             // M5Stick C / CPlus
-// #define LGFX_M5PAPER               // M5Paper
-// #define LGFX_M5TOUGH               // M5Tough
-// #define LGFX_ODROID_GO             // ODROID-GO
-// #define LGFX_TTGO_TS               // TTGO TS
-// #define LGFX_TTGO_TWATCH           // TTGO T-Watch
-// #define LGFX_TTGO_TWRISTBAND       // TTGO T-Wristband
-// #define LGFX_TTGO_TDISPLAY         // TTGO T-Display
-// #define LGFX_DDUINO32_XS           // DSTIKE D-duino-32 XS
-// #define LGFX_LOLIN_D32_PRO         // LoLin D32 Pro
-// #define LGFX_ESP_WROVER_KIT        // ESP-WROVER-KIT
-// #define LGFX_WIFIBOY_PRO           // WiFiBoy Pro
-// #define LGFX_WIFIBOY_MINI          // WiFiBoy mini
-// #define LGFX_MAKERFABS_TOUCHCAMERA // Makerfabs Touch with Camera
-// #define LGFX_MAKERFABS_MAKEPYTHON  // Makerfabs MakePython
-// #define LGFX_WT32_SC01             // Seeed WT32-SC01
-// #define LGFX_WIO_TERMINAL          // Seeed Wio Terminal
-// #define LGFX_PYBADGE               // Adafruit PyBadge
-// #define LGFX_ESPBOY                // ESPboy
-
-  #define LGFX_AUTODETECT // 自動認識 (D-duino-32 XS, PyBadge はパネルID読取りが出来ないため自動認識の対象から外れています)
+// #define LGFX_M5STACK                       // M5Stack M5Stack Basic / Gray / Go / Fire
+// #define LGFX_M5STACK_CORE2                 // M5Stack M5Stack Core2
+// #define LGFX_M5STACK_COREINK               // M5Stack M5Stack CoreInk
+// #define LGFX_M5STICK_C                     // M5Stack M5Stick C / CPlus
+// #define LGFX_M5PAPER                       // M5Stack M5Paper
+// #define LGFX_M5TOUGH                       // M5Stack M5Tough
+// #define LGFX_M5ATOMS3                      // M5Stack M5ATOMS3
+// #define LGFX_ODROID_GO                     // ODROID-GO
+// #define LGFX_TTGO_TS                       // TTGO TS
+// #define LGFX_TTGO_TWATCH                   // TTGO T-Watch
+// #define LGFX_TTGO_TWRISTBAND               // TTGO T-Wristband
+// #define LGFX_TTGO_TDISPLAY                 // TTGO T-Display
+// #define LGFX_DDUINO32_XS                   // DSTIKE D-duino-32 XS
+// #define LGFX_LOLIN_D32_PRO                 // LoLin D32 Pro
+// #define LGFX_LOLIN_S3_PRO                  // LoLin S3 Pro
+// #define LGFX_ESP_WROVER_KIT                // Espressif ESP-WROVER-KIT
+// #define LGFX_ESP32_S3_BOX                  // Espressif ESP32-S3-BOX
+// #define LGFX_ESP32_S3_BOX_LITE             // Espressif ESP32-S3-BOX Lite
+// #define LGFX_WIFIBOY_PRO                   // WiFiBoy Pro
+// #define LGFX_WIFIBOY_MINI                  // WiFiBoy mini
+// #define LGFX_MAKERFABS_TOUCHCAMERA         // Makerfabs Touch with Camera
+// #define LGFX_MAKERFABS_MAKEPYTHON          // Makerfabs MakePython
+// #define LGFX_MAKERFABS_TFT_TOUCH_SPI       // Makerfabs TFT Touch SPI
+// #define LGFX_MAKERFABS_TFT_TOUCH_PARALLEL16// Makerfabs TFT Touch Parallel 16
+// #define LGFX_WT32_SC01                     // Seeed WT32-SC01
+// #define LGFX_WIO_TERMINAL                  // Seeed Wio Terminal
+// #define LGFX_PYBADGE                       // Adafruit PyBadge
+// #define LGFX_FUNHOUSE                      // Adafruit FunHouse
+// #define LGFX_FEATHER_ESP32_S2_TFT          // Adafruit Feather ESP32 S2 TFT
+// #define LGFX_FEATHER_ESP32_S3_TFT          // Adafruit Feather ESP32 S3 TFT
+// #define LGFX_ESPBOY                        // ESPboy
+// #define LGFX_WYWY_ESP32S3_HMI_DEVKIT       // wywy ESP32S3 HMI DevKit
+// #define LGFX_ESP32_2432S028                // Sunton ESP32 2432S028
+
+  #define LGFX_AUTODETECT // 自動認識 (D-duino-32 XS, WT32-SC01, PyBadge はパネルID読取りが出来ないため自動認識の対象から外れています)
 
 // 複数機種の定義を行うか、LGFX_AUTODETECTを定義することで、実行時にボードを自動認識します。
 
 
-// v1.0.0 を有効にします(v0からの移行期間の特別措置です。これを書かない場合は旧v0系で動作します。)
-#define LGFX_USE_V1
-
-
 // ヘッダをincludeします。
 #include <LovyanGFX.hpp>
 

diff --git a/examples/HowToUse/1_simple_use/1_simple_use.ino b/examples/HowToUse/1_simple_use/1_simple_use.ino
@@ -4,36 +4,45 @@
 // 対応機種がボードマネージャに無い場合 ( TTGO T-Wristband や ESP-WROVER-KIT等 ) は、
 // LovyanGFX.hppのincludeより前に、define LGFX_～ の定義を記述してください。
 
-// #define LGFX_M5STACK               // M5Stack (Basic / Gray / Go / Fire)
-// #define LGFX_M5STACK_CORE2         // M5Stack Core2
-// #define LGFX_M5STACK_COREINK       // M5Stack CoreInk
-// #define LGFX_M5STICK_C             // M5Stick C / CPlus
-// #define LGFX_M5PAPER               // M5Paper
-// #define LGFX_M5TOUGH               // M5Tough
-// #define LGFX_ODROID_GO             // ODROID-GO
-// #define LGFX_TTGO_TS               // TTGO TS
-// #define LGFX_TTGO_TWATCH           // TTGO T-Watch
-// #define LGFX_TTGO_TWRISTBAND       // TTGO T-Wristband
-// #define LGFX_TTGO_TDISPLAY         // TTGO T-Display
-// #define LGFX_DDUINO32_XS           // DSTIKE D-duino-32 XS
-// #define LGFX_LOLIN_D32_PRO         // LoLin D32 Pro
-// #define LGFX_ESP_WROVER_KIT        // ESP-WROVER-KIT
-// #define LGFX_WIFIBOY_PRO           // WiFiBoy Pro
-// #define LGFX_WIFIBOY_MINI          // WiFiBoy mini
-// #define LGFX_MAKERFABS_TOUCHCAMERA // Makerfabs Touch with Camera
-// #define LGFX_MAKERFABS_MAKEPYTHON  // Makerfabs MakePython
-// #define LGFX_WT32_SC01             // Seeed WT32-SC01
-// #define LGFX_WIO_TERMINAL          // Seeed Wio Terminal
-// #define LGFX_PYBADGE               // Adafruit PyBadge
-// #define LGFX_ESPBOY                // ESPboy
-
-  #define LGFX_AUTODETECT // 自動認識 (D-duino-32 XS, PyBadge はパネルID読取りが出来ないため自動認識の対象から外れています)
+// #define LGFX_M5STACK                       // M5Stack M5Stack Basic / Gray / Go / Fire
+// #define LGFX_M5STACK_CORE2                 // M5Stack M5Stack Core2
+// #define LGFX_M5STACK_COREINK               // M5Stack M5Stack CoreInk
+// #define LGFX_M5STICK_C                     // M5Stack M5Stick C / CPlus
+// #define LGFX_M5PAPER                       // M5Stack M5Paper
+// #define LGFX_M5TOUGH                       // M5Stack M5Tough
+// #define LGFX_M5ATOMS3                      // M5Stack M5ATOMS3
+// #define LGFX_ODROID_GO                     // ODROID-GO
+// #define LGFX_TTGO_TS                       // TTGO TS
+// #define LGFX_TTGO_TWATCH                   // TTGO T-Watch
+// #define LGFX_TTGO_TWRISTBAND               // TTGO T-Wristband
+// #define LGFX_TTGO_TDISPLAY                 // TTGO T-Display
+// #define LGFX_DDUINO32_XS                   // DSTIKE D-duino-32 XS
+// #define LGFX_LOLIN_D32_PRO                 // LoLin D32 Pro
+// #define LGFX_LOLIN_S3_PRO                  // LoLin S3 Pro
+// #define LGFX_ESP_WROVER_KIT                // Espressif ESP-WROVER-KIT
+// #define LGFX_ESP32_S3_BOX                  // Espressif ESP32-S3-BOX
+// #define LGFX_ESP32_S3_BOX_LITE             // Espressif ESP32-S3-BOX Lite
+// #define LGFX_WIFIBOY_PRO                   // WiFiBoy Pro
+// #define LGFX_WIFIBOY_MINI                  // WiFiBoy mini
+// #define LGFX_MAKERFABS_TOUCHCAMERA         // Makerfabs Touch with Camera
+// #define LGFX_MAKERFABS_MAKEPYTHON          // Makerfabs MakePython
+// #define LGFX_MAKERFABS_TFT_TOUCH_SPI       // Makerfabs TFT Touch SPI
+// #define LGFX_MAKERFABS_TFT_TOUCH_PARALLEL16// Makerfabs TFT Touch Parallel 16
+// #define LGFX_WT32_SC01                     // Seeed WT32-SC01
+// #define LGFX_WIO_TERMINAL                  // Seeed Wio Terminal
+// #define LGFX_PYBADGE                       // Adafruit PyBadge
+// #define LGFX_FUNHOUSE                      // Adafruit FunHouse
+// #define LGFX_FEATHER_ESP32_S2_TFT          // Adafruit Feather ESP32 S2 TFT
+// #define LGFX_FEATHER_ESP32_S3_TFT          // Adafruit Feather ESP32 S3 TFT
+// #define LGFX_ESPBOY                        // ESPboy
+// #define LGFX_WYWY_ESP32S3_HMI_DEVKIT       // wywy ESP32S3 HMI DevKit
+// #define LGFX_ESP32_2432S028                // Sunton ESP32 2432S028
+
+  #define LGFX_AUTODETECT // 自動認識 (D-duino-32 XS, WT32-SC01, PyBadge はパネルID読取りが出来ないため自動認識の対象から外れています)
 
 // 複数機種の定義を行うか、LGFX_AUTODETECTを定義することで、実行時にボードを自動認識します。
 
 
-// v1.0.0 を有効にします(v0からの移行期間の特別措置です。これを書かない場合は旧v0系で動作します。)
-#define LGFX_USE_V1
 
 
 // ヘッダをincludeします。

diff --git a/examples/HowToUse/2_user_setting/2_user_setting.ino b/examples/HowToUse/2_user_setting/2_user_setting.ino
@@ -1,7 +1,4 @@
 
-// v1.0.0 を有効にします(v0からの移行期間の特別措置です。これを書かない場合は旧v0系で動作します。)
-#define LGFX_USE_V1
-
 #include <LovyanGFX.hpp>
 
 // ESP32でLovyanGFXを独自設定で利用する場合の設定例
@@ -48,9 +45,9 @@ class LGFX : public lgfx::LGFX_Device
 
 
 // パネルを接続するバスの種類にあったインスタンスを用意します。
-  lgfx::Bus_SPI       _bus_instance;   // SPIバスのインスタンス
-//lgfx::Bus_I2C       _bus_instance;   // I2Cバスのインスタンス (ESP32のみ)
-//lgfx::Bus_Parallel8 _bus_instance;   // 8ビットパラレルバスのインスタンス (ESP32のみ)
+  lgfx::Bus_SPI        _bus_instance;   // SPIバスのインスタンス
+//lgfx::Bus_I2C        _bus_instance;   // I2Cバスのインスタンス
+//lgfx::Bus_Parallel8  _bus_instance;   // 8ビットパラレルバスのインスタンス
 
 // バックライト制御が可能な場合はインスタンスを用意します。(必要なければ削除)
   lgfx::Light_PWM     _light_instance;

diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini
@@ -8,6 +8,7 @@ src_dir        = main
 extra_configs  = platformio_esp8266.ini
                  platformio_esp32.ini
                  platformio_atmelsam.ini
+                 platformio_rpipico.ini
 
 [env]
 framework = arduino