From e6bc8b573f60f20138620f6da8983c06a192c091 Mon Sep 17 00:00:00 2001
From: ainyan03 <ainyan03@users.noreply.github.com>
Date: Tue, 18 Aug 2026 04:26:23 +0000
Subject: [PATCH] Use m5gfx::delay for internal hardware waits

---
 src/M5Unified.cpp                   | 4 ++--
 src/utility/power/BQ27220_Class.cpp | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/M5Unified.cpp b/src/M5Unified.cpp
index 9c6dce1..c447497 100644
--- a/src/M5Unified.cpp
+++ b/src/M5Unified.cpp
@@ -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;
     }
   }
@@ -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 と同一の終端状態)
     }
diff --git a/src/utility/power/BQ27220_Class.cpp b/src/utility/power/BQ27220_Class.cpp
index 8786c1a..db2baf9 100644
--- a/src/utility/power/BQ27220_Class.cpp
+++ b/src/utility/power/BQ27220_Class.cpp
@@ -3,7 +3,7 @@
 
 #include "BQ27220_Class.hpp"
 
-#include <M5Unified.h>
+#include <M5GFX.h>
 
 #include <algorithm>
 #include <math.h>
@@ -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;
       }
@@ -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);