Skip to content

Commit a2b6923

Browse files
GOB52GOB52
committed
Merge branch 'develop'
2 parents 171e729 + 836314d commit a2b6923

91 files changed

Lines changed: 6807 additions & 934 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/ISSUE_TEMPLATE/bug-report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ body:
7676
label: Issue checklist
7777
description: Please double-check that you have done each of the following things before submitting the issue.
7878
options:
79-
- label: I searched for previous reports in [the issue tracker](https://github.com/m5stack/M5Stack/issues?q=)
79+
- label: I searched for previous reports in [the issue tracker](https://github.com/m5stack/M5Unit-NFC/issues?q=)
8080
required: true
8181
- label: My report contains all necessary details
8282
required: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717
jobs:
1818
lint:
1919
name: Lint Check
20-
runs-on: [self-hosted, Linux, X64]
20+
runs-on: ubuntu-latest
2121
steps:
2222
- uses: actions/checkout@v4
2323
- uses: arduino/arduino-lint-action@v2

‎.github/workflows/arduino-esp-v2-build-check.yml‎

Lines changed: 240 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,240 @@
1+
name: Build(arduino-esp32:2.x)
2+
3+
env:
4+
SKETCH_NAMES_FIND_START: ./examples/UnitUnified
5+
REQUIRED_LIBRARIES: M5Unified,M5UnitUnified
6+
7+
on:
8+
push:
9+
tags-ignore:
10+
- '*.*.*'
11+
- 'v*.*.*'
12+
branches:
13+
- '*'
14+
paths:
15+
- 'src/**.cpp'
16+
- 'src/**.hpp'
17+
- 'src/**.h'
18+
- 'src/**.c'
19+
- 'examples/UnitUnified/**.ino'
20+
- 'examples/UnitUnified/**.cpp'
21+
- 'examples/UnitUnified/**.hpp'
22+
- 'examples/UnitUnified/**.h'
23+
- 'examples/UnitUnified/**.c'
24+
- '.github/workflows/arduino-esp-v2-build-check.yml'
25+
pull_request:
26+
paths:
27+
- 'src/**.cpp'
28+
- 'src/**.hpp'
29+
- 'src/**.h'
30+
- 'src/**.c'
31+
- 'examples/UnitUnified/**.ino'
32+
- 'examples/UnitUnified/**.cpp'
33+
- 'examples/UnitUnified/**.hpp'
34+
- 'examples/UnitUnified/**.h'
35+
- 'examples/UnitUnified/**.c'
36+
- '.github/workflows/arduino-esp-v2-build-check.yml'
37+
workflow_dispatch:
38+
39+
defaults:
40+
run:
41+
shell: bash
42+
43+
concurrency:
44+
group: ${{ github.workflow }}-${{ github.ref }}
45+
cancel-in-progress: true
46+
47+
jobs:
48+
build:
49+
name: ${{ matrix.build-properties }}:${{ matrix.nfc }}/${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
50+
runs-on: ubuntu-latest
51+
timeout-minutes: 12
52+
53+
strategy:
54+
fail-fast: false
55+
max-parallel: 20
56+
matrix:
57+
platform-url:
58+
- https://espressif.github.io/arduino-esp32/package_esp32_index.json
59+
60+
sketch:
61+
- Detect
62+
63+
nfc:
64+
- NFCA
65+
- NFCB
66+
- NFCF
67+
- NFCV
68+
69+
build-properties:
70+
- "-DUSING_UNIT_NFC"
71+
72+
board:
73+
- m5stack-atom
74+
- m5stack-atoms3
75+
- m5stack-core-esp32
76+
- m5stack-core2
77+
- m5stack-coreink
78+
- m5stack-cores3
79+
- m5stack-fire
80+
81+
platform-version:
82+
- 2.0.17
83+
84+
platform:
85+
- esp32
86+
87+
archi:
88+
- esp32
89+
90+
include:
91+
# NFCA Specific sketches
92+
- sketch: Dump
93+
nfc: NFCA
94+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
95+
platform: esp32
96+
archi: esp32
97+
platform-version: 2.0.17
98+
board: m5stack-core-esp32
99+
build-properties: "-DUSING_UNIT_NFC"
100+
- sketch: ValueBlock
101+
nfc: NFCA
102+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
103+
platform: esp32
104+
archi: esp32
105+
platform-version: 2.0.17
106+
board: m5stack-core-esp32
107+
build-properties: "-DUSING_UNIT_NFC"
108+
- sketch: ReadWrite
109+
nfc: NFCA
110+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
111+
platform: esp32
112+
archi: esp32
113+
platform-version: 2.0.17
114+
board: m5stack-core-esp32
115+
build-properties: "-DUSING_UNIT_NFC"
116+
- sketch: NDEF
117+
nfc: NFCA
118+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
119+
platform: esp32
120+
archi: esp32
121+
platform-version: 2.0.17
122+
board: m5stack-core-esp32
123+
build-properties: "-DUSING_UNIT_NFC"
124+
- sketch: Emulation
125+
nfc: NFCA
126+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
127+
platform: esp32
128+
archi: esp32
129+
platform-version: 2.0.17
130+
board: m5stack-core-esp32
131+
build-properties: "-DUSING_UNIT_NFC"
132+
133+
# NFCB Specific sketches
134+
- sketch: JapanIDCard
135+
nfc: NFCB
136+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
137+
platform: esp32
138+
archi: esp32
139+
platform-version: 2.0.17
140+
board: m5stack-core-esp32
141+
build-properties: "-DUSING_UNIT_NFC"
142+
143+
# NFCF Specific sketches
144+
- sketch: Dump
145+
nfc: NFCF
146+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
147+
platform: esp32
148+
archi: esp32
149+
platform-version: 2.0.17
150+
board: m5stack-core-esp32
151+
build-properties: "-DUSING_UNIT_NFC"
152+
- sketch: NDEF
153+
nfc: NFCF
154+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
155+
platform: esp32
156+
archi: esp32
157+
platform-version: 2.0.17
158+
board: m5stack-core-esp32
159+
build-properties: "-DUSING_UNIT_NFC"
160+
- sketch: Subtract
161+
nfc: NFCF
162+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
163+
platform: esp32
164+
archi: esp32
165+
platform-version: 2.0.17
166+
board: m5stack-core-esp32
167+
build-properties: "-DUSING_UNIT_NFC"
168+
- sketch: ReadWriteMAC
169+
nfc: NFCF
170+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
171+
platform: esp32
172+
archi: esp32
173+
platform-version: 2.0.17
174+
board: m5stack-core-esp32
175+
build-properties: "-DUSING_UNIT_NFC"
176+
- sketch: JapanTransportationICCard
177+
nfc: NFCF
178+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
179+
platform: esp32
180+
archi: esp32
181+
platform-version: 2.0.17
182+
board: m5stack-core-esp32
183+
build-properties: "-DUSING_UNIT_NFC"
184+
- sketch: Emulation
185+
nfc: NFCF
186+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
187+
platform: esp32
188+
archi: esp32
189+
platform-version: 2.0.17
190+
board: m5stack-core-esp32
191+
build-properties: "-DUSING_UNIT_NFC"
192+
193+
# NFCV Specific sketches
194+
- sketch: Dump
195+
nfc: NFCV
196+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
197+
platform: esp32
198+
archi: esp32
199+
platform-version: 2.0.17
200+
board: m5stack-core-esp32
201+
build-properties: "-DUSING_UNIT_NFC"
202+
- sketch: NDEF
203+
nfc: NFCV
204+
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
205+
platform: esp32
206+
archi: esp32
207+
platform-version: 2.0.17
208+
board: m5stack-core-esp32
209+
build-properties: "-DUSING_UNIT_NFC"
210+
211+
steps:
212+
- name: Checkout
213+
uses: actions/checkout@v4
214+
215+
- name: Prepare libraries list
216+
id: libs
217+
run: |
218+
{
219+
echo "yaml<<EOF"
220+
echo "$REQUIRED_LIBRARIES" | tr ',' '\n' | while read -r lib; do
221+
echo "- name: $lib"
222+
done
223+
echo "- source-path: ./"
224+
echo "EOF"
225+
} >> "$GITHUB_OUTPUT"
226+
227+
- name: Compile examples
228+
uses: arduino/compile-sketches@v1
229+
with:
230+
fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
231+
platforms: |
232+
- name: ${{ matrix.platform }}:${{ matrix.archi }}
233+
source-url: ${{ matrix.platform-url }}
234+
version: ${{ matrix.platform-version }}
235+
libraries: ${{ steps.libs.outputs.yaml }}
236+
sketch-paths: |
237+
- ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.nfc }}/${{ matrix.sketch }}
238+
cli-compile-flags: |
239+
- --build-property
240+
- build.extra_flags=${{ matrix.build-properties }}

0 commit comments

Comments
 (0)