Skip to content

Commit 50a1800

Browse files
lovyan03lovyan03
authored
Merge pull request #570 from lovyan03/develop
1.1.16
2 parents 4fd713e + 6f211f9 commit 50a1800

File tree

119 files changed

+17172
-36919
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+17172
-36919
lines changed

‎.github/scripts/esp-idf-versions.php

+402-87
Large diffs are not rendered by default.

‎.github/workflows/ArduinoBuild.yml

+14-16
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,10 @@ jobs:
3737

3838
platform-version:
3939
# ESP32 Core versions for 3D matrix
40-
#- 1.0.6
41-
#- 2.0.0
42-
#- 2.0.1
43-
#- 2.0.2
44-
#- 2.0.3
45-
#- 2.0.4
46-
- 2.0.11
47-
- 2.0.12
48-
- 2.0.13
40+
- 2.0.15
41+
- 2.0.16
42+
- 2.0.17
43+
#- 3.0.0
4944

5045
include:
5146
# 3D matrix doesn't apply to these:
@@ -61,19 +56,22 @@ jobs:
6156
- { board: adafruit_funhouse_esp32s2, platform: esp32, archi: esp32, platform-version: latest, platform-url: 'https://espressif.github.io/arduino-esp32/package_esp32_index.json', ... }
6257
- { board: rpipico, platform: rp2040, archi: rp2040, platform-version: 2.3.3, cli-args: '--build-property compiler.cpp.extra_flags=-DSKIP_I2C_TEST', platform-url: 'https://github.com/earlephilhower/arduino-pico/releases/download/global/package_rp2040_index.json', ... }
6358

59+
- { board: esp32, platform: esp32, platform-version: latest, platform-url: 'https://espressif.github.io/arduino-esp32/package_esp32_index.json', archi: esp32, ... }
60+
- { board: esp32s2, platform: esp32, platform-version: latest, platform-url: 'https://espressif.github.io/arduino-esp32/package_esp32_index.json', archi: esp32, ... }
61+
- { board: esp32s3, platform: esp32, platform-version: latest, platform-url: 'https://espressif.github.io/arduino-esp32/package_esp32_index.json', archi: esp32, ... }
62+
- { board: esp32c6, platform: esp32, platform-version: latest, platform-url: 'https://espressif.github.io/arduino-esp32/package_esp32_index.json', archi: esp32, ... }
63+
- { board: esp32c3, platform: esp32, platform-version: latest, platform-url: 'https://espressif.github.io/arduino-esp32/package_esp32_index.json', archi: esp32, ... }
64+
# - { board: esp32h2, platform: esp32, platform-version: latest, platform-url: 'https://espressif.github.io/arduino-esp32/package_esp32_index.json', archi: esp32, ... }
65+
6466
# 3D matrix applies to these:
65-
- { board: esp32, platform: esp32, archi: esp32, ... }
66-
- { board: esp32s2, platform: esp32, archi: esp32, ... }
67-
- { board: m5stick-c, platform: esp32, archi: esp32, ... }
68-
- { board: m5stack-core-esp32, platform: esp32, archi: esp32, ... }
69-
- { board: m5stack-core2, platform: esp32, archi: esp32, ... }
70-
- { board: esp32s3box, platform: esp32, archi: esp32, ... }
67+
- { platform: esp32, archi: esp32, ... }
68+
7169

7270
fail-fast: false
7371

7472
steps:
7573
- name: Checkout
76-
uses: actions/checkout@v3
74+
uses: actions/checkout@v4
7775
with:
7876
ref: ${{ github.event.pull_request.head.sha }}
7977

‎.github/workflows/IDFBuild.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
name: IDFBuild
22

3+
4+
35
env:
46
REPO_URL: https://github.com/espressif/esp-idf
57
PROJECT_DIR: examples/Test/build_test
@@ -33,7 +35,7 @@ jobs:
3335

3436
steps:
3537
- name: Checkout
36-
uses: actions/checkout@v3
38+
uses: actions/checkout@v4
3739
with:
3840
ref: ${{ github.event.pull_request.head.sha }}
3941

@@ -60,7 +62,7 @@ jobs:
6062

6163
steps:
6264
- name: Checkout
63-
uses: actions/checkout@v3
65+
uses: actions/checkout@v4
6466
with:
6567
ref: ${{ github.event.pull_request.head.sha }}
6668

‎.github/workflows/OpenCVBuild.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
steps:
3939
- name: Checkout
40-
uses: actions/checkout@v3
40+
uses: actions/checkout@v4
4141

4242
- name: 🪟 📦 Use GNU tar instead BSD tar
4343
if: matrix.os == 'windows-latest'

‎.github/workflows/PlatformioBuild.yml

+9-7
Original file line numberDiff line numberDiff line change
@@ -57,35 +57,36 @@ jobs:
5757
- board: m5stack-core-esp32
5858
- board: m5stack-core2
5959
- board: m5stack-cores3
60-
- { board: esp8266, platform-version: 3.0.0, ... }
61-
- { board: esp8266, platform-version: 3.1.0, ... }
62-
- { board: esp8266, platform-version: 3.2.0, ... }
60+
- { board: esp8266, platform-version: 4.2.1, ... }
61+
- { board: esp8266, platform-version: 4.2.0, ... }
62+
- { board: esp8266, platform-version: 4.1.0, ... }
6363
- { board: seeed_wio_terminal, platform-version: default, ... }
6464
- { board: adafruit_pybadge_m4, platform-version: default, ... }
6565
- { board: pico, platform-version: default, ... }
66+
- { board: native, platform-version: portduino, ... }
6667

6768
fail-fast: false
6869

6970
steps:
7071
- name: Checkout
71-
uses: actions/checkout@v3
72+
uses: actions/checkout@v4
7273
with:
7374
ref: ${{ github.event.pull_request.head.sha }}
7475

7576
- name: Cache pip
76-
uses: actions/cache@v3
77+
uses: actions/cache@v4
7778
with:
7879
path: ~/.cache/pip
7980
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
8081
restore-keys: |
8182
${{ runner.os }}-pip-
8283
- name: Cache PlatformIO
83-
uses: actions/cache@v3
84+
uses: actions/cache@v4
8485
with:
8586
path: ~/.platformio
8687
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
8788
- name: Set up Python
88-
uses: actions/setup-python@v4
89+
uses: actions/setup-python@v5
8990
with:
9091
python-version: '3.9'
9192

@@ -101,4 +102,5 @@ jobs:
101102
export pio_ver=${{ matrix.platform-version }}
102103
export pio_env="${pio_ver//./_}"
103104
pio pkg install -e ${{ matrix.board }}-$pio_env --no-save --library file://$(realpath ../../../)
105+
[[ "$pio_env" == "portduino" ]] && { sudo apt update; sudo apt-get install libgpiod-dev libbluetooth-dev; export PLATFORMIO_SRC_DIR=portduino; }
104106
pio run -e ${{ matrix.board }}-$pio_env

‎.github/workflows/SDLBuild.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ jobs:
4949

5050
steps:
5151
- name: Checkout
52-
uses: actions/checkout@v3
52+
uses: actions/checkout@v4
5353

5454

5555
- name: Cache SDL2 for Windows
5656
if: ${{ matrix.os == 'windows-latest' }}
57-
uses: actions/cache@v3
57+
uses: actions/cache@v4
5858
id: cache-SLD2-windows
5959
with:
6060
path: contrib
@@ -111,7 +111,7 @@ jobs:
111111
112112
- name: Upload WASM artifact
113113
if: ${{ matrix.os == 'ubuntu-latest' }}
114-
uses: actions/upload-pages-artifact@v2
114+
uses: actions/upload-pages-artifact@v3
115115
with:
116116
path: ${{env.WASM_DIR}}/build/www
117117

‎.github/workflows/pioPkgPublish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515
with:
1616
ref: ${{ github.event.pull_request.head.sha }}
1717

‎.github/workflows/stale.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
env:
1313
ACTIONS_STEP_DEBUG: true
1414
steps:
15-
- uses: actions/stale@v3.0.14
15+
- uses: actions/stale@v9.0.0
1616
with:
1717
repo-token: ${{ secrets.GITHUB_TOKEN }}
1818
stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'

‎CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ file(GLOB SRCS
77
src/lgfx/Fonts/efont/*.c
88
src/lgfx/Fonts/IPA/*.c
99
src/lgfx/utility/*.c
10-
src/lgfx/v0/*.cpp
11-
src/lgfx/v0/panel/*.cpp
12-
src/lgfx/v0/platforms/*.cpp
13-
src/lgfx/v0/touch/*.cpp
1410
src/lgfx/v1/*.cpp
1511
src/lgfx/v1/misc/*.cpp
1612
src/lgfx/v1/panel/*.cpp

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ This library is also compatible with the above models and display panels with a
168168
// #define LGFX_FEATHER_ESP32_S3_TFT // Adafruit Feather ESP32 S3 TFT
169169
// #define LGFX_ESPBOY // ESPboy
170170
// #define LGFX_WYWY_ESP32S3_HMI_DEVKIT // wywy ESP32S3 HMI DevKit
171-
// #define LGFX_ESP32_2432S028 // Sunton ESP32 2432S028
171+
// #define LGFX_SUNTON_ESP32_2432S028 // Sunton ESP32 2432S028
172172

173173
#define LGFX_AUTODETECT // 自動認識 (D-duino-32 XS, WT32-SC01, PyBadge はパネルID読取りが出来ないため自動認識の対象から外れています)
174174

‎examples/HowToUse/1_simple_use/1_simple_use.ino

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
// #define LGFX_ESP_WROVER_KIT // Espressif ESP-WROVER-KIT
2323
// #define LGFX_ESP32_S3_BOX // Espressif ESP32-S3-BOX
2424
// #define LGFX_ESP32_S3_BOX_LITE // Espressif ESP32-S3-BOX Lite
25+
// #define LGFX_ESP32_S3_BOX_V3 // Espressif ESP32-S3-BOX-3/3B
2526
// #define LGFX_WIFIBOY_PRO // WiFiBoy Pro
2627
// #define LGFX_WIFIBOY_MINI // WiFiBoy mini
2728
// #define LGFX_MAKERFABS_TOUCHCAMERA // Makerfabs Touch with Camera
@@ -36,7 +37,7 @@
3637
// #define LGFX_FEATHER_ESP32_S3_TFT // Adafruit Feather ESP32 S3 TFT
3738
// #define LGFX_ESPBOY // ESPboy
3839
// #define LGFX_WYWY_ESP32S3_HMI_DEVKIT // wywy ESP32S3 HMI DevKit
39-
// #define LGFX_ESP32_2432S028 // Sunton ESP32 2432S028
40+
// #define LGFX_SUNTON_ESP32_2432S028 // Sunton ESP32 2432S028
4041

4142
#define LGFX_AUTODETECT // 自動認識 (D-duino-32 XS, WT32-SC01, PyBadge はパネルID読取りが出来ないため自動認識の対象から外れています)
4243

0 commit comments

Comments
 (0)