Drastically simplify I2C code - its needlessly complicated.

Author: aentinger

examples/C33-Low-Power/C33-Low-Power.ino

@@ -32,6 +32,9 @@ void setup()
   PMIC.configLDO3(Ldo3Voltage::V_1_20, false, false, false);
   PMIC.configSw2(Sw2Voltage::V_3_30, Sw2Voltage::V_3_30, Sw2Voltage::V_3_30, Sw2CurrentLimit::I_1_5_A, false, false, false);
 
+  Serial.print("Device ID = ");
+  Serial.println(PMIC.getDeviceId(), HEX);
+
   p_cfg.low_power_mode = LPM_MODE_DEEP; //  LPM_MODE_SLEEP  LPM_MODE_STANDBY    LPM_MODE_STANDBY_SNOOZE    LPM_MODE_DEEP
   p_cfg.standby_wake_sources = LPM_STANDBY_WAKE_SOURCE_IRQ0 | LPM_STANDBY_WAKE_SOURCE_RTCALM;
   p_cfg.dtc_state_in_snooze = LPM_SNOOZE_DTC_DISABLE; // LPM_SNOOZE_DTC_ENABLE LPM_SNOOZE_DTC_DISABLE

src/PF1550.h

@@ -73,7 +73,9 @@ class PF1550
                      VFastCharge        const v_fast_charge,
                      IEndOfCharge       const i_end_of_charge,
                      IInputCurrentLimit const i_input_current_limit);
-  
+
+  uint8_t getDeviceId() { return _control.getDeviceId(); }
+
   /* Static function registered to be executed from within external interrupt ISR */
   static void ISR_onPMICEvent() { PMIC.onPMICEvent(); }
   /* Actual PMIC event ISR handler with access to member variables */

src/PF1550/PF1550_Control.cpp

@@ -56,21 +56,16 @@ void PF1550_Control::setBit(Register const reg, uint8_t const bit_pos)
   _io.setBit(reg, bit_pos);
 }
 
-void PF1550_Control::writeReg(Register const reg_addr, uint8_t val)
+void PF1550_Control::writeReg(Register const reg_addr, uint8_t const val)
 {
-  uint8_t i2c_data[2];
-  
-  i2c_data[0] = (uint8_t)reg_addr;
-  i2c_data[1] = val;
-
   if (_debug) {
-    _debug->print("PF1550_Control::writeReg at address=");
-    _debug->print(i2c_data[0], HEX);
+    _debug->print("PF1550_Control::writeReg at address = ");
+    _debug->print(static_cast<uint8_t>(reg_addr), HEX);
     _debug->print(" data=");
-    _debug->println(i2c_data[1], HEX);
+    _debug->println(val, HEX);
   }
 
-  _io.writeRegister(PF1550_I2C_ADDR, i2c_data, 2, 0);
+  _io.writeRegister(reg_addr, val);
 }
 
 void PF1550_Control::readReg(Register const reg_addr, uint8_t *data)

src/PF1550/PF1550_Control.h

@@ -48,9 +48,9 @@ class PF1550_Control
   int begin();
   void debug(Stream& stream);
 
-  void setBit(Register const reg, uint8_t const bit_pos);
-  void writeReg(Register const reg_addr, uint8_t val);
-  void readReg(Register const reg_addr, uint8_t *data);
+  void setBit  (Register const reg, uint8_t const bit_pos);
+  void writeReg(Register const reg_addr, uint8_t const val);
+  void readReg (Register const reg_addr, uint8_t * data);
 
   /* LDO1 Configuration *******************************************************/
   void setLDO1Voltage   (Ldo1Voltage const ldo1_volt);

src/PF1550/PF1550_IO.cpp

@@ -50,71 +50,21 @@ int PF1550_IO::begin()
 
 void PF1550_IO::readRegister(Register const reg_addr, uint8_t * data)
 {
-  uint8_t i2c_data[2];
+  _wire->beginTransmission(_i2c_addr);
+  _wire->write(static_cast<uint8_t>(reg_addr));
+  _wire->endTransmission(false); /* No Stop. */
 
-  i2c_data[0] = (uint8_t)reg_addr;
-
-  writeRegister(_i2c_addr, i2c_data, 1, 1);
-
-  uint8_t retVal = _wire->requestFrom(_i2c_addr, 1, true);
-
-  if (_debug) {
-    _debug->print("requestFrom: ");
-    _debug->println(retVal);
-  }
-
-  int i = 0;
-  while (_wire->available() && i < 1) {
-    data[0] = _wire->read();
-    i++;
-  }
-
-  if (_debug) {
-    _debug->println("Read:");
-    for (i = 0; i < 1; i++) {
-      _debug->println(data[i], HEX);
-    }
-  }
+  _wire->requestFrom(_i2c_addr, 1, true);
+  while (_wire->available() < 1) { }
+  *data = _wire->read();
 }
 
-void PF1550_IO::writeRegister(uint8_t slave_addr, uint8_t *data, uint8_t data_len, uint8_t restart)
+void PF1550_IO::writeRegister(Register const reg_addr, uint8_t const data)
 {
-  if (_debug)
-  {
-    _debug->print("Restart: ");
-    _debug->println(restart);
-    if (!restart)
-    {
-      _debug->print("PF1550_IO_C33::writeRegister at address=");
-      _debug->print(data[0], HEX);
-      _debug->print(" data=");
-      _debug->println(data[1], HEX);
-      _debug->print("i2c slave address: ");
-      _debug->println(slave_addr);
-    }
-    else
-    {
-      _debug->print("PF1550_IO_C33::Read from register at address=");
-      _debug->println(data[0], HEX);
-    }
-  }
-
-  _wire->beginTransmission(slave_addr);
-  _wire->write(data, data_len);
-  uint8_t retVal = _wire->endTransmission(restart == 0 ? true : false);
-
-  if (_debug) {
-    _debug->print("End transmission: ");
-    _debug->println(retVal);
-  }
-  /*
-    if (_debug) {
-    _debug->println("Write:");
-    for (int i = 0; i < data_len; i++) {
-      _debug->println(data[i], HEX);
-    }
-    }
-  */
+  _wire->beginTransmission(_i2c_addr);
+  _wire->write(static_cast<uint8_t>(reg_addr));
+  _wire->write(data);
+  _wire->endTransmission(true);
 }
 
 void PF1550_IO::setBit(Register const reg, uint8_t const bit_pos)
@@ -124,10 +74,7 @@ void PF1550_IO::setBit(Register const reg, uint8_t const bit_pos)
   readRegister(reg, &reg_val);
   reg_val |= (1<<bit_pos);
 
-  uint8_t i2c_data[2];
-  i2c_data[0] = (uint8_t)reg;
-  i2c_data[1] = reg_val;
-  writeRegister(_i2c_addr, i2c_data, 2, 0);
+  writeRegister(reg, reg_val);
 }
 
 void PF1550_IO::clrBit(Register const reg, uint8_t const bit_pos)
@@ -137,8 +84,5 @@ void PF1550_IO::clrBit(Register const reg, uint8_t const bit_pos)
   readRegister(reg, &reg_val);
   reg_val &= ~(1<<bit_pos);
 
-  uint8_t i2c_data[2];
-  i2c_data[0] = (uint8_t)reg;
-  i2c_data[1] = reg_val;
-  writeRegister(_i2c_addr, i2c_data, 2, 0);
+  writeRegister(reg, reg_val);
 }

src/PF1550/PF1550_IO.h

@@ -53,7 +53,7 @@ class PF1550_IO
   int begin();
 
   void readRegister (Register const reg_addr, uint8_t * data);
-  void writeRegister(uint8_t slave_addr, uint8_t * data, uint8_t data_len, uint8_t restart);
+  void writeRegister(Register const reg_addr, uint8_t const data);
 
   void setBit(Register const reg, uint8_t const bit_pos);
   void clrBit(Register const reg, uint8_t const bit_pos);