Skip to content

Commit ede60a9

Browse files
lovyan03lovyan03
authored
Merge pull request #154 from lovyan03/develop
0.4.4
2 parents 6422cdc + 5f54abf commit ede60a9

33 files changed

+1117
-251
lines changed

‎.github/scripts/ci-compile‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
set -eou pipefail
2+
3+
# List of examples that will be compiled by default
4+
EXAMPLES=${EXAMPLES:-"HowToUse/1_simple_use"}
5+
6+
# list of boards to compile for by default
7+
BOARDS=${BOARDS:-"m5stick-c seeed_wio_terminal adafruit_pybadge_m4 d1_mini"}
8+
9+
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
10+
BOARD_OPTS=$(for b in $BOARDS; do echo -n "--board $b "; done)
11+
12+
cd "$DIR/../.."
13+
14+
for d in $EXAMPLES ; do
15+
echo "*** building example $d for $BOARDS ***"
16+
pio ci $BOARD_OPTS --lib=src "examples/$d/"*ino
17+
done

‎.github/workflows/ArduinoBuild.yml‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
name: ArduinoBuild
2+
3+
env:
4+
SKETCH_NAME: build_test.ino
5+
6+
on:
7+
push: # see: https://help.github.com/en/actions/reference/events-that-trigger-workflows#pull-request-event-pull_request
8+
paths:
9+
- '**.ino'
10+
- '**.cpp'
11+
- '**.hpp'
12+
- '**.h'
13+
- '**.c'
14+
- '**ArduinoBuild.yml'
15+
pull_request:
16+
17+
jobs:
18+
build:
19+
name: ${{ matrix.fancy-name }}
20+
21+
runs-on: ubuntu-latest
22+
23+
strategy:
24+
matrix:
25+
26+
arduino-boards-fqbn:
27+
- Seeeduino:samd:seeed_wio_terminal
28+
- esp8266:esp8266:d1_mini:eesz=4M3M,xtal=80
29+
- esp32:esp32:esp32
30+
- esp32:esp32:esp32s2
31+
- esp32:esp32:m5stick-c
32+
- esp32:esp32:m5stack-core-esp32
33+
- esp32:esp32:m5stack-core2
34+
#- esp32:esp32:m5stack-fire
35+
#- esp32:esp32:odroid_esp32
36+
37+
include:
38+
- arduino-boards-fqbn: Seeeduino:samd:seeed_wio_terminal
39+
fancy-name: Wio Terminal
40+
platform-url: https://files.seeedstudio.com/arduino/package_seeeduino_boards_index.json
41+
42+
- arduino-boards-fqbn: esp8266:esp8266:d1_mini:eesz=4M3M,xtal=80
43+
fancy-name: ESP8266 D1Mini
44+
platform-url: https://arduino.esp8266.com/stable/package_esp8266com_index.json
45+
46+
- arduino-boards-fqbn: esp32:esp32:esp32
47+
fancy-name: ESP32 Generic
48+
platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_dev_index.json
49+
50+
- arduino-boards-fqbn: esp32:esp32:esp32s2
51+
fancy-name: ESP32 S2
52+
platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_dev_index.json
53+
54+
- arduino-boards-fqbn: esp32:esp32:m5stick-c
55+
fancy-name: M5StickC
56+
platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_dev_index.json
57+
58+
- arduino-boards-fqbn: esp32:esp32:m5stack-core-esp32
59+
fancy-name: M5Stack
60+
platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_dev_index.json
61+
62+
- arduino-boards-fqbn: esp32:esp32:m5stack-core2
63+
fancy-name: M5Core2
64+
platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_dev_index.json
65+
66+
#- arduino-boards-fqbn: esp32:esp32:m5stack-fire
67+
# fancy-name: M5Fire
68+
# platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_dev_index.json
69+
70+
#- arduino-boards-fqbn: esp32:esp32:odroid_esp32
71+
# fancy-name: OdroidGo
72+
# platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_dev_index.json
73+
74+
fail-fast: false
75+
76+
steps:
77+
- name: Checkout
78+
uses: actions/checkout@v2
79+
with:
80+
ref: ${{ github.event.pull_request.head.sha }}
81+
82+
- name: Compile example
83+
uses: ArminJo/arduino-test-compile@v3
84+
with:
85+
arduino-board-fqbn: ${{ matrix.arduino-boards-fqbn }}
86+
platform-url: ${{ matrix.platform-url }}
87+
required-libraries: ${{ matrix.required-libraries }}
88+
build-properties: ${{ toJson(matrix.build-properties) }}
89+
sketch-names: ${{ env.SKETCH_NAME }}
90+
#platform-default-url: ${{ env.PLATFORM_DEFAULT_URL }}
91+
#sketches-exclude: ${{ matrix.sketches-exclude }}
92+

‎.github/workflows/IDFBuild.yml‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
name: IDFBuild
2+
3+
env:
4+
REPO_URL: https://github.com/espressif/esp-idf
5+
PROJECT_DIR: examples/Test/build_test
6+
7+
on:
8+
push:
9+
paths:
10+
- '**.ino'
11+
- '**.cpp'
12+
- '**.hpp'
13+
- '**.h'
14+
- '**.c'
15+
- '**IDFBuild.yml'
16+
pull_request:
17+
18+
jobs:
19+
build:
20+
name: idf ${{ matrix.idf-version }}@${{ matrix.idf-board }}>esp-idf_graphicstest
21+
22+
runs-on: ubuntu-latest
23+
24+
strategy:
25+
matrix:
26+
27+
esp-idf-fqbn:
28+
- [email protected]
29+
- [email protected]
30+
- [email protected]
31+
- [email protected]
32+
33+
include:
34+
- esp-idf-fqbn: [email protected]
35+
idf-board: esp32
36+
idf-version: v4.1
37+
- esp-idf-fqbn: [email protected]
38+
idf-board: esp32
39+
idf-version: v4.2
40+
- esp-idf-fqbn: [email protected]
41+
idf-board: esp32
42+
idf-version: v4.3.1
43+
- esp-idf-fqbn: [email protected]
44+
idf-board: esp32s2
45+
idf-version: v4.3.1
46+
47+
fail-fast: false
48+
49+
steps:
50+
- name: Checkout
51+
uses: actions/checkout@v2
52+
with:
53+
ref: ${{ github.event.pull_request.head.sha }}
54+
55+
- name: Cache pip for ${{ matrix.esp-idf-fqbn }}
56+
uses: actions/cache@v2
57+
with:
58+
path: ~/.cache/pip
59+
key: ${{ runner.os }}-pip-${{ matrix.idf-version }}-${{ hashFiles('**/requirements.txt') }}
60+
restore-keys: |
61+
${{ runner.os }}-pip-
62+
63+
- name: Cache espressif tools for ${{ matrix.esp-idf-fqbn }}
64+
uses: actions/cache@v2
65+
id: espressif
66+
with:
67+
path: |
68+
~/.espressif
69+
key: ${{ runner.os }}-espressif-${{ matrix.idf-version }}-${{ hashFiles('**/lockfiles') }}
70+
71+
- name: Cache esp-idf for ${{ matrix.esp-idf-fqbn }}
72+
id: cache-idf
73+
uses: actions/cache@v2
74+
with:
75+
path: ~/esp/esp-idf
76+
key: ${{ runner.os }}-idf-${{ matrix.idf-version }}-${{ hashFiles('**/lockfiles') }}
77+
78+
- name: Get/Check IDF ${{ matrix.esp-idf-fqbn }}
79+
run: |
80+
mkdir -p ~/esp
81+
cd ~/esp
82+
if [ ! -d "./esp-idf/" ]; then git clone -b ${{ matrix.idf-version }} --recursive $REPO_URL esp-idf; fi
83+
cd ~/esp/esp-idf
84+
if [ ! -d "~/.espressif" ]; then ./install.sh; fi
85+
86+
- name: Build example for ${{ matrix.esp-idf-fqbn }}
87+
run: |
88+
source ~/esp/esp-idf/export.sh
89+
cd ${{ env.PROJECT_DIR }}
90+
idf.py set-target ${{ matrix.idf-board }}
91+
idf.py build
92+

‎.github/workflows/PlatformioBuild.yml‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
name: PlatformIOBuild
2+
3+
env:
4+
PROJECT_DIR: examples/Test/build_test
5+
6+
on:
7+
push:
8+
paths:
9+
- '**.ino'
10+
- '**.cpp'
11+
- '**.hpp'
12+
- '**.h'
13+
- '**.c'
14+
- '**PlatformioBuild.yml'
15+
pull_request:
16+
17+
jobs:
18+
build:
19+
name: ${{ matrix.pio-env }}
20+
21+
runs-on: ubuntu-latest
22+
23+
strategy:
24+
matrix:
25+
26+
pio-env:
27+
- esp8266
28+
- esp32
29+
- esp32-s2
30+
- m5stick-c
31+
- m5stack-core-esp32
32+
- m5stack-core2
33+
- seeed_wio_terminal
34+
- adafruit_pybadge_m4
35+
#- m5stack-fire
36+
#- odroid_esp32
37+
38+
include:
39+
- pio-env: esp8266
40+
- pio-env: esp32
41+
- pio-env: esp32-s2
42+
- pio-env: m5stick-c
43+
- pio-env: m5stack-core2
44+
- pio-env: m5stack-core-esp32
45+
- pio-env: seeed_wio_terminal
46+
- pio-env: adafruit_pybadge_m4
47+
#- pio-env: m5stack-fire
48+
#- pio-env: odroid_esp32
49+
50+
fail-fast: false
51+
52+
steps:
53+
- name: Checkout
54+
uses: actions/checkout@v2
55+
with:
56+
ref: ${{ github.event.pull_request.head.sha }}
57+
58+
- name: Cache pip
59+
uses: actions/cache@v2
60+
with:
61+
path: ~/.cache/pip
62+
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
63+
restore-keys: |
64+
${{ runner.os }}-pip-
65+
- name: Cache PlatformIO
66+
uses: actions/cache@v2
67+
with:
68+
path: ~/.platformio
69+
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
70+
- name: Set up Python
71+
uses: actions/setup-python@v2
72+
73+
- name: Install PlatformIO
74+
run: |
75+
python -m pip install --upgrade pip
76+
pip install --upgrade platformio
77+
78+
- name: Run PlatformIO
79+
run: cd ${{ env.PROJECT_DIR }} && pio run -e ${{ matrix.pio-env }}

‎.github/workflows/build.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: ArduinoCIBuild
2+
on:
3+
push:
4+
branches:
5+
- develop
6+
pull_request:
7+
branches:
8+
- develop
9+
10+
jobs:
11+
12+
build:
13+
runs-on: ubuntu-20.04
14+
steps:
15+
- name: checkout code
16+
uses: actions/checkout@v2
17+
18+
- name: install python
19+
uses: actions/setup-python@v2
20+
with:
21+
python-version: '3.8'
22+
23+
- name: install platformio
24+
run: |
25+
pip install platformio==5.0.3
26+
27+
- name: perform chmod
28+
run: chmod +x ./.github/scripts/ci-compile
29+
30+
- name: build examples
31+
run: ./.github/scripts/ci-compile

‎.github/Workflows/onrelease.yml‎ renamed to ‎.github/workflows/onrelease.yml‎

File renamed without changes.

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.pio
2+
sdkconfig*
3+
!sdkconfig.defaults
4+
build

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ This library has the following advantages.
7070
- SSD1331
7171
- SSD1351 (SSD1357)
7272
- SSD1963
73-
- ST7735 (M5StickC, TTGO T-Wristband, TTGO TS, LoLin D32 Pro, WiFiBoy mini, PyBadge)
73+
- ST7735 (M5StickC, TTGO T-Wristband, TTGO TS, LoLin D32 Pro, WiFiBoy mini, ESPboy, PyBadge)
7474
- ST7789 (M5StickCPlus, TTGO T-Watch, ESP-WROVER-KIT, Makerfabs MakePython, DSTIKE D-duino-32 XS)
7575
- ST7796 (WT32-SC01)
7676

@@ -119,6 +119,7 @@ This library is also compatible with the above models and display panels with a
119119
// #define LGFX_WT32_SC01 // Seeed WT32-SC01
120120
// #define LGFX_WIO_TERMINAL // Seeed Wio Terminal
121121
// #define LGFX_PYBADGE // Adafruit PyBadge
122+
// #define LGFX_ESPBOY // ESPboy
122123

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
// #define LGFX_WT32_SC01 // Seeed WT32-SC01
2525
// #define LGFX_WIO_TERMINAL // Seeed Wio Terminal
2626
// #define LGFX_PYBADGE // Adafruit PyBadge
27+
// #define LGFX_ESPBOY // ESPboy
2728

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

‎examples/Test/build_test/CMakeLists.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
cmake_minimum_required(VERSION 3.16.0)
2+
list(APPEND EXTRA_COMPONENT_DIRS "$(PROJECT_PATH)/../../../../../LovyanGFX")
3+
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
4+
project(LovyanGFX-build-test)
5+
6+

0 commit comments

Comments
 (0)