Kenji Arai / INA226

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Files at this revision

API Documentation at this revision

Revision 3:d4affcc81306, committed 2017-08-23

Comitter:
kenjiArai
Date:
Wed Aug 23 09:25:12 2017 +0000
Parent:
2:b1e759cb121e
Commit message:
countermeasure for NonCopyable

Changed in this revision

INA226.cpp Show annotated file Show diff for this revision Revisions of this file
INA226.h Show annotated file Show diff for this revision Revisions of this file 
diff -r b1e759cb121e -r d4affcc81306 INA226.cpp
--- a/INA226.cpp	Sat May 30 09:56:46 2015 +0000
+++ b/INA226.cpp	Wed Aug 23 09:25:12 2017 +0000
@@ -3,32 +3,26 @@
  *  INA226 High-or Low-Side Measurement,Bi-Directional CURRENT/POWER MONITOR with I2C Interface
  *  by Texas Instruments
  *
- * Copyright (c) 2015 Kenji Arai / JH1PJL
+ * Copyright (c) 2015,'17 Kenji Arai / JH1PJL
  *  http://www.page.sannet.ne.jp/kenjia/index.html
  *  http://mbed.org/users/kenjiArai/
- *      Created: January   25th, 2015
- *      Revised: May       30th, 2015
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
- * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *      Created: January    25th, 2015
+ *      Revised: August     23rd, 2017
  */
 
 #include    "mbed.h"
 #include    "INA226.h"
 
-INA226::INA226 (PinName p_sda, PinName p_scl, const INA226_TypeDef *ina226_parameter) :
-    _i2c(p_sda, p_scl)
+INA226::INA226 (PinName p_sda, PinName p_scl, const INA226_TypeDef *ina226_parameter)
+ : _i2c_p(new I2C(p_sda, p_scl)), _i2c(*_i2c_p)
 {
     _i2c.frequency(400000);
     ina226_set_data = *ina226_parameter;
     initialize();
 }
 
-INA226::INA226 (PinName p_sda, PinName p_scl, uint8_t addr) :
-    _i2c(p_sda, p_scl)
+INA226::INA226 (PinName p_sda, PinName p_scl, uint8_t addr)
+ : _i2c_p(new I2C(p_sda, p_scl)), _i2c(*_i2c_p)
 {
     _i2c.frequency(400000);
     // Use standard setting
@@ -38,8 +32,8 @@
     initialize();
 }
 
-INA226::INA226 (PinName p_sda, PinName p_scl) :
-    _i2c(p_sda, p_scl)
+INA226::INA226 (PinName p_sda, PinName p_scl)
+ : _i2c_p(new I2C(p_sda, p_scl)), _i2c(*_i2c_p)
 {
     _i2c.frequency(400000);
     // Use standard setting
@@ -47,14 +41,16 @@
     initialize();
 }
 
-INA226::INA226 (I2C& p_i2c, const INA226_TypeDef *ina226_parameter) : _i2c(p_i2c)
+INA226::INA226 (I2C& p_i2c, const INA226_TypeDef *ina226_parameter)
+ : _i2c(p_i2c)
 {
     _i2c.frequency(400000);
     ina226_set_data = *ina226_parameter;
     initialize();
 }
 
-INA226::INA226 (I2C& p_i2c, uint8_t addr) : _i2c(p_i2c)
+INA226::INA226 (I2C& p_i2c, uint8_t addr)
+ : _i2c(p_i2c)
 {
     _i2c.frequency(400000);
     // Use standard setting
@@ -64,7 +60,8 @@
     initialize();
 }
 
-INA226::INA226 (I2C& p_i2c) : _i2c(p_i2c)
+INA226::INA226 (I2C& p_i2c)
+ : _i2c(p_i2c)
 {
     _i2c.frequency(400000);
     // Use standard setting
@@ -99,7 +96,7 @@
     _i2c.write((int)ina226_set_data.addr, (char *)dt, 1, true);
     _i2c.read((int)ina226_set_data.addr, (char *)dt, 2, false);
     int16_t data = (dt[0] << 8) | dt[1];
-    return (float)data * 1.25 / 1000;
+    return (float)data * 1.25f / 1000.0f;
 }
 
 /////////////// Read Shunt volt ///////////////////////////
@@ -109,7 +106,7 @@
     _i2c.write((int)ina226_set_data.addr, (char *)dt, 1, true);
     _i2c.read((int)ina226_set_data.addr, (char *)dt, 2, false);
     int16_t data = (dt[0] << 8) | dt[1];
-    return (float)data * 2.5 / 1000;
+    return (float)data * 2.5f / 1000.0f;
 }
 
 float INA226::read_current_by_shuntvolt()
@@ -245,3 +242,4 @@
 {
     _i2c.frequency(hz);
 }
+

diff -r b1e759cb121e -r d4affcc81306 INA226.h
--- a/INA226.h	Sat May 30 09:56:46 2015 +0000
+++ b/INA226.h	Wed Aug 23 09:25:12 2017 +0000
@@ -3,17 +3,11 @@
  *  INA226 High-or Low-Side Measurement,Bi-Directional CURRENT/POWER MONITOR with I2C Interface
  *  by Texas Instruments
  *
- * Copyright (c) 2015 Kenji Arai / JH1PJL
+ * Copyright (c) 2015,'17 Kenji Arai / JH1PJL
  *  http://www.page.sannet.ne.jp/kenjia/index.html
  *  http://mbed.org/users/kenjiArai/
- *      Created: January   25th, 2015
- *      Revised: May       30th, 2015
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
- * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *      Created: January    25th, 2015
+ *      Revised: August     23rd, 2017
  */
 /*
  *---------------- REFERENCE ----------------------------------------------------------------------
@@ -293,7 +287,8 @@
     uint8_t write_reg(uint8_t addr, uint8_t data);
 
 protected:
-    I2C  _i2c;
+    I2C *_i2c_p;
+    I2C &_i2c;
 
     void initialize(void);
 
@@ -305,3 +300,4 @@
 };
 
 #endif  //  MBED_INA226
+