Extract common functionality code into base class PF1550_Io.

Author: aentinger

src/PF1550.cpp

@@ -22,6 +22,8 @@
 
 #include "PF1550.h"
 
+#include <Wire.h>
+
 #include "PF1550/PF1550_Io_C33.h"
 #include "PF1550/PF1550_Io_EnvieH747.h"
 
@@ -159,9 +161,9 @@ void PF1550::configCharger(IFastCharge        const i_fast_charge,
  ******************************************************************************/
 
 #ifdef ARDUINO_PORTENTA_H33
-static PF1550_Io_C33 io(interface::PF1550_I2C_DEFAULT_ADDR);
+static PF1550_Io_C33 io(&Wire3, interface::PF1550_I2C_DEFAULT_ADDR);
 #else
-static PF1550_Io_EnvieH747 io(interface::PF1550_I2C_DEFAULT_ADDR);
+static PF1550_Io_EnvieH747 io(&Wire1, interface::PF1550_I2C_DEFAULT_ADDR);
 #endif
 
 PF1550 PMIC(io);

src/PF1550/PF1550_Io_C33.cpp

@@ -23,30 +23,30 @@
    INCLUDE
  ******************************************************************************/
 
-#include "Arduino.h"
 #include "interface/PF1550_Io.h"
 
+#include "PF1550_Defines.h"
+
 /******************************************************************************
    CLASS DECLARATION
  ******************************************************************************/
 
 class PF1550_Io_C33 : public interface::PF1550_Io
 {
 public:
-  PF1550_Io_C33(uint8_t const i2c_addr);
+  PF1550_Io_C33(arduino::HardwareI2C * wire, uint8_t const i2c_addr) : interface::PF1550_Io(wire, i2c_addr) { }
   virtual ~PF1550_Io_C33() { }
 
-  virtual int  begin        () override;
-  virtual void readRegister (Register const reg_addr, uint8_t * data) override;
-  virtual void writeRegister(uint8_t slave_addr, uint8_t * data, uint8_t data_len, uint8_t restart) override;
-  virtual void setSTANDBY   () override { }
-  virtual void clrSTANDBY   () override { }
-
 
-private:
+protected:
+  virtual int derived_begin() override
+  {
+    /* Enable LED. */
+    setBit(Register::CHARGER_LED_PWM, REG_LED_PWM_LED_EN_bp);
+    /* Allow LED control by software. */
+    setBit(Register::CHARGER_LED_CNFG, REG_LED_CNFG_LEDOVRD_bp);
+  }
 
-  uint8_t const _i2c_addr;
-  Stream * _debug;
 };
 
 #endif /* PF1550_IO_C33_H_ */

src/PF1550/PF1550_Io_C33.h

@@ -23,7 +23,6 @@
    INCLUDE
  ******************************************************************************/
 
-#include "Arduino.h"
 #include "interface/PF1550_Io.h"
 
 /******************************************************************************
@@ -32,23 +31,13 @@
 
 class PF1550_Io_EnvieH747 : public interface::PF1550_Io
 {
-
 public:
-
-           PF1550_Io_EnvieH747(uint8_t const i2c_addr);
+  PF1550_Io_EnvieH747(arduino::HardwareI2C * wire, uint8_t const i2c_addr) : interface::PF1550_Io(wire, i2c_addr) { }
   virtual ~PF1550_Io_EnvieH747() { }
 
-  virtual int     begin        ()                                                                     override;
-  virtual void    readRegister (Register const reg_addr, uint8_t *data)                               override;
-  virtual void    writeRegister(uint8_t slave_addr, uint8_t *data, uint8_t data_len, uint8_t restart) override;
-  virtual void    setSTANDBY   ()                                                                     override;
-  virtual void    clrSTANDBY   ()                                                                     override;
-
-private:
-
-  uint8_t const _i2c_addr;
-  Stream* _debug;
 
+protected:
+  virtual int derived_begin() override { }
 };
 
 #endif /* PF1550_IO_ENVIEH747_H_ */