From d5c653e18d72e67943e60bcce512bbad7a98a6c4 Mon Sep 17 00:00:00 2001 From: h1romas4 Date: Mon, 18 Dec 2023 14:14:08 +0900 Subject: [PATCH] update M5Core2 0.1.8 --- README.md | 2 +- components/m5stack/CMakeLists.txt | 10 +++++++++- components/m5stack/M5Core2 | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c8c2fe5..40049f8 100644 --- a/README.md +++ b/README.md @@ -180,7 +180,7 @@ Thanks for all the open source. |-|-|--| |[esp-idf](https://docs.espressif.com/projects/esp-idf/en/release-v4.4/esp32/get-started/index.html)|`v4.4.6`|BSD License| |[arduino-esp32](https://github.com/espressif/arduino-esp32)|`2.0.14`|LGPL-2.1 License| -|[M5Core2](https://github.com/m5stack/M5Core2)|`0.1.6`|MIT License| +|[M5Core2](https://github.com/m5stack/M5Core2)|`0.1.8`|MIT License| |[M5EPD](https://github.com/m5stack/M5EPD)|`0.1.5`|MIT License| |[lwgps](https://github.com/MaJerle/lwgps)|`v2.1.0`|MIT License| |[Wasm3](https://github.com/wasm3/wasm3)|master(`045040a9`)|MIT License| diff --git a/components/m5stack/CMakeLists.txt b/components/m5stack/CMakeLists.txt index e5fd30c..05213db 100644 --- a/components/m5stack/CMakeLists.txt +++ b/components/m5stack/CMakeLists.txt @@ -14,12 +14,14 @@ set(INCLUDEDIRS ) set(SRCS + M5Core2/src/INA3221.cpp M5Core2/src/Fonts/Font32rle.c M5Core2/src/Fonts/Font64rle.c M5Core2/src/Fonts/Font7srle.c M5Core2/src/Fonts/Font16.c M5Core2/src/Fonts/Font72rle.c M5Core2/src/Fonts/glcdfont.c + M5Core2/src/AXP.cpp M5Core2/src/M5Display.cpp M5Core2/src/M5Core2.cpp M5Core2/src/utility/quaternionFilters.cpp @@ -34,9 +36,10 @@ set(SRCS M5Core2/src/utility/PointAndZone.cpp M5Core2/src/utility/MPU6886.cpp M5Core2/src/RTC.cpp + M5Core2/src/Speaker.cpp + M5Core2/src/AXP2101.cpp M5Core2/src/M5Touch.cpp M5Core2/src/AXP192.cpp - M5Core2/src/Speaker.cpp # FreeType M5EPD/src/font_render.c M5EPD/src/ffsupport.cpp @@ -126,3 +129,8 @@ set_source_files_properties(M5Core2/src/utility/Sprite.cpp PROPERTIES COMPILE_FLAGS -Wno-error=comment ) + +set_source_files_properties(M5Core2/src/INA3221.cpp + PROPERTIES + COMPILE_FLAGS "-Wno-error=switch -Wno-error=maybe-uninitialized" +) diff --git a/components/m5stack/M5Core2 b/components/m5stack/M5Core2 index cb65d23..b1cf076 160000 --- a/components/m5stack/M5Core2 +++ b/components/m5stack/M5Core2 @@ -1 +1 @@ -Subproject commit cb65d23319b9a6ce0478513b1ad1da4c63cc34d5 +Subproject commit b1cf076bba304fdd0729107b6e5cecc9d544c6ed