Skip to content

update v0.5 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Forairaaaaa merged 1 commit into from
May 28, 2026
Merged

update v0.5 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion main/apps/common/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@

namespace common {

inline constexpr std::string_view FirmwareVersion = "V0.4";
inline constexpr std::string_view FirmwareVersion = "V0.5";

}
4 changes: 2 additions & 2 deletions main/assets/fonts/CommissionerMedium108.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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*/
Expand Down
4 changes: 2 additions & 2 deletions main/assets/fonts/CommissionerMedium64.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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*/
Expand Down
4 changes: 2 additions & 2 deletions main/hal/hal_ioe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ void Hal::ioe_init()
_ioe = std::make_unique<M5IOE1>();
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) {
Expand Down
4 changes: 2 additions & 2 deletions main/hal/hal_pmic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading