Skip to content

Commit

Permalink
Merge pull request #570 from lovyan03/develop
Browse files Browse the repository at this point in the history
1.1.16
  • Loading branch information
lovyan03 authored Jun 4, 2024
2 parents 4fd713e + 6f211f9 commit 50a1800
Show file tree
Hide file tree
Showing 119 changed files with 17,172 additions and 36,919 deletions.
489 changes: 402 additions & 87 deletions .github/scripts/esp-idf-versions.php

Large diffs are not rendered by default.

30 changes: 14 additions & 16 deletions .github/workflows/ArduinoBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,10 @@ jobs:

platform-version:
# ESP32 Core versions for 3D matrix
#- 1.0.6
#- 2.0.0
#- 2.0.1
#- 2.0.2
#- 2.0.3
#- 2.0.4
- 2.0.11
- 2.0.12
- 2.0.13
- 2.0.15
- 2.0.16
- 2.0.17
#- 3.0.0

include:
# 3D matrix doesn't apply to these:
Expand All @@ -61,19 +56,22 @@ jobs:
- { board: adafruit_funhouse_esp32s2, platform: esp32, archi: esp32, platform-version: latest, platform-url: 'https://espressif.github.io/arduino-esp32/package_esp32_index.json', ... }
- { 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', ... }

- { board: esp32, platform: esp32, platform-version: latest, platform-url: 'https://espressif.github.io/arduino-esp32/package_esp32_index.json', archi: esp32, ... }
- { board: esp32s2, platform: esp32, platform-version: latest, platform-url: 'https://espressif.github.io/arduino-esp32/package_esp32_index.json', archi: esp32, ... }
- { board: esp32s3, platform: esp32, platform-version: latest, platform-url: 'https://espressif.github.io/arduino-esp32/package_esp32_index.json', archi: esp32, ... }
- { board: esp32c6, platform: esp32, platform-version: latest, platform-url: 'https://espressif.github.io/arduino-esp32/package_esp32_index.json', archi: esp32, ... }
- { board: esp32c3, platform: esp32, platform-version: latest, platform-url: 'https://espressif.github.io/arduino-esp32/package_esp32_index.json', archi: esp32, ... }
# - { board: esp32h2, platform: esp32, platform-version: latest, platform-url: 'https://espressif.github.io/arduino-esp32/package_esp32_index.json', archi: esp32, ... }

# 3D matrix applies to these:
- { board: esp32, platform: esp32, archi: esp32, ... }
- { board: esp32s2, platform: esp32, archi: esp32, ... }
- { board: m5stick-c, platform: esp32, archi: esp32, ... }
- { board: m5stack-core-esp32, platform: esp32, archi: esp32, ... }
- { board: m5stack-core2, platform: esp32, archi: esp32, ... }
- { board: esp32s3box, platform: esp32, archi: esp32, ... }
- { platform: esp32, archi: esp32, ... }


fail-fast: false

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}

Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/IDFBuild.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
name: IDFBuild



env:
REPO_URL: https://github.com/espressif/esp-idf
PROJECT_DIR: examples/Test/build_test
Expand Down Expand Up @@ -33,7 +35,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}

Expand All @@ -60,7 +62,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/OpenCVBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: 🪟 📦 Use GNU tar instead BSD tar
if: matrix.os == 'windows-latest'
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/PlatformioBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,35 +57,36 @@ jobs:
- board: m5stack-core-esp32
- board: m5stack-core2
- board: m5stack-cores3
- { board: esp8266, platform-version: 3.0.0, ... }
- { board: esp8266, platform-version: 3.1.0, ... }
- { board: esp8266, platform-version: 3.2.0, ... }
- { board: esp8266, platform-version: 4.2.1, ... }
- { board: esp8266, platform-version: 4.2.0, ... }
- { board: esp8266, platform-version: 4.1.0, ... }
- { board: seeed_wio_terminal, platform-version: default, ... }
- { board: adafruit_pybadge_m4, platform-version: default, ... }
- { board: pico, platform-version: default, ... }
- { board: native, platform-version: portduino, ... }

fail-fast: false

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}

- name: Cache pip
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- name: Cache PlatformIO
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.platformio
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.9'

Expand All @@ -101,4 +102,5 @@ jobs:
export pio_ver=${{ matrix.platform-version }}
export pio_env="${pio_ver//./_}"
pio pkg install -e ${{ matrix.board }}-$pio_env --no-save --library file://$(realpath ../../../)
[[ "$pio_env" == "portduino" ]] && { sudo apt update; sudo apt-get install libgpiod-dev libbluetooth-dev; export PLATFORMIO_SRC_DIR=portduino; }
pio run -e ${{ matrix.board }}-$pio_env
6 changes: 3 additions & 3 deletions .github/workflows/SDLBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4


- name: Cache SDL2 for Windows
if: ${{ matrix.os == 'windows-latest' }}
uses: actions/cache@v3
uses: actions/cache@v4
id: cache-SLD2-windows
with:
path: contrib
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
- name: Upload WASM artifact
if: ${{ matrix.os == 'ubuntu-latest' }}
uses: actions/upload-pages-artifact@v2
uses: actions/upload-pages-artifact@v3
with:
path: ${{env.WASM_DIR}}/build/www

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pioPkgPublish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
env:
ACTIONS_STEP_DEBUG: true
steps:
- uses: actions/stale@v3.0.14
- uses: actions/stale@v9.0.0
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
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.'
Expand Down
4 changes: 0 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ file(GLOB SRCS
src/lgfx/Fonts/efont/*.c
src/lgfx/Fonts/IPA/*.c
src/lgfx/utility/*.c
src/lgfx/v0/*.cpp
src/lgfx/v0/panel/*.cpp
src/lgfx/v0/platforms/*.cpp
src/lgfx/v0/touch/*.cpp
src/lgfx/v1/*.cpp
src/lgfx/v1/misc/*.cpp
src/lgfx/v1/panel/*.cpp
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ This library is also compatible with the above models and display panels with a
// #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_SUNTON_ESP32_2432S028 // Sunton ESP32 2432S028

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

Expand Down
3 changes: 2 additions & 1 deletion examples/HowToUse/1_simple_use/1_simple_use.ino
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
// #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_ESP32_S3_BOX_V3 // Espressif ESP32-S3-BOX-3/3B
// #define LGFX_WIFIBOY_PRO // WiFiBoy Pro
// #define LGFX_WIFIBOY_MINI // WiFiBoy mini
// #define LGFX_MAKERFABS_TOUCHCAMERA // Makerfabs Touch with Camera
Expand All @@ -36,7 +37,7 @@
// #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_SUNTON_ESP32_2432S028 // Sunton ESP32 2432S028

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

Expand Down
Loading

0 comments on commit 50a1800

Please sign in to comment.