Format Code

Author: Tinyu-Zhao

src/AXP2101.cpp

@@ -258,14 +258,6 @@ void write1Byte(uint8_t dev_addr, uint8_t addr, uint8_t data) {
     Wire1.endTransmission();
 }
 
-uint8_t read1Byte(uint8_t dev_addr, uint8_t addr) {
-    Wire1.beginTransmission(dev_addr);
-    Wire1.write(addr);
-    Wire1.endTransmission();
-    Wire1.requestFrom(dev_addr, (size_t)1);
-    return Wire1.read();
-}
-
 static constexpr uint8_t AW9523_REG_CONFIG0  = 0x04;
 static constexpr uint8_t AW9523_REG_CONFIG1  = 0x05;
 static constexpr uint8_t AW9523_REG_GCR      = 0x11;
@@ -275,7 +267,7 @@ static constexpr uint8_t AW9523_REG_LEDMODE1 = 0x13;
 void AXP2101::coreS3_init() {
     write1Byte(0x69, 0b00110101);  // AXP CHG_LED
     //  write1Byte(0x97, (0b11110 - 2));
-    write1Byte(0x90, 0xBF);  // AXP ALDO~4,BLDO0~2,DIDO1 Enable
+    write1Byte(0x90, 0xBF);        // AXP ALDO~4,BLDO0~2,DIDO1 Enable
     write1Byte(0x95, 0b00011100);  // AXP ALDO4 voltage / SD card / 3.3 V
 
     write1Byte(AW9523_ADDR, 0x02, 0b00000101);  // P0
@@ -303,31 +295,37 @@ void AXP2101::coreS3_AW9523_init() {
     write1Byte(0x58, 0x02, 0b00000100);
 }
 
-void AXP2101::set_BOOST_EN(bool state) {
-    uint8_t value = read1Byte(AW9523_ADDR, 0x03);
-    if(state == true) value |= 0b10000000;
-    else value &= ~0b10000000;
+void AXP2101::setBoostEn(bool state) {
+    uint8_t value = read8Bit(AW9523_ADDR, 0x03);
+    if (state == true)
+        value |= 0b10000000;
+    else
+        value &= ~0b10000000;
     write1Byte(AW9523_ADDR, 0x03, value);
 }
 
-void AXP2101::set_BUS_OUT_EN(bool state) {
-    uint8_t value = read1Byte(AW9523_ADDR, 0x02);
-    if(state == true) value |= 0b00000010;
-    else value &= ~0b00000010;
+void AXP2101::setBusOutEn(bool state) {
+    uint8_t value = read8Bit(AW9523_ADDR, 0x02);
+    if (state == true)
+        value |= 0b00000010;
+    else
+        value &= ~0b00000010;
     write1Byte(AW9523_ADDR, 0x02, value);
 }
 
-void AXP2101::set_BOOST_BUS_OUT_EN(bool state) {
-    set_BOOST_EN(state);
+void AXP2101::setBoostBusOutEn(bool state) {
+    setBoostEn(state);
     // delay is required to prevent reverse current flow from VBUS to BUS_OUT
-    if(state == false) delay(250);
-    set_BUS_OUT_EN(state);
+    if (state == false) delay(250);
+    setBusOutEn(state);
 }
 
-void AXP2101::set_USB_OTG_EN(bool state) {
-    uint8_t value = read1Byte(AW9523_ADDR, 0x02);
-    if(state == true) value |= 0b00100000;
-    else value &= ~0b00100000;
+void AXP2101::setUsbOtgEn(bool state) {
+    uint8_t value = read8Bit(AW9523_ADDR, 0x02);
+    if (state == true)
+        value |= 0b00100000;
+    else
+        value &= ~0b00100000;
     write1Byte(AW9523_ADDR, 0x02, value);
 }
 

src/AXP2101.h

@@ -104,10 +104,10 @@ class AXP2101 : public I2C_PORT {
     void coreS3_init();  ////
     void coreS3_AW9523_init();
 
-    void set_BOOST_EN(bool state);
-    void set_BUS_OUT_EN(bool state);
-    void set_BOOST_BUS_OUT_EN(bool state);
-    void set_USB_OTG_EN(bool state);
+    void setBoostEn(bool state);
+    void setBusOutEn(bool state);
+    void setBoostBusOutEn(bool state);
+    void setUsbOtgEn(bool state);
 
     void coreS3_VBUS_boost(bool state);
 };

src/utility/I2C_PORT.cpp

@@ -34,6 +34,14 @@ uint8_t I2C_PORT::read8Bit(uint8_t subAddress) {
     return _wire->read();
 }
 
+uint8_t I2C_PORT::read8Bit(uint8_t address, uint8_t subAddress) {
+    _wire->beginTransmission(address);
+    _wire->write(subAddress);
+    _wire->endTransmission();
+    _wire->requestFrom(address, (size_t)1);
+    return _wire->read();
+}
+
 uint16_t I2C_PORT::read12Bit(uint8_t subAddress) {
     uint8_t buff[2];
     readBuff(subAddress, 2, buff);

src/utility/I2C_PORT.h

@@ -21,6 +21,7 @@ class I2C_PORT {
     void write1Byte(uint8_t address, uint8_t subAddress, uint8_t data);
     void write16Bit(uint8_t subAddress, uint8_t data_1, uint8_t data_2);
     uint8_t read8Bit(uint8_t subAddress);
+    uint8_t read8Bit(uint8_t address, uint8_t subAddress);
     uint16_t read12Bit(uint8_t subAddress);
     uint16_t read13Bit(uint8_t subAddress);
     uint16_t read16Bit(uint8_t subAddress);