Skip to content

Use m5gfx::delay for internal hardware waits #327

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
lovyan03 merged 1 commit into from
Aug 18, 2026
Merged

Use m5gfx::delay for internal hardware waits #327

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
4 changes: 2 additions & 2 deletions src/M5Unified.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ static constexpr const uint8_t _pin_table_mbus[][31] = {
while (*bulk_data) {
uint8_t len = *bulk_data++;
uint8_t r = retry + 1;
while (!M5.In_I2C.writeRegister(i2c_addr, bulk_data[0], &bulk_data[1], len - 1, i2c_freq) && --r) { M5.delay(1); }
while (!M5.In_I2C.writeRegister(i2c_addr, bulk_data[0], &bulk_data[1], len - 1, i2c_freq) && --r) { m5gfx::delay(1); }
bulk_data += len;
}
}
Expand Down Expand Up @@ -764,7 +764,7 @@ static constexpr const uint8_t _pin_table_mbus[][31] = {
// 状態へ落としてから終了することで、次回 enable を常に定義済み状態から始める。
M5.In_I2C.bitOff(pi4io1_i2c_addr, 0x05, 0b00000010, 400000); // AMP off (過渡音を出さない)
M5.In_I2C.writeRegister8(es8388_i2c_addr, 25, 0x24, 400000); // DACCONTROL3: mute (SoftRamp 維持)
M5.delay(1); // soft-ramp 遷移待ち
m5gfx::delay(1); // soft-ramp 遷移待ち
M5.In_I2C.writeRegister8(es8388_i2c_addr, 4, 0xC0, 400000); // DACPOWER: DAC L/R down + 全出力 off
M5.In_I2C.writeRegister8(es8388_i2c_addr, 2, 0xFF, 400000); // CHIPPOWER: 全停止 (ADF deinit と同一の終端状態)
}
Expand Down
6 changes: 3 additions & 3 deletions src/utility/power/BQ27220_Class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "BQ27220_Class.hpp"

#include <M5Unified.h>
#include <M5GFX.h>

#include <algorithm>
#include <math.h>
Expand All @@ -21,7 +21,7 @@ namespace m5
if (length == 0) {
return true;
}
M5.delay(10);
m5gfx::delay(10);
if (_i2c->readRegister(_addr, 0x3E, regData, length, _freq)) {
return true;
}
Expand All @@ -38,7 +38,7 @@ namespace m5
read_MuxAddrdata(0x00, 0x0001, read_data, 4);
// printf("BQ27220 W:0x00->0x0001 R:0x%02X %02X %02X %02X\r\n", read_data[0], read_data[1], read_data[2], read_data[3]);

M5.delay(200);
m5gfx::delay(200);

// exit_sealed
read_MuxAddrdata(0x00, 0x8000);
Expand Down
Loading