From f94edd23658d4ec336b712f725e88b783a99222e Mon Sep 17 00:00:00 2001 From: GOB Date: Mon, 30 Sep 2024 13:36:45 +0900 Subject: [PATCH 01/19] Fixes due to TVOC and KmeterISO integration --- examples/demo/MultipleUnits/main/MultipleUnits.cpp | 3 +-- test/unit_unified_test.cpp | 11 +++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/examples/demo/MultipleUnits/main/MultipleUnits.cpp b/examples/demo/MultipleUnits/main/MultipleUnits.cpp index 97c97e6..57bddec 100644 --- a/examples/demo/MultipleUnits/main/MultipleUnits.cpp +++ b/examples/demo/MultipleUnits/main/MultipleUnits.cpp @@ -17,10 +17,9 @@ #include #include #include -#include // ENVIII +#include // ENVIII,TVOC #include // Vmeter #include // HEART -#include // TVOC #include #if __has_include() #include diff --git a/test/unit_unified_test.cpp b/test/unit_unified_test.cpp index 2d942cf..2e50f56 100644 --- a/test/unit_unified_test.cpp +++ b/test/unit_unified_test.cpp @@ -15,8 +15,6 @@ #include #include #include -#include -#include #if 0 #include @@ -84,6 +82,8 @@ TEST(UnitUnified, EachUnit) each_unit_test(); each_unit_test(); each_unit_test(); + each_unit_test(); + // METER each_unit_test(); each_unit_test(); @@ -91,16 +91,15 @@ TEST(UnitUnified, EachUnit) each_unit_test(); each_unit_test(); each_unit_test(); + each_unit_test(); + // HEART each_unit_test(); // HUB each_unit_test(); // GESTURE each_unit_test(); - // KmeterISO - each_unit_test(); - // TVOC - each_unit_test(); + #if 0 each_unit_test(); each_unit_test(); From 98c7f102606f3a2293b08e6634ffa3df6d2a26dd Mon Sep 17 00:00:00 2001 From: GOB Date: Mon, 30 Sep 2024 13:37:36 +0900 Subject: [PATCH 02/19] Fixes wrong name and remove ignore settings --- platformio.ini | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/platformio.ini b/platformio.ini index c2b0d8e..1178a30 100644 --- a/platformio.ini +++ b/platformio.ini @@ -2,6 +2,8 @@ ; For UnitTest and examples ;----------------------------------------------------------------------- [platformio] +default_envs = test_native, test_Core, test_Core2, test_CoreS3, test_Fire, test_StampS3, test_Dial, test_AtomS3, test_NanoC6, test_StickCPlus, test_Paper + ;default_envs = Simple_Core, Simple_Core2, Simple_CoreS3, Simple_Fire, Simple_StampS3, Simple_Dial, Simple_AtomS3, Simple_NanoC6, Simple_StickCPlus, Simple_Paper, SelfUpdate_Core, SelfUpdate_Core2, SelfUpdate_CoreS3, SelfUpdate_Fire, SelfUpdate_StampS3, SelfUpdate_Dial, SelfUpdate_AtomS3, SelfUpdate_NanoC6, SelfUpdate_StickCPlus, SelfUpdate_Paper, ComponentOnly_Core, ComponentOnly_Core2, ComponentOnly_CoreS3, ComponentOnly_Fire, ComponentOnly_StampS3, ComponentOnly_Dial, ComponentOnly_AtomS3, ComponentOnly_NanoC6, ComponentOnly_StickCPlus, ComponentOnly_Paper, MultipleUnits_Core, MultipleUnits_Core2, MultipleUnits_CoreS3 [env] @@ -21,7 +23,7 @@ lib_deps=m5stack/M5Unified m5stack/M5Unit-HEART/ ; Using local, so ignore download by dependency -lib_ignore =M5UnitUnified +;lib_ignore =M5UnitUnified ; -------------------------------- [bsec2] @@ -197,7 +199,7 @@ lib_deps = ${StampS3.lib_deps} ${test_fw.lib_deps} [env:test_Dial] -extends=Dial3, option_release +extends=Dial, option_release lib_deps = ${Dial.lib_deps} ${test_fw.lib_deps} From 7316c1c2bed65202be44c23eb8a2b8394774921a Mon Sep 17 00:00:00 2001 From: GOB Date: Mon, 30 Sep 2024 13:38:03 +0900 Subject: [PATCH 03/19] Fixes wrong name and remove ignore settings --- platformio.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/platformio.ini b/platformio.ini index 1178a30..9acbc55 100644 --- a/platformio.ini +++ b/platformio.ini @@ -2,8 +2,7 @@ ; For UnitTest and examples ;----------------------------------------------------------------------- [platformio] -default_envs = test_native, test_Core, test_Core2, test_CoreS3, test_Fire, test_StampS3, test_Dial, test_AtomS3, test_NanoC6, test_StickCPlus, test_Paper - +;default_envs = test_native, test_Core, test_Core2, test_CoreS3, test_Fire, test_StampS3, test_Dial, test_AtomS3, test_NanoC6, test_StickCPlus, test_Paper ;default_envs = Simple_Core, Simple_Core2, Simple_CoreS3, Simple_Fire, Simple_StampS3, Simple_Dial, Simple_AtomS3, Simple_NanoC6, Simple_StickCPlus, Simple_Paper, SelfUpdate_Core, SelfUpdate_Core2, SelfUpdate_CoreS3, SelfUpdate_Fire, SelfUpdate_StampS3, SelfUpdate_Dial, SelfUpdate_AtomS3, SelfUpdate_NanoC6, SelfUpdate_StickCPlus, SelfUpdate_Paper, ComponentOnly_Core, ComponentOnly_Core2, ComponentOnly_CoreS3, ComponentOnly_Fire, ComponentOnly_StampS3, ComponentOnly_Dial, ComponentOnly_AtomS3, ComponentOnly_NanoC6, ComponentOnly_StickCPlus, ComponentOnly_Paper, MultipleUnits_Core, MultipleUnits_Core2, MultipleUnits_CoreS3 [env] From 68b8ff141595c3c95dc0d945e61af39515cf52f0 Mon Sep 17 00:00:00 2001 From: GOB Date: Wed, 16 Oct 2024 17:54:27 +0900 Subject: [PATCH 04/19] Add GitHub Pages URL --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 4dd7f21..0d0d1c3 100644 --- a/README.md +++ b/README.md @@ -144,6 +144,9 @@ The examples in this repository are for M5UnitUnified in general ## Doxygen document + +[GitHub Pages](https://m5stack.github.io/M5UnitUnified/) + If you want to generate documents on your local machine, execute the following command ``` From 42c1284b1564364b6cc59707a054b522e01d1832 Mon Sep 17 00:00:00 2001 From: GOB Date: Wed, 16 Oct 2024 17:55:17 +0900 Subject: [PATCH 05/19] Fixes syntax error --- platformio.ini | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/platformio.ini b/platformio.ini index 9acbc55..d5e9b46 100644 --- a/platformio.ini +++ b/platformio.ini @@ -15,11 +15,11 @@ test_build_src = true lib_deps=m5stack/M5Unified m5stack/M5Utility m5stack/M5HAL - m5stack/M5Unit-ENV/ - m5stack/M5Unit-METER/ - m5stack/M5Unit-HUB/ - m5stack/M5Unit-GESTURE/ - m5stack/M5Unit-HEART/ + m5stack/M5Unit-ENV + m5stack/M5Unit-METER + m5stack/M5Unit-HUB + m5stack/M5Unit-GESTURE + m5stack/M5Unit-HEART ; Using local, so ignore download by dependency ;lib_ignore =M5UnitUnified From 4b00ac7330fd001fddb06faa80b23c439e5b3a1b Mon Sep 17 00:00:00 2001 From: GOB Date: Wed, 16 Oct 2024 18:10:21 +0900 Subject: [PATCH 06/19] Add GitHub Pages URL --- README.ja.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.ja.md b/README.ja.md index bf0ac23..6344822 100644 --- a/README.ja.md +++ b/README.ja.md @@ -142,6 +142,9 @@ GPIO、UART は将来対応予定です。 ## Doxygen ドキュメント + +[GitHub Pages](https://m5stack.github.io/M5UnitUnified/) + あなたのローカルマシンでドキュメントを生成したい場合は、以下のコマンドを実行してください。 ``` bash docs/doxy.sh From b90a4f451c4e6f30d9814e2f534c81fbfe05b639 Mon Sep 17 00:00:00 2001 From: GOB Date: Wed, 9 Oct 2024 14:53:14 +0900 Subject: [PATCH 07/19] Add argumentto update --- src/M5UnitUnified.cpp | 4 ++-- src/M5UnitUnified.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/M5UnitUnified.cpp b/src/M5UnitUnified.cpp index 11e4cad..041f37f 100644 --- a/src/M5UnitUnified.cpp +++ b/src/M5UnitUnified.cpp @@ -111,12 +111,12 @@ bool UnitUnified::begin() }); } -void UnitUnified::update() +void UnitUnified::update(const bool force) { // Order of registration for (auto&& u : _units) { if (!u->_component_cfg.self_update && u->_begun) { - u->update(); + u->update(force); } } } diff --git a/src/M5UnitUnified.hpp b/src/M5UnitUnified.hpp index 2aae911..7954c04 100644 --- a/src/M5UnitUnified.hpp +++ b/src/M5UnitUnified.hpp @@ -71,7 +71,7 @@ class UnitUnified { //! @brief Begin of all units under management bool begin(); //! @brief Update of all units under management - void update(); + void update(const bool force = false); //! @brief Output information for debug std::string debugInfo() const; From 0ddeee996dd62f48eb924d91e28d18932ad9bf52 Mon Sep 17 00:00:00 2001 From: GOB Date: Wed, 9 Oct 2024 14:55:14 +0900 Subject: [PATCH 08/19] Fixes set clock --- src/m5_unit_component/adapter.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/m5_unit_component/adapter.cpp b/src/m5_unit_component/adapter.cpp index ba72798..6d56687 100644 --- a/src/m5_unit_component/adapter.cpp +++ b/src/m5_unit_component/adapter.cpp @@ -31,6 +31,7 @@ class WireImpl : public Adapter::Impl { virtual m5::hal::error::error_t readWithTransaction(uint8_t* data, const size_t len) override { assert(_addr); + _wire->setClock(_clock); if (data && _wire->requestFrom(_addr, len)) { auto count = std::min(len, (size_t)_wire->available()); @@ -45,11 +46,9 @@ class WireImpl : public Adapter::Impl { inline virtual m5::hal::error::error_t writeWithTransaction(const uint8_t* data, const size_t len, const bool stop) override { - _wire->setClock(_clock); return write_with_transaction(_addr, data, len, stop); } - // TODO: rename to writeRegisterWithTransaction() virtual m5::hal::error::error_t writeWithTransaction(const uint8_t reg, const uint8_t* data, const size_t len, const bool stop) override { @@ -94,13 +93,11 @@ class WireImpl : public Adapter::Impl { inline virtual m5::hal::error::error_t generalCall(const uint8_t* data, const size_t len) override { - _wire->setClock(_clock); return write_with_transaction(0x00, data, len, true); } virtual m5::hal::error::error_t wakeup() { - _wire->setClock(_clock); return write_with_transaction(_addr, nullptr, 0, true); } @@ -108,6 +105,7 @@ class WireImpl : public Adapter::Impl { m5::hal::error::error_t write_with_transaction(const uint8_t addr, const uint8_t* data, const size_t len, const bool stop) { + _wire->setClock(_clock); _wire->beginTransmission(addr); if (data) { _wire->write(data, len); From 8fc23a3eca130586be1ff418a85e491ec5fa05ec Mon Sep 17 00:00:00 2001 From: GOB Date: Wed, 9 Oct 2024 14:55:31 +0900 Subject: [PATCH 09/19] Add ToF4M and WeightI2C --- test/unit_unified_test.cpp | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/test/unit_unified_test.cpp b/test/unit_unified_test.cpp index 2e50f56..20df455 100644 --- a/test/unit_unified_test.cpp +++ b/test/unit_unified_test.cpp @@ -12,9 +12,11 @@ #include #include #include -#include #include #include +#include +#include +#include #if 0 #include @@ -93,13 +95,22 @@ TEST(UnitUnified, EachUnit) each_unit_test(); each_unit_test(); - // HEART - each_unit_test(); // HUB each_unit_test(); + // GESTURE each_unit_test(); + // HEART + each_unit_test(); + + // ToF4M + each_unit_test(); + + // Scale/Weight + each_unit_test(); + each_unit_test(); + #if 0 each_unit_test(); each_unit_test(); From d02d1d88ccc31dfe356db5b229f88be42237924c Mon Sep 17 00:00:00 2001 From: GOB Date: Wed, 9 Oct 2024 16:54:31 +0900 Subject: [PATCH 10/19] Update README --- README.ja.md | 8 ++++++-- README.md | 8 ++++++-- platformio.ini | 5 ++++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/README.ja.md b/README.ja.md index 6344822..7d06bf6 100644 --- a/README.ja.md +++ b/README.ja.md @@ -121,7 +121,7 @@ GPIO、UART は将来対応予定です。 - UnitCO2 - UnitENVIII - UnitTVOC - - UnitENVPro (いくつか問題があり修正中) + - UnitENVPro - [M5Unit-METER](https://github.com/m5stack/M5Unit-METER) - UnitAmeter - UnitVmeter @@ -132,13 +132,17 @@ GPIO、UART は将来対応予定です。 - UnitGESTURE - [M5Unit-HEART](https://github.com/m5stack/M5Unit-HEART) - UnitHEART +- [M5Unit-ToF4M](https://github.com/m5stack/M5Unit-ToF4M) + - UnitToF4M +- [M5Unit-WeightI2C](https://github.com/m5stack/M5Unit-WeightI2C) + - UnitWeightI2C 他のユニットは開発、確認後追加されます。 ## Examples 各ユニットのサンプルについては、各ユニットのリポジトリを参照してください。 -このリポジトリにあるサンプルはM5UnitUnified全般のものです。 +[このリポジトリにあるサンプル](examples/Basic)は M5UnitUnified 全般のものです。 ## Doxygen ドキュメント diff --git a/README.md b/README.md index 0d0d1c3..dce782c 100644 --- a/README.md +++ b/README.md @@ -124,7 +124,7 @@ Other devices will be added after confirmation of operation. - UnitCO2 - UnitENVIII - UnitTVOC - - UnitENVPro (There are a few problems) + - UnitENVPro - [M5Unit-METER](https://github.com/m5stack/M5Unit-METER) - UnitAmeter - UnitVmeter @@ -135,12 +135,16 @@ Other devices will be added after confirmation of operation. - UnitGESTURE - [M5Unit-HEART](https://github.com/m5stack/M5Unit-HEART) - UnitHEART +- [M5Unit-ToF4M](https://github.com/m5stack/M5Unit-ToF4M) + - UnitToF4M +- [M5Unit-WeightI2C](https://github.com/m5stack/M5Unit-WeightI2C) + - UnitWeightI2C Other units will be added after they are developed and tested. ## Examples For exampless of each unit, please refer to the respective unit's repository. -The examples in this repository are for M5UnitUnified in general +[The examples in this repository](examples/Basic) are for M5UnitUnified in general ## Doxygen document diff --git a/platformio.ini b/platformio.ini index d5e9b46..0ffaa98 100644 --- a/platformio.ini +++ b/platformio.ini @@ -8,8 +8,11 @@ [env] build_flags = -Wall -Wextra -Wreturn-local-addr -Werror=format -Werror=return-local-addr -I"./src" +; -I".pio/libdeps/${PIOENV}/M5HAL/src" + lib_ldf_mode = deep +;lib_ldf_mode = chain+ test_framework = googletest test_build_src = true lib_deps=m5stack/M5Unified @@ -170,7 +173,7 @@ lib_deps = ${sdl.lib_deps} lib_compat_mode= off ; Removal of out-of-M5UnitUnified files that cause errors extra_scripts = pre:custom_script.py -custom_exclude_src_files=bme68xLibrary.cpp bsec2.cpp BMP280.cpp DHT12.cpp M5Unit-ENV/I2C_Class.cpp SCD4X.cpp SHT3X.cpp M5Unit-ENV/QMP6988.cpp SHT4X.cpp utility.cpp M5UnitKmeterISO.cpp +custom_exclude_src_files=bme68xLibrary.cpp bsec2.cpp BMP280.cpp DHT12.cpp M5Unit-ENV/I2C_Class.cpp SCD4X.cpp SHT3X.cpp M5Unit-ENV/QMP6988.cpp SHT4X.cpp utility.cpp M5UnitKmeterISO.cpp M5UnitWeightI2C.cpp [env:test_Core] extends=Core, option_release From 3992a1eae4f9a8e7aad80adb3abbb40016917c89 Mon Sep 17 00:00:00 2001 From: GOB Date: Wed, 16 Oct 2024 17:50:57 +0900 Subject: [PATCH 11/19] Fixes setClock --- src/m5_unit_component/adapter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/m5_unit_component/adapter.cpp b/src/m5_unit_component/adapter.cpp index 6d56687..98f5a3c 100644 --- a/src/m5_unit_component/adapter.cpp +++ b/src/m5_unit_component/adapter.cpp @@ -31,7 +31,7 @@ class WireImpl : public Adapter::Impl { virtual m5::hal::error::error_t readWithTransaction(uint8_t* data, const size_t len) override { assert(_addr); - _wire->setClock(_clock); + //_wire->setClock(_clock); DON'T CALL if (data && _wire->requestFrom(_addr, len)) { auto count = std::min(len, (size_t)_wire->available()); @@ -105,7 +105,7 @@ class WireImpl : public Adapter::Impl { m5::hal::error::error_t write_with_transaction(const uint8_t addr, const uint8_t* data, const size_t len, const bool stop) { - _wire->setClock(_clock); + _wire->setClock(_clock); // _wire->beginTransmission(addr); if (data) { _wire->write(data, len); From 1e56bbca6b595f342554de9ff0ad75f6e1ee6dfe Mon Sep 17 00:00:00 2001 From: GOB Date: Wed, 16 Oct 2024 17:51:11 +0900 Subject: [PATCH 12/19] Some tweaks --- src/M5UnitUnified.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/M5UnitUnified.cpp b/src/M5UnitUnified.cpp index 041f37f..a597334 100644 --- a/src/M5UnitUnified.cpp +++ b/src/M5UnitUnified.cpp @@ -102,6 +102,7 @@ bool UnitUnified::add_children(Component& u) bool UnitUnified::begin() { return !std::any_of(_units.begin(), _units.end(), [](Component* c) { + M5_LIB_LOGV("Try begin:%s", c->deviceName()); bool ret = c->_begun = c->begin(); if (!ret) { M5_LIB_LOGE("Failed to begin: [%s] ID:{0X%08X} ADDR{0X%02X}", c->deviceName(), c->identifier(), From 8862df872dd588073513f99aebcc005946f45d84 Mon Sep 17 00:00:00 2001 From: GOB Date: Wed, 16 Oct 2024 17:52:49 +0900 Subject: [PATCH 13/19] Unit-HEART Correction due to changes --- examples/demo/MultipleUnits/main/MultipleUnits.cpp | 2 +- .../demo/MultipleUnits/src/ui/ui_UnitHEART.cpp | 14 +++++++++----- .../demo/MultipleUnits/src/ui/ui_UnitHEART.hpp | 6 +++--- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/examples/demo/MultipleUnits/main/MultipleUnits.cpp b/examples/demo/MultipleUnits/main/MultipleUnits.cpp index 57bddec..21f208b 100644 --- a/examples/demo/MultipleUnits/main/MultipleUnits.cpp +++ b/examples/demo/MultipleUnits/main/MultipleUnits.cpp @@ -123,7 +123,7 @@ void prepare() tvocSmallUI.construct(); vmeterSmallUI.construct(); env3SmallUI.construct(); - heartSmallUI.heartRate().setSampleRate(m5::max30100::HeartRate::getSampleRate(unitHeart.config().sample_rate)); + heartSmallUI.monitor().setSamplingRate(m5::unit::max30100::getSamplingRate(unitHeart.config().sampling_rate)); } // task for Vmeter diff --git a/examples/demo/MultipleUnits/src/ui/ui_UnitHEART.cpp b/examples/demo/MultipleUnits/src/ui/ui_UnitHEART.cpp index 93ad472..beddae3 100644 --- a/examples/demo/MultipleUnits/src/ui/ui_UnitHEART.cpp +++ b/examples/demo/MultipleUnits/src/ui/ui_UnitHEART.cpp @@ -56,11 +56,15 @@ void UnitHEARTSmallUI::update() lock(); for (auto&& e : _intermediateBuffer) { - beat(_heartRate.push_back(e.ir, e.red)); - _bpm = _heartRate.calculate(); + _monitor.push_back(e.ir, e.red); + _monitor.update(); - _irPlotter->push_back(e.ir); - _spO2Plotter->push_back(_heartRate.SpO2()); + beat(_monitor.isBeat()); + _bpm = _monitor.bpm(); + + // _irPlotter->push_back(e.ir); + _irPlotter->push_back(_monitor.latestIR()); + _spO2Plotter->push_back(_monitor.SpO2()); } _intermediateBuffer.clear(); unlock(); @@ -94,7 +98,7 @@ void UnitHEARTSmallUI::push(LovyanGFX* dst, const int32_t x, const int32_t y) dst->drawString(s.c_str(), left + GAP * 2, top + GAP * 2 + _irPlotter->height()); dst->setTextDatum(textdatum_t::bottom_right); - s = m5::utility::formatString("SpO2:%3.2f%%", _heartRate.SpO2()); + s = m5::utility::formatString("SpO2:%3.2f%%", _monitor.SpO2()); dst->drawString(s.c_str(), right - GAP, bottom - _spO2Plotter->height() - GAP); constexpr int32_t radius{4}; diff --git a/examples/demo/MultipleUnits/src/ui/ui_UnitHEART.hpp b/examples/demo/MultipleUnits/src/ui/ui_UnitHEART.hpp index 43b5214..c00aade 100644 --- a/examples/demo/MultipleUnits/src/ui/ui_UnitHEART.hpp +++ b/examples/demo/MultipleUnits/src/ui/ui_UnitHEART.hpp @@ -21,9 +21,9 @@ class UnitHEARTSmallUI : public UnitUIBase { { } - inline m5::max30100::HeartRate& heartRate() + inline m5::heart::PulseMonitor& monitor() { - return _heartRate; + return _monitor; } inline void beat(bool beated) @@ -42,7 +42,7 @@ class UnitHEARTSmallUI : public UnitUIBase { private: std::unique_ptr _irPlotter{}; std::unique_ptr _spO2Plotter{}; - m5::max30100::HeartRate _heartRate{}; + m5::heart::PulseMonitor _monitor{100.0f}; int32_t _beatCounter{}, _bpm{}; struct Data { From de333a8c2f91113ddc1f5ea7bb0f4fa0aebebe5a Mon Sep 17 00:00:00 2001 From: GOB Date: Wed, 16 Oct 2024 20:02:20 +0900 Subject: [PATCH 14/19] Fixes syntax error --- .github/workflows/clang-format-check.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml index 9a21956..e541485 100644 --- a/.github/workflows/clang-format-check.yml +++ b/.github/workflows/clang-format-check.yml @@ -13,7 +13,9 @@ on: - '**.c' - '**.inl' - '**clang-format-check.yml' - pull_request: + - '**.clang-format' + pull_request: + paths: - '**.ino' - '**.cpp' - '**.hpp' @@ -21,6 +23,8 @@ on: - '**.c' - '**.inl' - '**clang-format-check.yml' + - '**.clang-format' + workflow_dispatch: jobs: formatting-check: @@ -29,12 +33,12 @@ jobs: strategy: matrix: path: - #- check: './' # path to include - # exclude: '' # path to exclude - check: 'src' + exclude: '' - check: 'test' - - check: 'examples' - # exclude: '(Fonts)' # Exclude file paths containing "Fonts" + exclude: '' + - check: 'examples/Basic' + exclude: '' steps: - name: Checkout @@ -49,3 +53,4 @@ jobs: check-path: ${{ matrix.path['check'] }} exclude-regex: ${{ matrix.path['exclude'] }} include-regex: ${{ env.INCLUDE_REGEX }} + From 569b629af4d9aa7e49bf087f65701bd8dd984e4d Mon Sep 17 00:00:00 2001 From: GOB Date: Wed, 16 Oct 2024 20:06:04 +0900 Subject: [PATCH 15/19] Cosmetic change --- src/m5_unit_component/adapter.cpp | 4 ++-- test/unit_unified_test.cpp | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/m5_unit_component/adapter.cpp b/src/m5_unit_component/adapter.cpp index 98f5a3c..c928011 100644 --- a/src/m5_unit_component/adapter.cpp +++ b/src/m5_unit_component/adapter.cpp @@ -31,7 +31,7 @@ class WireImpl : public Adapter::Impl { virtual m5::hal::error::error_t readWithTransaction(uint8_t* data, const size_t len) override { assert(_addr); - //_wire->setClock(_clock); DON'T CALL + //_wire->setClock(_clock); DON'T CALL if (data && _wire->requestFrom(_addr, len)) { auto count = std::min(len, (size_t)_wire->available()); @@ -105,7 +105,7 @@ class WireImpl : public Adapter::Impl { m5::hal::error::error_t write_with_transaction(const uint8_t addr, const uint8_t* data, const size_t len, const bool stop) { - _wire->setClock(_clock); // + _wire->setClock(_clock); // _wire->beginTransmission(addr); if (data) { _wire->write(data, len); diff --git a/test/unit_unified_test.cpp b/test/unit_unified_test.cpp index 20df455..0bba9ba 100644 --- a/test/unit_unified_test.cpp +++ b/test/unit_unified_test.cpp @@ -15,8 +15,8 @@ #include #include #include -#include -#include +#include +#include #if 0 #include @@ -104,13 +104,14 @@ TEST(UnitUnified, EachUnit) // HEART each_unit_test(); - // ToF4M - each_unit_test(); + // ToF + each_unit_test(); + each_unit_test(); - // Scale/Weight + // WEIGHT each_unit_test(); each_unit_test(); - + #if 0 each_unit_test(); each_unit_test(); From b8370b9c1f6c697e4a9f10353cf61ab5403bab24 Mon Sep 17 00:00:00 2001 From: GOB Date: Fri, 25 Oct 2024 15:33:26 +0900 Subject: [PATCH 16/19] Add and fixes boards --- boards/m5stack-atoms3r.json | 41 +++++++++++++++++++++++++++++++++++++ boards/m5stack-nanoc6.json | 2 +- boards/m5stick-cplus2.json | 40 ++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 boards/m5stack-atoms3r.json create mode 100644 boards/m5stick-cplus2.json diff --git a/boards/m5stack-atoms3r.json b/boards/m5stack-atoms3r.json new file mode 100644 index 0000000..1c9ecce --- /dev/null +++ b/boards/m5stack-atoms3r.json @@ -0,0 +1,41 @@ +{ + "build": { + "arduino": { + "memory_type": "qio_opi", + "ldscript": "esp32s3_out.ld", + "partitions": "default_8MB.csv" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_M5STACK_ATOMS3R", + "-DBOARD_HAS_PSRAM", + "-DARDUINO_USB_MODE=1", + "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "dio", + "mcu": "esp32s3", + "variant": "m5stack_atoms3" + }, + "connectivity": [ + "bluetooth", + "wifi" + ], + "frameworks": [ + "arduino", + "espidf" + ], + "name": "M5Stack AtomS3R", + "upload": { + "flash_size": "8MB", + "maximum_ram_size": 327680, + "maximum_size": 8388608, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://docs.m5stack.com/en/core/AtomS3R", + "vendor": "M5Stack" +} diff --git a/boards/m5stack-nanoc6.json b/boards/m5stack-nanoc6.json index cae742e..ddaad65 100644 --- a/boards/m5stack-nanoc6.json +++ b/boards/m5stack-nanoc6.json @@ -2,7 +2,7 @@ "build": { "core": "esp32", "extra_flags": [ - "-DARDUINO_M5Stack_NanoC6" + "-DARDUINO_M5STACK_NANOC6" ], "f_cpu": "160000000L", "f_flash": "80000000L", diff --git a/boards/m5stick-cplus2.json b/boards/m5stick-cplus2.json new file mode 100644 index 0000000..91fa2ca --- /dev/null +++ b/boards/m5stick-cplus2.json @@ -0,0 +1,40 @@ +{ + "build": { + "arduino":{ + "ldscript": "esp32_out.ld", + "partitions": "default_8MB.csv" + }, + "core": "esp32", + "extra_flags": [ + "-DM5STACK_M5STICK_CPLUS2", + "-DBOARD_HAS_PSRAM", + "-mfix-esp32-psram-cache-issue", + "-mfix-esp32-psram-cache-strategy=memw", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "dio", + "mcu": "esp32", + "variant": "m5stick_c" + }, + "connectivity": [ + "wifi", + "bluetooth" + ], + "frameworks": [ + "arduino", + "espidf" + ], + "name": "M5Stick-CPlus2", + "upload": { + "flash_size": "8MB", + "maximum_ram_size": 327680, + "maximum_size": 8388608, + "require_upload_port": true, + "speed": 1500000 + }, + "url": "https://docs.m5stack.com/en/core/M5StickC%20PLUS2", + "vendor": "M5Stack" +} From c588594ee5eed2c29d215f9344c5261598900a79 Mon Sep 17 00:00:00 2001 From: GOB Date: Fri, 25 Oct 2024 15:34:30 +0900 Subject: [PATCH 17/19] Add some units and cores --- README.ja.md | 47 ++++++++++----- README.md | 48 +++++++++++----- platformio.ini | 115 ++++++++++++++++++++++++++++++------- test/unit_unified_test.cpp | 4 +- 4 files changed, 165 insertions(+), 49 deletions(-) diff --git a/README.ja.md b/README.ja.md index 7d06bf6..5f574c2 100644 --- a/README.ja.md +++ b/README.ja.md @@ -100,17 +100,37 @@ ESP-IDF は将来対応予定です。 GPIO、UART は将来対応予定です。 -### サポートされる Core デバイス (動作確認済) -- M5Stack Core (BASIC / GRAY / FIRE) -- M5Stack Core2 -- M5Stick CPlus -- M5Paper -- M5Stack CoreS3 CoreS3SE -- M5ATOMS3 -- M5STAMPS3 -- M5Dial -- M5Capsule -- M5NanoC6 +### サポートされるデバイス (動作確認済) +こちらを参照 https://docs.m5stack.com/en/products + +- CORE + - [BASIC](https://docs.m5stack.com/en/core/basic) + - [2.6](https://docs.m5stack.com/en/core/BASIC%20v2.6) + - [GRAY](https://docs.m5stack.com/en/core/gray) + - [Core2](https://docs.m5stack.com/en/core/core2) + - [For AWS](https://docs.m5stack.com/en/core/core2_for_aws) + - [v.1.1](https://docs.m5stack.com/en/core/Core2%20v1.1) + - [CoreS3](https://docs.m5stack.com/en/core/CoreS3) + - [CoreS3 SE](https://docs.m5stack.com/en/core/M5CoreS3%20SE) + - [FIRE](https://docs.m5stack.com/en/core/fire) + - [v2.6](https://docs.m5stack.com/en/core/fire_v2.6) + - [M5Dial](https://docs.m5stack.com/en/core/M5Dial) + - [M5Capsule](https://docs.m5stack.com/en/core/M5Capsule) + - [M5DinMeter](https://docs.m5stack.com/en/core/M5DinMeter) + - [M5NanoC6](https://docs.m5stack.com/en/core/M5NanoC6) +- STICK + - [M5Stick CPlus](https://docs.m5stack.com/en/core/m5stickc_plus) + - [M5Stick CPlus2](https://docs.m5stack.com/en/core/M5StickC%20PLUS2) +- ATOM + - [ATOM Matrix](https://docs.m5stack.com/en/core/ATOM%20Matrix) + - [AtomS3](https://docs.m5stack.com/en/core/AtomS3) + - [AtomS3R](https://docs.m5stack.com/en/core/AtomS3R) + - [AtomS3R Cam](https://docs.m5stack.com/en/core/AtomS3R%20Cam) +- STAMP + - [StampS3](https://docs.m5stack.com/en/core/StampS3) +- E-PAPER + - [CORE.INK](https://docs.m5stack.com/en/core/coreink) + - [M5PAPER](https://docs.m5stack.com/en/core/m5paper) 他のデバイスは動作確認されたのち追加されます。 @@ -132,9 +152,10 @@ GPIO、UART は将来対応予定です。 - UnitGESTURE - [M5Unit-HEART](https://github.com/m5stack/M5Unit-HEART) - UnitHEART -- [M5Unit-ToF4M](https://github.com/m5stack/M5Unit-ToF4M) +- [M5Unit-TOF](https://github.com/m5stack/M5Unit-TOF) + - UnitToF - UnitToF4M -- [M5Unit-WeightI2C](https://github.com/m5stack/M5Unit-WeightI2C) +- [M5Unit-WEIGHT](https://github.com/m5stack/M5Unit-WEIGHT) - UnitWeightI2C 他のユニットは開発、確認後追加されます。 diff --git a/README.md b/README.md index dce782c..46877ac 100644 --- a/README.md +++ b/README.md @@ -101,18 +101,37 @@ Support ESP-IDF with M5HAL in the future. Support GPIO, UART in the future. -### Supported core device (Operation confirmed) - -- M5Stack Core (BASIC / GRAY / FIRE) -- M5Stack Core2 -- M5Stick CPlus -- M5Paper -- M5Stack CoreS3 CoreS3SE -- M5ATOMS3 -- M5STAMPS3 -- M5Dial -- M5Capsule -- M5NanoC6 +### Supported devices (Operation confirmed) +See also https://docs.m5stack.com/en/products + +- CORE + - [BASIC](https://docs.m5stack.com/en/core/basic) + - [2.6](https://docs.m5stack.com/en/core/BASIC%20v2.6) + - [GRAY](https://docs.m5stack.com/en/core/gray) + - [Core2](https://docs.m5stack.com/en/core/core2) + - [For AWS](https://docs.m5stack.com/en/core/core2_for_aws) + - [v.1.1](https://docs.m5stack.com/en/core/Core2%20v1.1) + - [CoreS3](https://docs.m5stack.com/en/core/CoreS3) + - [CoreS3 SE](https://docs.m5stack.com/en/core/M5CoreS3%20SE) + - [FIRE](https://docs.m5stack.com/en/core/fire) + - [v2.6](https://docs.m5stack.com/en/core/fire_v2.6) + - [M5Dial](https://docs.m5stack.com/en/core/M5Dial) + - [M5Capsule](https://docs.m5stack.com/en/core/M5Capsule) + - [M5DinMeter](https://docs.m5stack.com/en/core/M5DinMeter) + - [M5NanoC6](https://docs.m5stack.com/en/core/M5NanoC6) +- STICK + - [M5Stick CPlus](https://docs.m5stack.com/en/core/m5stickc_plus) + - [M5Stick CPlus2](https://docs.m5stack.com/en/core/M5StickC%20PLUS2) +- ATOM + - [ATOM Matrix](https://docs.m5stack.com/en/core/ATOM%20Matrix) + - [AtomS3](https://docs.m5stack.com/en/core/AtomS3) + - [AtomS3R](https://docs.m5stack.com/en/core/AtomS3R) + - [AtomS3R Cam](https://docs.m5stack.com/en/core/AtomS3R%20Cam) +- STAMP + - [StampS3](https://docs.m5stack.com/en/core/StampS3) +- E-PAPER + - [CORE.INK](https://docs.m5stack.com/en/core/coreink) + - [M5PAPER](https://docs.m5stack.com/en/core/m5paper) Other devices will be added after confirmation of operation. @@ -135,9 +154,10 @@ Other devices will be added after confirmation of operation. - UnitGESTURE - [M5Unit-HEART](https://github.com/m5stack/M5Unit-HEART) - UnitHEART -- [M5Unit-ToF4M](https://github.com/m5stack/M5Unit-ToF4M) +- [M5Unit-TOF](https://github.com/m5stack/M5Unit-TOF) + - UnitToF - UnitToF4M -- [M5Unit-WeightI2C](https://github.com/m5stack/M5Unit-WeightI2C) +- [M5Unit-WEIGHT](https://github.com/m5stack/M5Unit-WEIGHT) - UnitWeightI2C Other units will be added after they are developed and tested. diff --git a/platformio.ini b/platformio.ini index 0ffaa98..f287c84 100644 --- a/platformio.ini +++ b/platformio.ini @@ -2,13 +2,10 @@ ; For UnitTest and examples ;----------------------------------------------------------------------- [platformio] -;default_envs = test_native, test_Core, test_Core2, test_CoreS3, test_Fire, test_StampS3, test_Dial, test_AtomS3, test_NanoC6, test_StickCPlus, test_Paper -;default_envs = Simple_Core, Simple_Core2, Simple_CoreS3, Simple_Fire, Simple_StampS3, Simple_Dial, Simple_AtomS3, Simple_NanoC6, Simple_StickCPlus, Simple_Paper, SelfUpdate_Core, SelfUpdate_Core2, SelfUpdate_CoreS3, SelfUpdate_Fire, SelfUpdate_StampS3, SelfUpdate_Dial, SelfUpdate_AtomS3, SelfUpdate_NanoC6, SelfUpdate_StickCPlus, SelfUpdate_Paper, ComponentOnly_Core, ComponentOnly_Core2, ComponentOnly_CoreS3, ComponentOnly_Fire, ComponentOnly_StampS3, ComponentOnly_Dial, ComponentOnly_AtomS3, ComponentOnly_NanoC6, ComponentOnly_StickCPlus, ComponentOnly_Paper, MultipleUnits_Core, MultipleUnits_Core2, MultipleUnits_CoreS3 [env] build_flags = -Wall -Wextra -Wreturn-local-addr -Werror=format -Werror=return-local-addr -I"./src" -; -I".pio/libdeps/${PIOENV}/M5HAL/src" lib_ldf_mode = deep @@ -23,14 +20,13 @@ lib_deps=m5stack/M5Unified m5stack/M5Unit-HUB m5stack/M5Unit-GESTURE m5stack/M5Unit-HEART + m5stack/M5Unit-TOF + m5stack/M5Unit-WEIGHT ; Using local, so ignore download by dependency ;lib_ignore =M5UnitUnified ; -------------------------------- -[bsec2] -lib_deps = https://github.com/boschsensortec/Bosch-BSEC2-Library.git @ 1.8.2610 - [m5base] monitor_speed = 115200 monitor_filters = esp32_exception_decoder, time @@ -46,49 +42,52 @@ framework = arduino [Core] extends = m5base board = m5stack-grey -;m5stack-core-esp32-16M -;m5stack-grey +;m5stack-core-esp32-16M ;;6.8.0 or later ;m5stack-core-esp32 lib_deps = ${env.lib_deps} - ${bsec2.lib_deps} [Core2] extends = m5base board = m5stack-core2 lib_deps = ${env.lib_deps} - ${bsec2.lib_deps} [CoreS3] extends = m5base board = m5stack-cores3 lib_deps = ${env.lib_deps} - ${bsec2.lib_deps} [Fire] extends = m5base -board =m5stack-fire +board = m5stack-fire lib_deps = ${env.lib_deps} - ${bsec2.lib_deps} [StampS3] -;include M5Capsule +;include M5Capsule, DinMeter extends = m5base board = m5stack-stamps3 lib_deps = ${env.lib_deps} - ${bsec2.lib_deps} [Dial] extends = m5base board = m5stack-stamps3 lib_deps = ${env.lib_deps} - ${bsec2.lib_deps} m5stack/M5Dial +[AtomMatrix] +extends = m5base +board = m5stack-atom +lib_deps = ${env.lib_deps} + [AtomS3] extends = m5base board = m5stack-atoms3 lib_deps = ${env.lib_deps} - ${bsec2.lib_deps} + +; Using ./boards/m5stack-atoms3r.json +[AtomS3R] +extends = m5base +board = m5stack-atoms3r +lib_deps = ${env.lib_deps} ; Using ./boards/m5stack-nanoc6.json [NanoC6] @@ -105,14 +104,22 @@ lib_deps = ${env.lib_deps} extends = m5base board = m5stick-c lib_deps = ${env.lib_deps} - ${bsec2.lib_deps} + +; Using ./boards/m5stick-cplus2.json +[StickCPlus2] +extends = m5base +board = m5stick-cplus2 +lib_deps = ${env.lib_deps} [Paper] extends = m5base board = m5stack-fire -; Using M5Fire instead of the M5Paper(Noting...) lib_deps = ${env.lib_deps} - ${bsec2.lib_deps} + +[CoreInk] +extends = m5base +board = m5stack-coreink +lib_deps = ${env.lib_deps} [sdl] build_flags = -O3 -xc++ -std=c++14 -lSDL2 @@ -205,11 +212,21 @@ extends=Dial, option_release lib_deps = ${Dial.lib_deps} ${test_fw.lib_deps} +[env:test_AtomMatrix] +extends=AtomMatrix, option_release +lib_deps = ${AtomMatrix.lib_deps} + ${test_fw.lib_deps} + [env:test_AtomS3] extends=AtomS3, option_release lib_deps = ${AtomS3.lib_deps} ${test_fw.lib_deps} +[env:test_AtomS3R] +extends=AtomS3R, option_release +lib_deps = ${AtomS3R.lib_deps} + ${test_fw.lib_deps} + [env:test_NanoC6] extends=NanoC6, option_release lib_deps = ${NanoC6.lib_deps} @@ -220,11 +237,21 @@ extends=StickCPlus, option_release lib_deps = ${StickCPlus.lib_deps} ${test_fw.lib_deps} +[env:test_StickCPlus2] +extends=StickCPlus2, option_release +lib_deps = ${StickCPlus2.lib_deps} + ${test_fw.lib_deps} + [env:test_Paper] extends=Paper, option_release lib_deps = ${Paper.lib_deps} ${test_fw.lib_deps} +[env:test_CoreInk] +extends=CoreInk, option_release +lib_deps = ${CoreInk.lib_deps} + ${test_fw.lib_deps} + ;examples Simple [env:Simple_Core] extends=Core, option_release @@ -250,10 +277,18 @@ build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/Simple> extends=Dial, option_release build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/Simple> +[env:Simple_AtomMatrix] +extends=AtomMatrix, option_release +build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/Simple> + [env:Simple_AtomS3] extends=AtomS3, option_release build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/Simple> +[env:Simple_AtomS3R] +extends=AtomS3R, option_release +build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/Simple> + [env:Simple_NanoC6] extends=NanoC6, option_release build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/Simple> @@ -262,10 +297,18 @@ build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/Simple> extends=StickCPlus, option_release build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/Simple> +[env:Simple_StickCPlus2] +extends=StickCPlus2, option_release +build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/Simple> + [env:Simple_Paper] extends=Paper, option_release build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/Simple> +[env:Simple_CoreInk] +extends=CoreInk, option_release +build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/Simple> + ;examples SelfUpdate [env:SelfUpdate_Core] extends=Core, option_release @@ -291,10 +334,18 @@ build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/SelfUpdate> extends=Dial, option_release build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/SelfUpdate> +[env:SelfUpdate_AtomMatrix] +extends=AtomMatrix, option_release +build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/SelfUpdate> + [env:SelfUpdate_AtomS3] extends=AtomS3, option_release build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/SelfUpdate> +[env:SelfUpdate_AtomS3R] +extends=AtomS3R, option_release +build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/SelfUpdate> + [env:SelfUpdate_NanoC6] extends=NanoC6, option_release build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/SelfUpdate> @@ -303,10 +354,18 @@ build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/SelfUpdate> extends=StickCPlus, option_release build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/SelfUpdate> +[env:SelfUpdate_StickCPlus2] +extends=StickCPlus2, option_release +build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/SelfUpdate> + [env:SelfUpdate_Paper] extends=Paper, option_release build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/SelfUpdate> +[env:SelfUpdate_CoreInk] +extends=CoreInk, option_release +build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/SelfUpdate> + ;examples ComponentOnly [env:ComponentOnly_Core] extends=Core, option_release @@ -332,10 +391,18 @@ build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/ComponentOnly> extends=Dial, option_release build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/ComponentOnly> +[env:ComponentOnly_AtomMatrix] +extends=AtomMatrix, option_release +build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/ComponentOnly> + [env:ComponentOnly_AtomS3] extends=AtomS3, option_release build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/ComponentOnly> +[env:ComponentOnly_AtomS3R] +extends=AtomS3R, option_release +build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/ComponentOnly> + [env:ComponentOnly_NanoC6] extends=NanoC6, option_release build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/ComponentOnly> @@ -344,10 +411,18 @@ build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/ComponentOnly> extends=StickCPlus, option_release build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/ComponentOnly> +[env:ComponentOnly_StickCPlus2] +extends=StickCPlus2, option_release +build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/ComponentOnly> + [env:ComponentOnly_Paper] extends=Paper, option_release build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/ComponentOnly> +[env:ComponentOnly_CoreInk] +extends=CoreInk, option_release +build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/Basic/ComponentOnly> + ;demo MultipleUnits [env:MultipleUnits_Core] extends=Core, option_release diff --git a/test/unit_unified_test.cpp b/test/unit_unified_test.cpp index 0bba9ba..a73c5ee 100644 --- a/test/unit_unified_test.cpp +++ b/test/unit_unified_test.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #if 0 @@ -104,7 +104,7 @@ TEST(UnitUnified, EachUnit) // HEART each_unit_test(); - // ToF + // TOF each_unit_test(); each_unit_test(); From c1ab2524da359e34cef2b8a4e675467bbbdf13bb Mon Sep 17 00:00:00 2001 From: GOB Date: Fri, 25 Oct 2024 15:47:03 +0900 Subject: [PATCH 18/19] Fixes conditions --- .github/workflows/clang-format-check.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml index e541485..dfcecbb 100644 --- a/.github/workflows/clang-format-check.yml +++ b/.github/workflows/clang-format-check.yml @@ -5,6 +5,11 @@ env: on: push: + tags-ignore: + - '*.*.*' + - 'v*.*.*' + branches: + - '*' paths: - '**.ino' - '**.cpp' From 6b98b1a6d663280754c1cf76f8ef04f5636a6f2c Mon Sep 17 00:00:00 2001 From: GOB Date: Fri, 25 Oct 2024 15:59:13 +0900 Subject: [PATCH 19/19] Raise version --- library.json | 7 +++---- library.properties | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/library.json b/library.json index 94cc6af..95d66d1 100644 --- a/library.json +++ b/library.json @@ -14,7 +14,7 @@ "M5Utility": "https://github.com/m5stack/M5Utility.git", "M5HAL": "https://github.com/m5stack/M5HAL.git" }, - "version": "0.0.1", + "version": "0.0.2", "frameworks": [ "arduino" ], @@ -24,9 +24,8 @@ "headers": "M5UnitUnified.h", "license": "MIT", "export": { - "exclude": - [ + "exclude": [ "docs/html" ] } -} +} \ No newline at end of file diff --git a/library.properties b/library.properties index 12c77a3..b910513 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=M5UnitUnified -version=0.0.1 +version=0.0.2 author=M5Stack maintainer=M5Stack sentence=M5UnitUnified is a library for unified handling of various M5 units products. (Alpha version)