Diff: INA226.cpp

Revision:

7:5c1d19898020

Parent:

6:4aa455bab63f

--- a/INA226.cpp	Wed May 02 18:22:21 2018 +0000
+++ b/INA226.cpp	Wed Nov 14 09:11:38 2018 +0000
@@ -7,14 +7,14 @@
     i2c = &i2cBus;
     
     if(celect_1 == A1_GND)         _addr_1 = 0b10000000;
-    else if(celect_1 == A1_VDD)    _addr_1 = 0b10000100;
-    else if(celect_1 == A1_SDA)    _addr_1 = 0b10001000;
-    else if(celect_1 == A1_SCL)    _addr_1 = 0b10001100;
+    else if(celect_1 == A1_VDD)    _addr_1 = 0b10001000;
+    else if(celect_1 == A1_SDA)    _addr_1 = 0b10010000;
+    else if(celect_1 == A1_SCL)    _addr_1 = 0b10011000;
     
-    if(celect_0 == A0_GND)          _addr_0 = 0b00000000;
-    else if(celect_0 == A0_VDD)    _addr_0 = 0b00000001;
-    else if(celect_0 == A0_SDA)    _addr_0 = 0b00000010;
-    else if(celect_0 == A0_SCL)    _addr_0 = 0b00000011;
+    if(celect_0 == A0_GND)         _addr_0 = 0b00000000;
+    else if(celect_0 == A0_VDD)    _addr_0 = 0b00000010;
+    else if(celect_0 == A0_SDA)    _addr_0 = 0b00000100;
+    else if(celect_0 == A0_SCL)    _addr_0 = 0b00000110;
     
     _addr = _addr_1 | _addr_0;
     SLV_WRITE_INA = _addr;
@@ -102,7 +102,7 @@
     //setup(0);
     
     i2c->write(SLV_WRITE_INA, &reg, 1);
-    wait_ms(10);
+    //wait_ms(10);
     i2c->read(SLV_READ_INA, buff, 2, false);
     
     val[0] = (unsigned int)buff[0]<<8;
@@ -114,7 +114,7 @@
     reg = current_reg;
     
     i2c->write(SLV_WRITE_INA, &reg, 1);
-    wait_ms(10);
+    //wait_ms(10);
     i2c->read(SLV_READ_INA, buff, 2, false);
     
     val[0] = (unsigned int)buff[0]<<8;
@@ -145,7 +145,7 @@
     //setup(2);
     
     i2c->write(SLV_WRITE_INA, &reg, 1);
-    wait_ms(10);
+    //wait_ms(10);
     i2c->read(SLV_READ_INA, buff, 2, false);
     
     val[0] = (unsigned int)buff[0]<<8;
@@ -178,7 +178,7 @@
     //setup(1);
     
     i2c->write(SLV_WRITE_INA, &reg, 1);
-    wait_ms(10);
+    //wait_ms(10);
     i2c->read(SLV_READ_INA, buff, 2, false);
     
     val[0] = (unsigned int)buff[0]<<8;
@@ -209,7 +209,7 @@
     float current;
     
     i2c->write(SLV_WRITE_INA, &reg, 1);
-    wait_ms(10);
+    //wait_ms(10);
     i2c->read(SLV_READ_INA, buff, 2, false);
     
     val[0] = (unsigned int)buff[0]<<8;
@@ -239,7 +239,7 @@
     float power;
     
     i2c->write(SLV_WRITE_INA, &reg, 1);
-    wait_ms(10);
+    //wait_ms(10);
     i2c->read(SLV_READ_INA, buff, 2, false);
     
     val[0] = (unsigned int)buff[0]<<8;