Skip to content

Commit e42eb9f

Browse files
aentingeraentinger
committed
Reorder file structure, PF1550_Io is no longer an interface class.
1 parent a7d52a1 commit e42eb9f

File tree

8 files changed

+33
-59
lines changed

8 files changed

+33
-59
lines changed

‎src/PF1550.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424

2525
#include <Wire.h>
2626

27-
#include "PF1550/PF1550_Io_C33.h"
28-
#include "PF1550/PF1550_Io_EnvieH747.h"
27+
#include "PF1550/PF1550_IO_C33.h"
28+
#include "PF1550/PF1550_IO_Portenta_H7.h"
2929

3030
/******************************************************************************
3131
CTOR/DTOR
3232
******************************************************************************/
3333

34-
PF1550::PF1550(interface::PF1550_Io & io)
34+
PF1550::PF1550(PF1550_IO & io)
3535
: _control(io),
3636
_debug(NULL)
3737
{
@@ -161,9 +161,9 @@ void PF1550::configCharger(IFastCharge const i_fast_charge,
161161
******************************************************************************/
162162

163163
#ifdef ARDUINO_PORTENTA_H33
164-
static PF1550_Io_C33 io(&Wire3, interface::PF1550_I2C_DEFAULT_ADDR);
164+
static PF1550_IO_C33 io(&Wire3, PF1550_I2C_DEFAULT_ADDR);
165165
#else
166-
static PF1550_Io_EnvieH747 io(&Wire1, interface::PF1550_I2C_DEFAULT_ADDR);
166+
static PF1550_IO_Portenta_H7 io(&Wire1, PF1550_I2C_DEFAULT_ADDR);
167167
#endif
168168

169169
PF1550 PMIC(io);

‎src/PF1550.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
#ifndef ARDUINO_PF1550_H_
2020
#define ARDUINO_PF1550_H_
2121

22-
#define PF1550_I2C_ADDR (interface::PF1550_I2C_DEFAULT_ADDR)
22+
#define PF1550_I2C_ADDR (PF1550_I2C_DEFAULT_ADDR)
2323

2424
/******************************************************************************
2525
INCLUDE
2626
******************************************************************************/
2727
#include "Arduino.h"
28-
#include "PF1550/interface/PF1550_Io.h"
28+
#include "PF1550/PF1550_IO.h"
2929
#include "PF1550/PF1550_Types.h"
3030
#include "PF1550/PF1550_Control.h"
3131
#include "PF1550/PF1550_Register.h"
@@ -45,7 +45,7 @@ class PF1550
4545
{
4646
public:
4747

48-
PF1550(interface::PF1550_Io & io);
48+
PF1550(PF1550_IO & io);
4949

5050
int begin();
5151

‎src/PF1550/PF1550_Control.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
CTOR/DTOR
3131
******************************************************************************/
3232

33-
PF1550_Control::PF1550_Control(interface::PF1550_Io & io)
33+
PF1550_Control::PF1550_Control(PF1550_IO & io)
3434
: _io(io)
3535
{
3636

‎src/PF1550/PF1550_Control.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
******************************************************************************/
2525

2626
#include "PF1550_Types.h"
27-
#include "interface/PF1550_Io.h"
27+
#include "PF1550_IO.h"
2828
#include "Arduino.h"
2929

3030
/******************************************************************************
@@ -42,7 +42,7 @@ class PF1550_Control
4242

4343
public:
4444

45-
PF1550_Control(interface::PF1550_Io & io);
45+
PF1550_Control(PF1550_IO & io);
4646

4747

4848
int begin();
@@ -87,7 +87,7 @@ class PF1550_Control
8787

8888
private:
8989

90-
interface::PF1550_Io & _io;
90+
PF1550_IO & _io;
9191

9292
void onChargerEvent();
9393
void onSwitch1Event();

src/PF1550/interface/PF1550_Io.cpp renamed to src/PF1550/PF1550_IO.cpp

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,15 @@
2121
******************************************************************************/
2222

2323
#include "PF1550.h"
24-
#include "PF1550_Io.h"
24+
#include "PF1550_IO.h"
2525

2626
#include <assert.h>
2727

28-
/******************************************************************************
29-
NAMESPACE
30-
******************************************************************************/
31-
32-
namespace interface
33-
{
34-
3528
/******************************************************************************
3629
CTOR/DTOR
3730
******************************************************************************/
3831

39-
PF1550_Io::PF1550_Io(arduino::HardwareI2C * wire, uint8_t const i2c_addr)
32+
PF1550_IO::PF1550_IO(arduino::HardwareI2C * wire, uint8_t const i2c_addr)
4033
: _wire{wire}
4134
, _i2c_addr{i2c_addr}
4235
, _debug{nullptr}
@@ -48,14 +41,14 @@ PF1550_Io::PF1550_Io(arduino::HardwareI2C * wire, uint8_t const i2c_addr)
4841
PUBLIC MEMBER FUNCTIONS
4942
******************************************************************************/
5043

51-
int PF1550_Io::begin()
44+
int PF1550_IO::begin()
5245
{
5346
_wire->begin();
5447
_wire->setClock(100000);
5548
return derived_begin();
5649
}
5750

58-
void PF1550_Io::readRegister(Register const reg_addr, uint8_t * data)
51+
void PF1550_IO::readRegister(Register const reg_addr, uint8_t * data)
5952
{
6053
uint8_t i2c_data[2];
6154

@@ -84,15 +77,15 @@ void PF1550_Io::readRegister(Register const reg_addr, uint8_t * data)
8477
}
8578
}
8679

87-
void PF1550_Io::writeRegister(uint8_t slave_addr, uint8_t *data, uint8_t data_len, uint8_t restart)
80+
void PF1550_IO::writeRegister(uint8_t slave_addr, uint8_t *data, uint8_t data_len, uint8_t restart)
8881
{
8982
if (_debug)
9083
{
9184
_debug->print("Restart: ");
9285
_debug->println(restart);
9386
if (!restart)
9487
{
95-
_debug->print("PF1550_Io_C33::writeRegister at address=");
88+
_debug->print("PF1550_IO_C33::writeRegister at address=");
9689
_debug->print(data[0], HEX);
9790
_debug->print(" data=");
9891
_debug->println(data[1], HEX);
@@ -101,7 +94,7 @@ void PF1550_Io::writeRegister(uint8_t slave_addr, uint8_t *data, uint8_t data_le
10194
}
10295
else
10396
{
104-
_debug->print("PF1550_Io_C33::Read from register at address=");
97+
_debug->print("PF1550_IO_C33::Read from register at address=");
10598
_debug->println(data[0], HEX);
10699
}
107100
}
@@ -124,7 +117,7 @@ void PF1550_Io::writeRegister(uint8_t slave_addr, uint8_t *data, uint8_t data_le
124117
*/
125118
}
126119

127-
void PF1550_Io::setBit(Register const reg, uint8_t const bit_pos)
120+
void PF1550_IO::setBit(Register const reg, uint8_t const bit_pos)
128121
{
129122
assert(bit_pos < 8);
130123
uint8_t reg_val;
@@ -137,7 +130,7 @@ void PF1550_Io::setBit(Register const reg, uint8_t const bit_pos)
137130
writeRegister(_i2c_addr, i2c_data, 2, 0);
138131
}
139132

140-
void PF1550_Io::clrBit(Register const reg, uint8_t const bit_pos)
133+
void PF1550_IO::clrBit(Register const reg, uint8_t const bit_pos)
141134
{
142135
assert(bit_pos < 8);
143136
uint8_t reg_val;
@@ -149,9 +142,3 @@ void PF1550_Io::clrBit(Register const reg, uint8_t const bit_pos)
149142
i2c_data[1] = reg_val;
150143
writeRegister(_i2c_addr, i2c_data, 2, 0);
151144
}
152-
153-
/******************************************************************************
154-
NAMESPACE
155-
******************************************************************************/
156-
157-
} /* interface */

src/PF1550/interface/PF1550_Io.h renamed to src/PF1550/PF1550_IO.h

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,7 @@
2727

2828
#include "api/HardwareI2C.h"
2929

30-
#include "../PF1550_Register.h"
31-
32-
/******************************************************************************
33-
NAMESPACE
34-
******************************************************************************/
35-
36-
namespace interface
37-
{
30+
#include "PF1550_Register.h"
3831

3932
/******************************************************************************
4033
CONSTANTS
@@ -46,12 +39,12 @@ static uint8_t const PF1550_I2C_DEFAULT_ADDR = 0x08;
4639
CLASS DECLARATION
4740
******************************************************************************/
4841

49-
class PF1550_Io
42+
class PF1550_IO
5043
{
5144
public:
5245

53-
PF1550_Io(arduino::HardwareI2C * wire, uint8_t const i2c_addr);
54-
virtual ~PF1550_Io() { }
46+
PF1550_IO(arduino::HardwareI2C * wire, uint8_t const i2c_addr);
47+
virtual ~PF1550_IO() { }
5548

5649

5750
void debug (Stream& stream) { _debug = &stream; }
@@ -75,10 +68,4 @@ class PF1550_Io
7568
Stream * _debug;
7669
};
7770

78-
/******************************************************************************
79-
NAMESPACE
80-
******************************************************************************/
81-
82-
} /* interface */
83-
8471
#endif /* ARDUINO_PF1550_INTERFACE_PF1550_IO_H_ */

src/PF1550/PF1550_Io_C33.h renamed to src/PF1550/PF1550_IO_C33.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@
2323
INCLUDE
2424
******************************************************************************/
2525

26-
#include "interface/PF1550_Io.h"
26+
#include "PF1550_IO.h"
2727

2828
#include "PF1550_Defines.h"
2929

3030
/******************************************************************************
3131
CLASS DECLARATION
3232
******************************************************************************/
3333

34-
class PF1550_Io_C33 : public interface::PF1550_Io
34+
class PF1550_IO_C33 : public PF1550_IO
3535
{
3636
public:
37-
PF1550_Io_C33(arduino::HardwareI2C * wire, uint8_t const i2c_addr) : interface::PF1550_Io(wire, i2c_addr) { }
38-
virtual ~PF1550_Io_C33() { }
37+
PF1550_IO_C33(arduino::HardwareI2C * wire, uint8_t const i2c_addr) : PF1550_IO(wire, i2c_addr) { }
38+
virtual ~PF1550_IO_C33() { }
3939

4040

4141
protected:

src/PF1550/PF1550_Io_EnvieH747.h renamed to src/PF1550/PF1550_IO_Portenta_H7.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@
2323
INCLUDE
2424
******************************************************************************/
2525

26-
#include "interface/PF1550_Io.h"
26+
#include "PF1550_IO.h"
2727

2828
/******************************************************************************
2929
CLASS DECLARATION
3030
******************************************************************************/
3131

32-
class PF1550_Io_EnvieH747 : public interface::PF1550_Io
32+
class PF1550_IO_Portenta_H7 : public PF1550_IO
3333
{
3434
public:
35-
PF1550_Io_EnvieH747(arduino::HardwareI2C * wire, uint8_t const i2c_addr) : interface::PF1550_Io(wire, i2c_addr) { }
36-
virtual ~PF1550_Io_EnvieH747() { }
35+
PF1550_IO_Portenta_H7(arduino::HardwareI2C * wire, uint8_t const i2c_addr) : PF1550_IO(wire, i2c_addr) { }
36+
virtual ~PF1550_IO_Portenta_H7() { }
3737

3838

3939
protected:

0 commit comments

Comments
 (0)