Skip to content

Commit 1592481

Browse files
committed
0.1.4 INA226
1 parent 4b93777 commit 1592481

File tree

5 files changed

+27
-14
lines changed

5 files changed

+27
-14
lines changed

libraries/INA226/INA226.cpp

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// FILE: INA266.h
22
// AUTHOR: Rob Tillaart
3-
// VERSION: 0.1.3
3+
// VERSION: 0.1.4
44
// DATE: 2021-05-18
55
// PURPOSE: Arduino library for INA266 power sensor
66
// URL: https://github.com/RobTillaart/INA226
@@ -10,9 +10,9 @@
1010
// 0.1.1 2021-06-21 improved calibration + added functions
1111
// 0.1.2 2021-06-22 add check of parameters of several functions + unit tests
1212
// add getShunt() , getMaxCurrent()
13-
// 0.1.3 2021-06- add getCurrentLSB_uA() + improve examples
13+
// 0.1.3 2021-06-22 add getCurrentLSB_uA() + improve examples
1414
// fix for calibration
15-
//
15+
// 0.1.4 2021-08-07 fix getCurrent()
1616

1717
#include "INA226.h"
1818

@@ -103,7 +103,14 @@ float INA226::getPower()
103103

104104
float INA226::getCurrent()
105105
{
106-
float val = _readRegister(INA226_CURRENT);
106+
uint16_t val = _readRegister(INA226_CURRENT);
107+
if (val & 0x8000)
108+
{
109+
val = val & 0x7FFF;
110+
val = val ^ 0x7FFF;
111+
val++;
112+
return val * -_current_LSB;
113+
}
107114
return val * _current_LSB;
108115
}
109116

libraries/INA226/INA226.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22
// FILE: INA266.h
33
// AUTHOR: Rob Tillaart
4-
// VERSION: 0.1.3
4+
// VERSION: 0.1.4
55
// DATE: 2021-05-18
66
// PURPOSE: Arduino library for INA266 power sensor
77
// URL: https://github.com/RobTillaart/INA226
@@ -14,7 +14,7 @@
1414
#include "Wire.h"
1515

1616

17-
#define INA226_LIB_VERSION (F("0.1.3"))
17+
#define INA226_LIB_VERSION (F("0.1.4"))
1818

1919

2020
// set by setAlertRegister

libraries/INA226/examples/INA226_demo_2/INA226_demo_2.ino

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// FILE: INA226_demo_2.ino
33
// AUTHOR: Rob Tillaart
4-
// VERSION: 0.1.1
4+
// VERSION: 0.1.4
55
// PURPOSE: demo
66
// DATE: 2021-06-21
77
// URL: https://github.com/RobTillaart/INA226
@@ -17,6 +17,8 @@ void setup()
1717
{
1818
Serial.begin(115200);
1919
Serial.println(__FILE__);
20+
Serial.print("INA226_LIB_VERSION: ");
21+
Serial.println(INA226_LIB_VERSION);
2022

2123
Wire.begin();
2224
if (!INA.begin() )
@@ -25,10 +27,13 @@ void setup()
2527
}
2628

2729
Serial.println();
28-
Serial.print("MAN:\t");
29-
Serial.println(INA.getManufacturerID(), HEX);
30-
Serial.print("DIE:\t");
31-
Serial.println(INA.getDieID(), HEX);
30+
// Serial.print("AVG:\t");
31+
// Serial.println((int)INA.getAverage());
32+
INA.setAverage(2);
33+
// Serial.print("MAN:\t");
34+
// Serial.println(INA.getManufacturerID(), HEX);
35+
// Serial.print("DIE:\t");
36+
// Serial.println(INA.getDieID(), HEX);
3237
delay(100);
3338

3439
INA.setMaxCurrentShunt(1, 0.002);
@@ -39,6 +44,7 @@ void setup()
3944
void loop()
4045
{
4146
Serial.println("\nPOWER2 = busVoltage x current");
47+
Serial.println(" V\t mA \t mW \t mW \t mW");
4248
Serial.println("BUS\tCURRENT\tPOWER\tPOWER2\tDELTA");
4349
for (int i = 0; i < 20; i++)
4450
{
@@ -57,7 +63,7 @@ void loop()
5763
Serial.print("\t");
5864
Serial.print((bv * cu) - po, 2);
5965
Serial.println();
60-
delay(500);
66+
delay(50);
6167
}
6268
}
6369

libraries/INA226/library.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"type": "git",
1616
"url": "https://github.com/RobTillaart/INA226.git"
1717
},
18-
"version": "0.1.3",
18+
"version": "0.1.4",
1919
"license": "MIT",
2020
"frameworks": "arduino",
2121
"platforms": "*"

libraries/INA226/library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=INA226
2-
version=0.1.3
2+
version=0.1.4
33
author=Rob Tillaart <[email protected]>
44
maintainer=Rob Tillaart <[email protected]>
55
sentence=Arduino library for INA226 power sensor

0 commit comments

Comments
 (0)