Skip to content

Commit f196fcd

Browse files
GOB52GOB52
committed
Merge branch 'develop'
2 parents 1fdab41 + 62b10c3 commit f196fcd

29 files changed

+2669
-854
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@ on:
44
branches: [ master, main ]
55
pull_request:
66
branches: [ master, main ]
7+
workflow_dispatch:
8+
9+
defaults:
10+
run:
11+
shell: bash
12+
13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.ref }}
15+
cancel-in-progress: true
16+
717
jobs:
818
lint:
919
name: Lint Check

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@ on:
3131
- '**.clang-format'
3232
workflow_dispatch:
3333

34+
defaults:
35+
run:
36+
shell: bash
37+
38+
concurrency:
39+
group: ${{ github.workflow }}-${{ github.ref }}
40+
cancel-in-progress: true
41+
3442
jobs:
3543
formatting-check:
3644
name: Formatting Check

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@ on: [release, workflow_dispatch]
33
# branches:
44
# - main
55
# - master
6+
7+
defaults:
8+
run:
9+
shell: bash
10+
11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: true
14+
615
jobs:
716
deploy:
817
runs-on: ubuntu-latest

‎README.ja.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,9 @@ ESP-IDF は将来対応予定です。
9696

9797
### サポートされる通信
9898
- TwoWire による I2C 通信
99+
- GPIO (現在は各ユニットに必要な機能のみ搭載）
99100

100-
GPIO、UART は将来対応予定です。
101+
UART は将来対応予定です。
101102

102103
### サポートされるデバイス,ユニット
103104
[Wiki](https://github.com/m5stack/M5UnitUnified/wiki/)を参照

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,9 @@ Support ESP-IDF with M5HAL in the future.
9898

9999
### Supported connection
100100
- I2C with TwoWire
101+
- GPIO (Currently only functions required for the units are included)
101102

102-
Support GPIO, UART in the future.
103+
Support UART in the future.
103104

104105
### Supported devices, units
105106
See also [Wiki](https://github.com/m5stack/M5UnitUnified/wiki/)

‎library.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
"url": "https://github.com/m5stack/M5UnitUnified.git"
1212
},
1313
"dependencies": {
14-
"M5Utility": "https://github.com/m5stack/M5Utility.git",
15-
"M5HAL": "https://github.com/m5stack/M5HAL.git"
14+
"m5stack/M5Utility": "*",
15+
"m5stack/M5HAL": "*"
1616
},
17-
"version": "0.0.6",
17+
"version": "0.1.0",
1818
"frameworks": [
1919
"arduino"
2020
],

‎library.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=M5UnitUnified
2-
version=0.0.6
2+
version=0.1.0
33
author=M5Stack
44
maintainer=M5Stack
55
sentence=M5UnitUnified is a library for unified handling of various M5 units products. (Alpha version)

‎pio_project/platformio.ini‎

Lines changed: 12 additions & 190 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
; For UnitTest and examples using M5UnitUnified local sources
33
;-----------------------------------------------------------------------
44
[platformio]
5+
src_dir = ../src
56

67
[env]
78
build_flags = -Wall -Wextra -Wreturn-local-addr -Werror=format -Werror=return-local-addr
@@ -10,7 +11,8 @@ test_framework = googletest
1011
test_build_src = true
1112

1213
; My local sources
13-
lib_extra_dirs = ../
14+
lib_extra_dirs = ./lib
15+
../
1416

1517
lib_ldf_mode = deep
1618
lib_deps=m5stack/M5Unified
@@ -26,10 +28,15 @@ lib_deps=m5stack/M5Unified
2628
m5stack/M5Unit-ANADIG
2729
m5stack/M5Unit-COLOR
2830
m5stack/M5Unit-THERMO
31+
m5stack/M5Unit-EXTIO
32+
m5stack/M5Unit-INFRARED
33+
m5stack/M5Unit-CRYPTO
2934
https://github.com/m5stack/M5Unit-RFID
3035
https://github.com/m5stack/M5Unit-DISTANCE
31-
https://github.com/m5stack/M5Unit-EXTIO
3236
https://github.com/m5stack/M5Unit-KEYBOARD
37+
; https://github.com/m5stack/M5Unit-KEYBOARD#develop
38+
; boschsensortec/BME68x Sensor [email protected]
39+
; boschsensortec/[email protected]
3340

3441
; Ignore DL'd M5UnitUnified, using local!
3542
lib_ignore = M5UnitUnified
@@ -103,10 +110,12 @@ extends = m5base
103110
board = m5stack-nanoc6
104111
platform = https://github.com/platformio/platform-espressif32.git
105112
platform_packages =
106-
platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#idf-release/v5.1
113+
platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.7
107114
platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-libs.git#idf-release/v5.1
108115
board_build.partitions = default.csv
109116
lib_deps = ${env.lib_deps}
117+
lib_ignore = ${env.lib_ignore}
118+
bsec2
110119

111120
[StickCPlus]
112121
extends = m5base
@@ -263,190 +272,3 @@ extends=CoreInk, option_release
263272
lib_deps = ${CoreInk.lib_deps}
264273
${test_fw.lib_deps}
265274

266-
;examples Simple
267-
[env:Simple_Core]
268-
extends=Core, option_release
269-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/Simple>
270-
271-
[env:Simple_Core2]
272-
extends=Core2, option_release
273-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/Simple>
274-
275-
[env:Simple_CoreS3]
276-
extends=CoreS3, option_release
277-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/Simple>
278-
279-
[env:Simple_Fire]
280-
extends=Fire, option_release
281-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/Simple>
282-
283-
[env:Simple_StampS3]
284-
extends=StampS3, option_release
285-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/Simple>
286-
287-
[env:Simple_Dial]
288-
extends=Dial, option_release
289-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/Simple>
290-
291-
[env:Simple_AtomMatrix]
292-
extends=AtomMatrix, option_release
293-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/Simple>
294-
295-
[env:Simple_AtomS3]
296-
extends=AtomS3, option_release
297-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/Simple>
298-
299-
[env:Simple_AtomS3R]
300-
extends=AtomS3R, option_release
301-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/Simple>
302-
303-
[env:Simple_NanoC6]
304-
extends=NanoC6, option_release
305-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/Simple>
306-
307-
[env:Simple_StickCPlus]
308-
extends=StickCPlus, option_release
309-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/Simple>
310-
311-
[env:Simple_StickCPlus2]
312-
extends=StickCPlus2, option_release
313-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/Simple>
314-
315-
[env:Simple_Paper]
316-
extends=Paper, option_release
317-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/Simple>
318-
319-
[env:Simple_CoreInk]
320-
extends=CoreInk, option_release
321-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/Simple>
322-
323-
;examples SelfUpdate
324-
[env:SelfUpdate_Core]
325-
extends=Core, option_release
326-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/SelfUpdate>
327-
328-
[env:SelfUpdate_Core2]
329-
extends=Core2, option_release
330-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/SelfUpdate>
331-
332-
[env:SelfUpdate_CoreS3]
333-
extends=CoreS3, option_release
334-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/SelfUpdate>
335-
336-
[env:SelfUpdate_Fire]
337-
extends=Fire, option_release
338-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/SelfUpdate>
339-
340-
[env:SelfUpdate_StampS3]
341-
extends=StampS3, option_release
342-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/SelfUpdate>
343-
344-
[env:SelfUpdate_Dial]
345-
extends=Dial, option_release
346-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/SelfUpdate>
347-
348-
[env:SelfUpdate_AtomMatrix]
349-
extends=AtomMatrix, option_release
350-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/SelfUpdate>
351-
352-
[env:SelfUpdate_AtomS3]
353-
extends=AtomS3, option_release
354-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/SelfUpdate>
355-
356-
[env:SelfUpdate_AtomS3R]
357-
extends=AtomS3R, option_release
358-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/SelfUpdate>
359-
360-
[env:SelfUpdate_NanoC6]
361-
extends=NanoC6, option_release
362-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/SelfUpdate>
363-
364-
[env:SelfUpdate_StickCPlus]
365-
extends=StickCPlus, option_release
366-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/SelfUpdate>
367-
368-
[env:SelfUpdate_StickCPlus2]
369-
extends=StickCPlus2, option_release
370-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/SelfUpdate>
371-
372-
[env:SelfUpdate_Paper]
373-
extends=Paper, option_release
374-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/SelfUpdate>
375-
376-
[env:SelfUpdate_CoreInk]
377-
extends=CoreInk, option_release
378-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/SelfUpdate>
379-
380-
;examples ComponentOnly
381-
[env:ComponentOnly_Core]
382-
extends=Core, option_release
383-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/ComponentOnly>
384-
385-
[env:ComponentOnly_Core2]
386-
extends=Core2, option_release
387-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/ComponentOnly>
388-
389-
[env:ComponentOnly_CoreS3]
390-
extends=CoreS3, option_release
391-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/ComponentOnly>
392-
393-
[env:ComponentOnly_Fire]
394-
extends=Fire, option_release
395-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/ComponentOnly>
396-
397-
[env:ComponentOnly_StampS3]
398-
extends=StampS3, option_release
399-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/ComponentOnly>
400-
401-
[env:ComponentOnly_Dial]
402-
extends=Dial, option_release
403-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/ComponentOnly>
404-
405-
[env:ComponentOnly_AtomMatrix]
406-
extends=AtomMatrix, option_release
407-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/ComponentOnly>
408-
409-
[env:ComponentOnly_AtomS3]
410-
extends=AtomS3, option_release
411-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/ComponentOnly>
412-
413-
[env:ComponentOnly_AtomS3R]
414-
extends=AtomS3R, option_release
415-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/ComponentOnly>
416-
417-
[env:ComponentOnly_NanoC6]
418-
extends=NanoC6, option_release
419-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/ComponentOnly>
420-
421-
[env:ComponentOnly_StickCPlus]
422-
extends=StickCPlus, option_release
423-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/ComponentOnly>
424-
425-
[env:ComponentOnly_StickCPlus2]
426-
extends=StickCPlus2, option_release
427-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/ComponentOnly>
428-
429-
[env:ComponentOnly_Paper]
430-
extends=Paper, option_release
431-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/ComponentOnly>
432-
433-
[env:ComponentOnly_CoreInk]
434-
extends=CoreInk, option_release
435-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/Basic/ComponentOnly>
436-
437-
;demo MultipleUnits
438-
[env:MultipleUnits_Core]
439-
extends=Core, option_release
440-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/demo/MultipleUnits>
441-
442-
[env:MultipleUnits_Core2]
443-
extends=Core2, option_release
444-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/demo/MultipleUnits>
445-
446-
[env:MultipleUnits_CoreS3]
447-
extends=CoreS3, option_release
448-
build_src_filter = +<*> -<.git/> -<.svn/> +<../../examples/demo/MultipleUnits>
449-
450-
451-
452-

‎pio_project/test/unit_dummy.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class UnitDummy : public m5::unit::Component {
1818
M5_UNIT_COMPONENT_HPP_BUILDER(UnitDummy, 0x00);
1919

2020
public:
21-
UnitDummy() : Component(0x00)
21+
UnitDummy() : Component(0x01)
2222
{
2323
}
2424
virtual ~UnitDummy()

‎pio_project/test/unit_unified_test.cpp‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
*/
99
#include <gtest/gtest.h>
1010
#include <M5Unified.h>
11+
1112
#include <M5UnitComponent.hpp>
1213
#include <M5UnitUnified.hpp>
14+
1315
#include <M5UnitUnifiedENV.h>
1416
#include <M5UnitUnifiedMETER.h>
1517
#include <M5UnitUnifiedHUB.h>
@@ -25,6 +27,8 @@
2527
#include <M5UnitUnifiedDISTANCE.h>
2628
#include <M5UnitUnifiedEXTIO.h>
2729
#include <M5UnitUnifiedKEYBOARD.h>
30+
#include <M5UnitUnifiedINFRARED.h>
31+
#include <M5UnitUnifiedCRYPTO.h>
2832

2933
#include <algorithm>
3034
#include <utility>
@@ -122,14 +126,17 @@ TEST(UnitUnified, EachUnit)
122126
// ANADIG
123127
each_unit_test<m5::unit::UnitMCP4725>();
124128
each_unit_test<m5::unit::UnitGP8413>();
129+
each_unit_test<m5::unit::UnitADS11XX>();
125130
each_unit_test<m5::unit::UnitADS1110>();
131+
each_unit_test<m5::unit::UnitADS1100>();
126132

127133
// COLOR
128134
each_unit_test<m5::unit::UnitTCS34725>();
129135

130136
// THERMO
131137
each_unit_test<m5::unit::UnitMLX90614>();
132138
each_unit_test<m5::unit::UnitMLX90614BAA>();
139+
each_unit_test<m5::unit::UnitNCIR2>();
133140

134141
// RFID
135142
each_unit_test<m5::unit::UnitMFRC522>();
@@ -147,6 +154,13 @@ TEST(UnitUnified, EachUnit)
147154
each_unit_test<m5::unit::UnitCardKB>();
148155
each_unit_test<m5::unit::UnitFacesQWERTY>();
149156

157+
// INFRARED
158+
each_unit_test<m5::unit::UnitSTHS34PF80>();
159+
160+
// CRYPTO
161+
each_unit_test<m5::unit::UnitATECC608B>();
162+
each_unit_test<m5::unit::UnitATECC608B_TNGTLS>();
163+
150164
for (auto&& e : vec) {
151165
delete e;
152166
}

0 commit comments

Comments
 (0)