From c40c0680419c8f8e133210206074bac7a427b609 Mon Sep 17 00:00:00 2001 From: Forairaaaaa Date: Thu, 28 May 2026 17:22:36 +0800 Subject: [PATCH] update v0.5 --- main/apps/common/common.h | 2 +- main/assets/fonts/CommissionerMedium108.c | 4 ++-- main/assets/fonts/CommissionerMedium64.c | 4 ++-- main/hal/hal_ioe.cpp | 4 ++-- main/hal/hal_pmic.cpp | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/main/apps/common/common.h b/main/apps/common/common.h index d1cc83aa..63888bb8 100644 --- a/main/apps/common/common.h +++ b/main/apps/common/common.h @@ -8,6 +8,6 @@ namespace common { -inline constexpr std::string_view FirmwareVersion = "V0.4"; +inline constexpr std::string_view FirmwareVersion = "V0.5"; } diff --git a/main/assets/fonts/CommissionerMedium108.c b/main/assets/fonts/CommissionerMedium108.c index 8760ca38..32c7a197 100644 --- a/main/assets/fonts/CommissionerMedium108.c +++ b/main/assets/fonts/CommissionerMedium108.c @@ -2,7 +2,7 @@ * Size: 108 px * Bpp: 2 * Opts: --bpp 2 --size 108 --no-compress --stride 1 --align 1 --font Commissioner-Medium.ttf --symbols 0123456789:(). - *--format lvgl -o CommissionerMedium108.c + * --format lvgl -o CommissionerMedium108.c ******************************************************************************/ #ifdef __has_include @@ -723,7 +723,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = { #if LVGL_VERSION_MAJOR >= 8 const lv_font_t CommissionerMedium108 = { #else -lv_font_t CommissionerMedium108 = { +lv_font_t CommissionerMedium108 = { #endif .get_glyph_dsc = lv_font_get_glyph_dsc_fmt_txt, /*Function pointer to get glyph's data*/ .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt, /*Function pointer to get glyph's bitmap*/ diff --git a/main/assets/fonts/CommissionerMedium64.c b/main/assets/fonts/CommissionerMedium64.c index ca0fcbd5..5ea6c6b6 100644 --- a/main/assets/fonts/CommissionerMedium64.c +++ b/main/assets/fonts/CommissionerMedium64.c @@ -2,7 +2,7 @@ * Size: 64 px * Bpp: 2 * Opts: --bpp 2 --size 64 --no-compress --stride 1 --align 1 --font Commissioner-Medium.ttf --symbols 0123456789:() - *--format lvgl -o CommissionerMedium64.c + * --format lvgl -o CommissionerMedium64.c ******************************************************************************/ #ifdef __has_include @@ -351,7 +351,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = { #if LVGL_VERSION_MAJOR >= 8 const lv_font_t CommissionerMedium64 = { #else -lv_font_t CommissionerMedium64 = { +lv_font_t CommissionerMedium64 = { #endif .get_glyph_dsc = lv_font_get_glyph_dsc_fmt_txt, /*Function pointer to get glyph's data*/ .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt, /*Function pointer to get glyph's bitmap*/ diff --git a/main/hal/hal_ioe.cpp b/main/hal/hal_ioe.cpp index 89b6910f..cc56797e 100644 --- a/main/hal/hal_ioe.cpp +++ b/main/hal/hal_ioe.cpp @@ -43,11 +43,11 @@ void Hal::ioe_init() _ioe = std::make_unique(); auto* bus = i2c_bus_get_internal_bus_handle(_i2c_bus); uint8_t selected_addr = _ioe_addr_primary; - auto ret = _ioe->begin(bus, _ioe_addr_primary); + auto ret = _ioe->begin(bus, _ioe_addr_primary, M5IOE1_I2C_FREQ_400K); if (ret != M5IOE1_OK) { selected_addr = _ioe_addr_secondary; - ret = _ioe->begin(bus, _ioe_addr_secondary); + ret = _ioe->begin(bus, _ioe_addr_secondary, M5IOE1_I2C_FREQ_400K); } if (ret != M5IOE1_OK) { diff --git a/main/hal/hal_pmic.cpp b/main/hal/hal_pmic.cpp index 2da200fe..1ae455c8 100644 --- a/main/hal/hal_pmic.cpp +++ b/main/hal/hal_pmic.cpp @@ -104,8 +104,8 @@ void Hal::pmic_init() _pm1->btnSetConfig(M5PM1_BTN_TYPE_CLICK, M5PM1_BTN_CLICK_DELAY_1000MS); // disable WDT, default is open _pm1->wdtSet(0); - // hold LDO power close when power off, default is close - _pm1->ldoSetPowerHold(false); + // hold LDO power close when power off, keep power for RTC + _pm1->ldoSetPowerHold(true); // set charge enable or disable, this setting will keep working after power off _pm1->setChargeEnable(true);