Skip to content

Commit ecfdca5

Browse files
committed
Merge branch 'develop'
2 parents 306ddd5 + 1d2607d commit ecfdca5

88 files changed

Lines changed: 1590 additions & 4239 deletions

File tree

Some content is hidden

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

.github/workflows/Arduino-Lint-Check.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ jobs:
1818
lint:
1919
name: Lint Check
2020
runs-on: ubuntu-latest
21+
timeout-minutes: 12
22+
strategy:
23+
max-parallel: 20
24+
matrix:
25+
include:
26+
- shard: 1
2127
steps:
2228
- uses: actions/checkout@v4
2329
- uses: arduino/arduino-lint-action@v2

.github/workflows/clang-format-check.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
- '**.h'
1818
- '**.c'
1919
- '**.inl'
20-
- '**clang-format-check.yml'
20+
- '.github/workflows/clang-format-check.yml'
2121
- '**.clang-format'
2222
pull_request:
2323
paths:
@@ -27,7 +27,7 @@ on:
2727
- '**.h'
2828
- '**.c'
2929
- '**.inl'
30-
- '**clang-format-check.yml'
30+
- '.github/workflows/clang-format-check.yml'
3131
- '**.clang-format'
3232
workflow_dispatch:
3333

@@ -43,21 +43,19 @@ jobs:
4343
formatting-check:
4444
name: Formatting Check
4545
runs-on: ubuntu-latest
46+
timeout-minutes: 12
4647
strategy:
48+
max-parallel: 20
4749
matrix:
4850
path:
4951
- check: 'src'
5052
exclude: ''
51-
- check: 'pio_project/test'
52-
exclude: ''
53-
- check: 'examples/Basic'
53+
- check: 'test'
5454
exclude: ''
5555

5656
steps:
5757
- name: Checkout
5858
uses: actions/checkout@v4
59-
with:
60-
ref: ${{ github.event.pull_request.head.sha }}
6159

6260
- name: Run clang-format style check for C/C++/Protobuf programs.
6361
uses: jidicula/clang-format-action@v4.16.0 # Using include-regex 10.x or later
@@ -66,4 +64,3 @@ jobs:
6664
check-path: ${{ matrix.path['check'] }}
6765
exclude-regex: ${{ matrix.path['exclude'] }}
6866
include-regex: ${{ env.INCLUDE_REGEX }}
69-

.github/workflows/doxygen-gh-pages.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
name: Deploy Doxygen docuemnt on GitHub Pages
1+
name: Deploy Doxygen document on GitHub Pages
22
on: [release, workflow_dispatch]
33
# branches:
44
# - main
55
# - master
6-
76
defaults:
87
run:
98
shell: bash
@@ -15,6 +14,12 @@ concurrency:
1514
jobs:
1615
deploy:
1716
runs-on: ubuntu-latest
17+
timeout-minutes: 12
18+
strategy:
19+
max-parallel: 20
20+
matrix:
21+
include:
22+
- shard: 1
1823
steps:
1924
- name: Make document
2025
uses: m5stack/M5Utility/.github/actions/doxygen@develop
Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
name: Build(platformio)
2+
3+
on:
4+
push:
5+
tags-ignore:
6+
- '*.*.*'
7+
- 'v*.*.*'
8+
branches:
9+
- '*'
10+
paths:
11+
- 'src/**.cpp'
12+
- 'src/**.hpp'
13+
- 'src/**.h'
14+
- 'src/**.c'
15+
- 'test/**.cpp'
16+
- 'test/**.hpp'
17+
- 'test/**.h'
18+
- 'test/**.c'
19+
- '.github/workflows/platformio-build-check.yml'
20+
- 'platformio.ini'
21+
pull_request:
22+
paths:
23+
- 'src/**.cpp'
24+
- 'src/**.hpp'
25+
- 'src/**.h'
26+
- 'src/**.c'
27+
- 'test/**.cpp'
28+
- 'test/**.hpp'
29+
- 'test/**.h'
30+
- 'test/**.c'
31+
- '.github/workflows/platformio-build-check.yml'
32+
- 'platformio.ini'
33+
workflow_dispatch:
34+
35+
defaults:
36+
run:
37+
shell: bash
38+
39+
concurrency:
40+
group: ${{ github.workflow }}-${{ github.ref }}
41+
cancel-in-progress: true
42+
43+
jobs:
44+
build:
45+
name: ${{ matrix.board }}
46+
runs-on: ubuntu-latest
47+
timeout-minutes: 12
48+
49+
strategy:
50+
fail-fast: false
51+
max-parallel: 20
52+
53+
matrix:
54+
board:
55+
- Core
56+
- Core2
57+
- CoreS3
58+
- Fire
59+
- StampS3
60+
- Dial
61+
- Atom
62+
- AtomS3
63+
- AtomS3R
64+
- NanoC6
65+
- NessoN1
66+
- StickCPlus
67+
- StickCPlus2
68+
- StickS3
69+
- Cardputer
70+
- Paper
71+
- CoreInk
72+
- Tab5
73+
74+
steps:
75+
- name: Checkout
76+
uses: actions/checkout@v4
77+
78+
- name: Build tests
79+
uses: m5stack/M5Utility/.github/actions/pio_test_build@develop
80+
with:
81+
environments: test_readme_${{ matrix.board }}
82+
project-dir: "./"
83+
project-conf: "./platformio.ini"

.gitignore

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,26 @@
3131
*.out
3232
*.app
3333

34-
#
34+
# Doxygen
35+
docs/html/
36+
37+
# PlatformIO
38+
.pio/
39+
40+
# IDE
41+
.vscode/
42+
43+
# macOS
3544
.DS_Store
36-
/.pio/
37-
/.vscode/
38-
/docs/html/
45+
46+
# Temporary
47+
tmp/
48+
49+
# Emacs
3950
.\#*
51+
52+
# Secrets
53+
.env*
54+
*.pem
55+
*.key
56+
*.cert

README.ja.md

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ M5UnitUnified は、様々な M5 ユニット製品を統一的に扱うため
2525
Arduino/PlatformIO のライブラリマネージャーに登録されています
2626

2727
### ArduinoIDE
28-
1. ライブリマネージャから使用したいユニットのライブラリ (M5Unit-Foo) を選択してください
28+
1. ライブラリマネージャから使用したいユニットのライブラリ (M5Unit-Foo) を選択してください
2929

30-
依存する M5UnitUnfied 関連のライブラリは自動で DL されます
30+
依存する M5UnitUnified 関連のライブラリは自動で DL されます
3131

3232
### PlatformIO
3333
1. platformio.ini の lib\_deps に記述してください
3434
```ini
3535
lib_deps=m5stack/M5Unit-foo ;使用したいユニットのライブラリ
3636
```
3737

38-
依存する M5UnitUnfied 関連のライブラリは自動で DL されます
38+
依存する M5UnitUnified 関連のライブラリは自動で DL されます
3939

4040
## 使い方
4141

@@ -282,16 +282,11 @@ void loop() {
282282
```
283283

284284

285-
- 標準外の使い方
286-
- [自分でユニットの更新を行う例](examples/Basic/SelfUpdate)
287-
- [UnitUnified マネージャを使用せず、コンポーネントのみでの例](examples/Basic/ComponentOnly)
288-
289-
290285
## サポートされているもの
291286
### サポートされるフレームワーク
292287
- Arduino
293288

294-
ESP-IDF は将来対応予定です
289+
将来的には Wire クラス等を直接使わず、全て M5HAL 経由で接続を行えるようになる予定です
295290

296291
### サポートされる通信
297292
- I2C TwoWire class による
@@ -306,8 +301,7 @@ ESP-IDF は将来対応予定です。
306301

307302

308303
## Examples
309-
各ユニットのサンプルについては、各ユニットのリポジトリを参照してください。
310-
[このリポジトリにあるサンプル](examples/Basic)は M5UnitUnified 全般のものです。
304+
使用例は各ユニットのリポジトリ (M5Unit-ENV, M5Unit-HEART 等) を参照してください。
311305

312306

313307
## Doxygen ドキュメント

README.md

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Unify basic APIs so that all units can be handled in the same way.
1515
### Unified connections and communications
1616
Each unit's external library requires its own communication functions and assumptions.
1717
Unify prerequisites and communication methods.
18-
In the future, we plan to work with [M5HAL (Hardware Abstraction Layer)](https://github.com/m5stack/M5HAL) to unified communicatation with each unit.
18+
In the future, we plan to work with [M5HAL (Hardware Abstraction Layer)](https://github.com/m5stack/M5HAL) to unified communication with each unit.
1919

2020
### Unified Licensing
2121
External library licenses for each unit are mixed.
@@ -29,19 +29,19 @@ The library is registered with the library manager.
2929

3030
1. Using library manager and select the library of the unit you want to use (e.g. M5Unit-GESTURE)
3131

32-
Dependent M5UnitUnfied related libraries will be downloaded automatically.
32+
Dependent M5UnitUnified related libraries will be downloaded automatically.
3333

3434
### PlatformIO
3535
1. Write lib\_deps settings to platformio.ini
3636
```ini
3737
lib_deps= m5stack/M5Unit-foo ; Unit to be used
3838
```
39-
Dependent M5UnitUnfied related libraries will be downloaded automatically.
39+
Dependent M5UnitUnified related libraries will be downloaded automatically.
4040

4141

4242
## How to use
4343

44-
See also examples for each unit repositry too.
44+
See also examples for each unit repository too.
4545

4646
### UnitComponent with UnitUnified (Standard usage)
4747

@@ -282,15 +282,12 @@ void loop() {
282282
}
283283
```
284284

285-
- Nonstandard usage
286-
- [To update the unit yourself usage example](examples/Basic/SelfUpdate)
287-
- [Using only unit component without UnitUnified manager](examples/Basic/ComponentOnly)
288285

289286
## Supported things
290287
### Supported frameworks
291288
- Arduino
292289

293-
Support ESP-IDF with M5HAL in the future.
290+
In the future, all connections will be made through M5HAL, eliminating the need to use Wire class etc. directly.
294291

295292
### Supported connection
296293
- I2C with TwoWire class
@@ -304,8 +301,7 @@ Support ESP-IDF with M5HAL in the future.
304301
See also [Wiki](https://github.com/m5stack/M5UnitUnified/wiki/)
305302

306303
## Examples
307-
For exampless of each unit, please refer to the respective unit's repository.
308-
[The examples in this repository](examples/Basic) are for M5UnitUnified in general
304+
For examples, please refer to each unit's repository (e.g. M5Unit-ENV, M5Unit-HEART, etc.).
309305

310306
## Doxygen document
311307

docs/Doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ DOXYFILE_ENCODING = UTF-8
4242
# title of most generated pages and in a few other places.
4343
# The default value is: My Project.
4444

45-
PROJECT_NAME = M5UnitUnified
45+
PROJECT_NAME = "M5UnitUnified"
4646

4747
# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
4848
# could be handy for archiving the generated documentation or if some version

docs/doxy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# Please execute on repositry root
3+
# Please execute on repository root
44

55
## Get version from library.properties
66
## Get git rev of HEAD

examples/Basic/ComponentOnly/ComponentOnly.ino

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)