Some tweaks

m5stack · Oct 16, 2024 · 926437d · 926437d
1 parent ce2aaf4
commit 926437d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/unit/unit_KmeterISO.cpp b/src/unit/unit_KmeterISO.cpp
@@ -160,8 +160,8 @@ bool UnitKmeterISO::changeI2CAddress(const uint8_t i2c_address)
         bool done{};
         auto timeout_at = m5::utility::millis() + 1000;
         do {
-            done = readRegister8(I2C_ADDRESS_REG, v, 0) && v == i2c_address;
             m5::utility::delay(1);
+            done = readRegister8(I2C_ADDRESS_REG, v, 0) && v == i2c_address;
         } while (!done && m5::utility::millis() <= timeout_at);
         return done;
     }

diff --git a/test/embedded/avmeter_template.hpp b/test/embedded/avmeter_template.hpp
@@ -6,9 +6,6 @@
 /*
   UnitTest for UnitADS111x
 */
-
-// Move to each libarry
-
 #include <gtest/gtest.h>
 #include <Wire.h>
 #include <M5Unified.h>

diff --git a/test/embedded/test_kmeterISO/kmeterISO_test.cpp b/test/embedded/test_kmeterISO/kmeterISO_test.cpp
@@ -148,6 +148,8 @@ TEST_P(TestKmeterISO, I2CAddress)
     EXPECT_TRUE(unit->changeI2CAddress(0x08));
     EXPECT_TRUE(unit->readI2CAddress(addr));
     EXPECT_EQ(addr, 0x08);
+    EXPECT_EQ(unit->address(), 0x08);
+
     EXPECT_TRUE(unit->readFirmwareVersion(ver));
     EXPECT_NE(ver, 0x00);
     EXPECT_TRUE(unit->measureSingleshot(d));
@@ -156,6 +158,8 @@ TEST_P(TestKmeterISO, I2CAddress)
     EXPECT_TRUE(unit->changeI2CAddress(0x77));
     EXPECT_TRUE(unit->readI2CAddress(addr));
     EXPECT_EQ(addr, 0x77);
+    EXPECT_EQ(unit->address(), 0x77);
+
     EXPECT_TRUE(unit->readFirmwareVersion(ver));
     EXPECT_NE(ver, 0x00);
     EXPECT_TRUE(unit->measureSingleshot(d));
@@ -164,6 +168,8 @@ TEST_P(TestKmeterISO, I2CAddress)
     EXPECT_TRUE(unit->changeI2CAddress(0x52));
     EXPECT_TRUE(unit->readI2CAddress(addr));
     EXPECT_EQ(addr, 0x52);
+    EXPECT_EQ(unit->address(), 0528);
+
     EXPECT_TRUE(unit->readFirmwareVersion(ver));
     EXPECT_NE(ver, 0x00);
     EXPECT_TRUE(unit->measureSingleshot(d));
@@ -172,6 +178,8 @@ TEST_P(TestKmeterISO, I2CAddress)
     EXPECT_TRUE(unit->changeI2CAddress(UnitKmeterISO::DEFAULT_ADDRESS));
     EXPECT_TRUE(unit->readI2CAddress(addr));
     EXPECT_EQ(addr, +UnitKmeterISO::DEFAULT_ADDRESS);
+    EXPECT_EQ(unit->address(), +UnitKmeterISO::DEFAULT_ADDRESS);
+
     EXPECT_TRUE(unit->readFirmwareVersion(ver));
     EXPECT_NE(ver, 0x00);
     EXPECT_TRUE(unit->measureSingleshot(d));