Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit ea3c1b1

Browse files
ForairaaaaaForairaaaaa
committed
fix format
1 parent 2b3c280 commit ea3c1b1

File tree

2 files changed

+122
-93
lines changed

2 files changed

+122
-93
lines changed

‎src/utils/ina226/INA226.cpp‎

Lines changed: 76 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,14 @@ bool INA226_Class::begin()
4242
return result;
4343
}
4444

45-
bool INA226_Class::configure(ina226_averages_t avg,
46-
ina226_busConvTime_t busConvTime,
47-
ina226_shuntConvTime_t shuntConvTime,
48-
ina226_mode_t mode)
45+
bool INA226_Class::configure(ina226_averages_t avg, ina226_busConvTime_t busConvTime,
46+
ina226_shuntConvTime_t shuntConvTime, ina226_mode_t mode)
4947
{
5048
uint16_t config = 0;
5149

5250
config |= (avg << 9 | busConvTime << 6 | shuntConvTime << 3 | mode);
5351

54-
vBusMax = 36;
52+
vBusMax = 36;
5553
vShuntMax = 0.08192f;
5654

5755
writeRegister16(INA226_REG_CONFIG, config);
@@ -85,19 +83,19 @@ bool INA226_Class::calibrate(float rShuntValue, float iMaxExpected)
8583
return true;
8684
}
8785

88-
float INA226_Class::getMaxPossibleCurrent(void) { return (vShuntMax / rShunt); }
86+
float INA226_Class::getMaxPossibleCurrent(void)
87+
{
88+
return (vShuntMax / rShunt);
89+
}
8990

9091
float INA226_Class::getMaxCurrent(void)
9192
{
92-
float maxCurrent = (currentLSB * 32767);
93+
float maxCurrent = (currentLSB * 32767);
9394
float maxPossible = getMaxPossibleCurrent();
9495

95-
if (maxCurrent > maxPossible)
96-
{
96+
if (maxCurrent > maxPossible) {
9797
return maxPossible;
98-
}
99-
else
100-
{
98+
} else {
10199
return maxCurrent;
102100
}
103101
}
@@ -106,23 +104,32 @@ float INA226_Class::getMaxShuntVoltage(void)
106104
{
107105
float maxVoltage = getMaxCurrent() * rShunt;
108106

109-
if (maxVoltage >= vShuntMax)
110-
{
107+
if (maxVoltage >= vShuntMax) {
111108
return vShuntMax;
112-
}
113-
else
114-
{
109+
} else {
115110
return maxVoltage;
116111
}
117112
}
118113

119-
float INA226_Class::getMaxPower(void) { return (getMaxCurrent() * vBusMax); }
114+
float INA226_Class::getMaxPower(void)
115+
{
116+
return (getMaxCurrent() * vBusMax);
117+
}
120118

121-
float INA226_Class::readBusPower(void) { return (readRegister16(INA226_REG_POWER) * powerLSB); }
119+
float INA226_Class::readBusPower(void)
120+
{
121+
return (readRegister16(INA226_REG_POWER) * powerLSB);
122+
}
122123

123-
float INA226_Class::readShuntCurrent(void) { return (readRegister16(INA226_REG_CURRENT) * currentLSB); }
124+
float INA226_Class::readShuntCurrent(void)
125+
{
126+
return (readRegister16(INA226_REG_CURRENT) * currentLSB);
127+
}
124128

125-
int16_t INA226_Class::readRawShuntCurrent(void) { return readRegister16(INA226_REG_CURRENT); }
129+
int16_t INA226_Class::readRawShuntCurrent(void)
130+
{
131+
return readRegister16(INA226_REG_CURRENT);
132+
}
126133

127134
float INA226_Class::readShuntVoltage(void)
128135
{
@@ -185,23 +192,50 @@ ina226_mode_t INA226_Class::getMode(void)
185192
return (ina226_mode_t)value;
186193
}
187194

188-
void INA226_Class::setMaskEnable(uint16_t mask) { writeRegister16(INA226_REG_MASKENABLE, mask); }
195+
void INA226_Class::setMaskEnable(uint16_t mask)
196+
{
197+
writeRegister16(INA226_REG_MASKENABLE, mask);
198+
}
189199

190-
uint16_t INA226_Class::getMaskEnable(void) { return readRegister16(INA226_REG_MASKENABLE); }
200+
uint16_t INA226_Class::getMaskEnable(void)
201+
{
202+
return readRegister16(INA226_REG_MASKENABLE);
203+
}
191204

192-
void INA226_Class::enableShuntOverLimitAlert(void) { writeRegister16(INA226_REG_MASKENABLE, INA226_BIT_SOL); }
205+
void INA226_Class::enableShuntOverLimitAlert(void)
206+
{
207+
writeRegister16(INA226_REG_MASKENABLE, INA226_BIT_SOL);
208+
}
193209

194-
void INA226_Class::enableShuntUnderLimitAlert(void) { writeRegister16(INA226_REG_MASKENABLE, INA226_BIT_SUL); }
210+
void INA226_Class::enableShuntUnderLimitAlert(void)
211+
{
212+
writeRegister16(INA226_REG_MASKENABLE, INA226_BIT_SUL);
213+
}
195214

196-
void INA226_Class::enableBusOvertLimitAlert(void) { writeRegister16(INA226_REG_MASKENABLE, INA226_BIT_BOL); }
215+
void INA226_Class::enableBusOvertLimitAlert(void)
216+
{
217+
writeRegister16(INA226_REG_MASKENABLE, INA226_BIT_BOL);
218+
}
197219

198-
void INA226_Class::enableBusUnderLimitAlert(void) { writeRegister16(INA226_REG_MASKENABLE, INA226_BIT_BUL); }
220+
void INA226_Class::enableBusUnderLimitAlert(void)
221+
{
222+
writeRegister16(INA226_REG_MASKENABLE, INA226_BIT_BUL);
223+
}
199224

200-
void INA226_Class::enableOverPowerLimitAlert(void) { writeRegister16(INA226_REG_MASKENABLE, INA226_BIT_POL); }
225+
void INA226_Class::enableOverPowerLimitAlert(void)
226+
{
227+
writeRegister16(INA226_REG_MASKENABLE, INA226_BIT_POL);
228+
}
201229

202-
void INA226_Class::enableConversionReadyAlert(void) { writeRegister16(INA226_REG_MASKENABLE, INA226_BIT_CNVR); }
230+
void INA226_Class::enableConversionReadyAlert(void)
231+
{
232+
writeRegister16(INA226_REG_MASKENABLE, INA226_BIT_CNVR);
233+
}
203234

204-
void INA226_Class::disableAlerts(void) { writeRegister16(INA226_REG_MASKENABLE, 0); }
235+
void INA226_Class::disableAlerts(void)
236+
{
237+
writeRegister16(INA226_REG_MASKENABLE, 0);
238+
}
205239

206240
void INA226_Class::setBusVoltageLimit(float voltage)
207241
{
@@ -225,12 +259,9 @@ void INA226_Class::setAlertInvertedPolarity(bool inverted)
225259
{
226260
uint16_t temp = getMaskEnable();
227261

228-
if (inverted)
229-
{
262+
if (inverted) {
230263
temp |= INA226_BIT_APOL;
231-
}
232-
else
233-
{
264+
} else {
234265
temp &= ~INA226_BIT_APOL;
235266
}
236267

@@ -241,21 +272,24 @@ void INA226_Class::setAlertLatch(bool latch)
241272
{
242273
uint16_t temp = getMaskEnable();
243274

244-
if (latch)
245-
{
275+
if (latch) {
246276
temp |= INA226_BIT_LEN;
247-
}
248-
else
249-
{
277+
} else {
250278
temp &= ~INA226_BIT_LEN;
251279
}
252280

253281
setMaskEnable(temp);
254282
}
255283

256-
bool INA226_Class::isMathOverflow(void) { return ((getMaskEnable() & INA226_BIT_OVF) == INA226_BIT_OVF); }
284+
bool INA226_Class::isMathOverflow(void)
285+
{
286+
return ((getMaskEnable() & INA226_BIT_OVF) == INA226_BIT_OVF);
287+
}
257288

258-
bool INA226_Class::isAlert(void) { return ((getMaskEnable() & INA226_BIT_AFF) == INA226_BIT_AFF); }
289+
bool INA226_Class::isAlert(void)
290+
{
291+
return ((getMaskEnable() & INA226_BIT_AFF) == INA226_BIT_AFF);
292+
}
259293

260294
int16_t INA226_Class::readRegister16(uint8_t reg)
261295
{

‎src/utils/ina226/INA226.h‎

Lines changed: 46 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -38,88 +38,83 @@ SOFTWARE.
3838

3939
#define INA226_ADDRESS (0x40)
4040

41-
#define INA226_REG_CONFIG (0x00)
41+
#define INA226_REG_CONFIG (0x00)
4242
#define INA226_REG_SHUNTVOLTAGE (0x01)
43-
#define INA226_REG_BUSVOLTAGE (0x02)
44-
#define INA226_REG_POWER (0x03)
45-
#define INA226_REG_CURRENT (0x04)
46-
#define INA226_REG_CALIBRATION (0x05)
47-
#define INA226_REG_MASKENABLE (0x06)
48-
#define INA226_REG_ALERTLIMIT (0x07)
49-
50-
#define INA226_BIT_SOL (0x8000)
51-
#define INA226_BIT_SUL (0x4000)
52-
#define INA226_BIT_BOL (0x2000)
53-
#define INA226_BIT_BUL (0x1000)
54-
#define INA226_BIT_POL (0x0800)
43+
#define INA226_REG_BUSVOLTAGE (0x02)
44+
#define INA226_REG_POWER (0x03)
45+
#define INA226_REG_CURRENT (0x04)
46+
#define INA226_REG_CALIBRATION (0x05)
47+
#define INA226_REG_MASKENABLE (0x06)
48+
#define INA226_REG_ALERTLIMIT (0x07)
49+
50+
#define INA226_BIT_SOL (0x8000)
51+
#define INA226_BIT_SUL (0x4000)
52+
#define INA226_BIT_BOL (0x2000)
53+
#define INA226_BIT_BUL (0x1000)
54+
#define INA226_BIT_POL (0x0800)
5555
#define INA226_BIT_CNVR (0x0400)
56-
#define INA226_BIT_AFF (0x0010)
56+
#define INA226_BIT_AFF (0x0010)
5757
#define INA226_BIT_CVRF (0x0008)
58-
#define INA226_BIT_OVF (0x0004)
58+
#define INA226_BIT_OVF (0x0004)
5959
#define INA226_BIT_APOL (0x0002)
60-
#define INA226_BIT_LEN (0x0001)
61-
62-
typedef enum
63-
{
64-
INA226_AVERAGES_1 = 0b000,
65-
INA226_AVERAGES_4 = 0b001,
66-
INA226_AVERAGES_16 = 0b010,
67-
INA226_AVERAGES_64 = 0b011,
68-
INA226_AVERAGES_128 = 0b100,
69-
INA226_AVERAGES_256 = 0b101,
70-
INA226_AVERAGES_512 = 0b110,
60+
#define INA226_BIT_LEN (0x0001)
61+
62+
typedef enum {
63+
INA226_AVERAGES_1 = 0b000,
64+
INA226_AVERAGES_4 = 0b001,
65+
INA226_AVERAGES_16 = 0b010,
66+
INA226_AVERAGES_64 = 0b011,
67+
INA226_AVERAGES_128 = 0b100,
68+
INA226_AVERAGES_256 = 0b101,
69+
INA226_AVERAGES_512 = 0b110,
7170
INA226_AVERAGES_1024 = 0b111
7271
} ina226_averages_t;
7372

74-
typedef enum
75-
{
76-
INA226_BUS_CONV_TIME_140US = 0b000,
77-
INA226_BUS_CONV_TIME_204US = 0b001,
78-
INA226_BUS_CONV_TIME_332US = 0b010,
79-
INA226_BUS_CONV_TIME_588US = 0b011,
73+
typedef enum {
74+
INA226_BUS_CONV_TIME_140US = 0b000,
75+
INA226_BUS_CONV_TIME_204US = 0b001,
76+
INA226_BUS_CONV_TIME_332US = 0b010,
77+
INA226_BUS_CONV_TIME_588US = 0b011,
8078
INA226_BUS_CONV_TIME_1100US = 0b100,
8179
INA226_BUS_CONV_TIME_2116US = 0b101,
8280
INA226_BUS_CONV_TIME_4156US = 0b110,
8381
INA226_BUS_CONV_TIME_8244US = 0b111
8482
} ina226_busConvTime_t;
8583

86-
typedef enum
87-
{
88-
INA226_SHUNT_CONV_TIME_140US = 0b000,
89-
INA226_SHUNT_CONV_TIME_204US = 0b001,
90-
INA226_SHUNT_CONV_TIME_332US = 0b010,
91-
INA226_SHUNT_CONV_TIME_588US = 0b011,
84+
typedef enum {
85+
INA226_SHUNT_CONV_TIME_140US = 0b000,
86+
INA226_SHUNT_CONV_TIME_204US = 0b001,
87+
INA226_SHUNT_CONV_TIME_332US = 0b010,
88+
INA226_SHUNT_CONV_TIME_588US = 0b011,
9289
INA226_SHUNT_CONV_TIME_1100US = 0b100,
9390
INA226_SHUNT_CONV_TIME_2116US = 0b101,
9491
INA226_SHUNT_CONV_TIME_4156US = 0b110,
9592
INA226_SHUNT_CONV_TIME_8244US = 0b111
9693
} ina226_shuntConvTime_t;
9794

98-
typedef enum
99-
{
100-
INA226_MODE_POWER_DOWN = 0b000,
101-
INA226_MODE_SHUNT_TRIG = 0b001,
102-
INA226_MODE_BUS_TRIG = 0b010,
95+
typedef enum {
96+
INA226_MODE_POWER_DOWN = 0b000,
97+
INA226_MODE_SHUNT_TRIG = 0b001,
98+
INA226_MODE_BUS_TRIG = 0b010,
10399
INA226_MODE_SHUNT_BUS_TRIG = 0b011,
104-
INA226_MODE_ADC_OFF = 0b100,
105-
INA226_MODE_SHUNT_CONT = 0b101,
106-
INA226_MODE_BUS_CONT = 0b110,
100+
INA226_MODE_ADC_OFF = 0b100,
101+
INA226_MODE_SHUNT_CONT = 0b101,
102+
INA226_MODE_BUS_CONT = 0b110,
107103
INA226_MODE_SHUNT_BUS_CONT = 0b111,
108104
} ina226_mode_t;
109105

110-
class INA226_Class : public m5::I2C_Device
111-
{
106+
class INA226_Class : public m5::I2C_Device {
112107
public:
113108
INA226_Class(std::uint8_t i2c_addr = INA226_ADDRESS, std::uint32_t freq = 400000, m5::I2C_Class* i2c = &m5::In_I2C)
114109
: I2C_Device(i2c_addr, freq, i2c)
115110
{
116111
}
117112

118113
bool begin();
119-
bool configure(ina226_averages_t avg = INA226_AVERAGES_1,
120-
ina226_busConvTime_t busConvTime = INA226_BUS_CONV_TIME_1100US,
114+
bool configure(ina226_averages_t avg = INA226_AVERAGES_1,
115+
ina226_busConvTime_t busConvTime = INA226_BUS_CONV_TIME_1100US,
121116
ina226_shuntConvTime_t shuntConvTime = INA226_SHUNT_CONV_TIME_1100US,
122-
ina226_mode_t mode = INA226_MODE_SHUNT_BUS_CONT);
117+
ina226_mode_t mode = INA226_MODE_SHUNT_BUS_CONT);
123118
bool calibrate(float rShuntValue = 0.1, float iMaxExcepted = 2);
124119

125120
ina226_averages_t getAverages(void);

0 commit comments

Comments
 (0)