From a9ce6fef3967dca0fa83053756d26497d1307d5d Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Wed, 24 Oct 2018 07:11:34 -0400
Subject: [PATCH] ina reading but not in tlm yet

---
 afsk/main.c           | 4 ++--
 cw/cw_main.c          | 8 ++++----
 python/readcurrent.py | 9 ++-------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/afsk/main.c b/afsk/main.c
index fd4a8fc9..4859fd0e 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -124,9 +124,9 @@ int main(void) {
 	    
        // Read current from I2C bus
     	i2cDevice = wiringPiI2CSetup (0x40) ;
-       	result = wiringPiI2CWriteReg16(i2cDevice, 0x00, config);
+       	int result = wiringPiI2CWriteReg16(i2cDevice, 0x00, config);
         printf("\n\n1 I2C result: %d\n", result);
-        int result = wiringPiI2CWriteReg16(i2cDevice, 0x05, 4096);
+        result = wiringPiI2CWriteReg16(i2cDevice, 0x05, 4096);
         printf("Write result: %d\n", result);
         int currentValue = wiringPiI2CReadReg16(i2cDevice, 0x04);
         printf("Current: %d\n\n", currentValue);
diff --git a/cw/cw_main.c b/cw/cw_main.c
index 309aed7e..ce186c51 100644
--- a/cw/cw_main.c
+++ b/cw/cw_main.c
@@ -54,7 +54,7 @@
 #define SENSOR_44 6
 #define SENSOR_45 9
 #define SENSOR_4A 12
-#define VOLTS 0
+#define VOLTAGE 0
 #define CURRENT 1
 #define POWER 2
 
@@ -533,9 +533,9 @@ int get_tlm(int tlm[][5]) {
         i++;
       }
 
-	tlm[1][B] = (int) (98.5 - ina219[SENSOR_40 + CURRENT]/400);  // +X current [4]
-	tlm[1][D] = (int) (98.5 - ina219[SENSOR_41 + CURRENT]/400);  // +Y current [7]
-	tlm[1][C] = (int) (98.5 - ina219[SENSOR_44 + CURRENT]/400);  // +Z current [10] (actually -X current, AO-7 didn't have a Z solar panel?)
+	tlm[1][B] = (int) (98.5 - strtof(ina219[SENSOR_40 + CURRENT], NULL)/400);  // +X current [4]
+	tlm[1][D] = (int) (98.5 - strtof(ina219[SENSOR_41 + CURRENT], NULL)/400);  // +Y current [7]
+	tlm[1][C] = (int) (98.5 - strtof(ina219[SENSOR_44 + CURRENT], NULL)/400);  // +Z current [10] (actually -X current, AO-7 didn't have a Z solar panel?)
 
 //	int tlm_3b = (int)(strtof(ina219[0], NULL) * 10.0);
 //	int tlm_2d = (int)(50.0 + strtof(ina219[SENSOR_4A + VOLTAGE], NULL)/40.0);
diff --git a/python/readcurrent.py b/python/readcurrent.py
index fdfd51df..abde5ec6 100644
--- a/python/readcurrent.py
+++ b/python/readcurrent.py
@@ -12,10 +12,7 @@ try:
 except:
     print "Error"
 try:
-    ina.wake()
-except:
-    print "Error2"
-try:
+    ina4A.wake()
     ina4A.configure(ina4A.RANGE_16V)
     ina4A.voltage()
     ina4A.current()
@@ -49,9 +46,7 @@ if INA219DISABLE !=1:
     ina45.wake();
     ina45.configure(ina45.RANGE_16V)
 
-    print  ina40.voltage(), ina40.current(), ina40.power(), ina41.voltage(), ina41.current(), ina41.power(), 
-                  ina44.voltage(), ina44.current(), ina44.power(), ina45.voltage(), ina45.current(), ina45.power(),
-                  ina4A.voltage(), ina4A.current(), ina4A.power()
+    print  ina40.voltage(), ina40.current(), ina40.power(), ina41.voltage(), ina41.current(), ina41.power(), ina44.voltage(), ina44.current(), ina44.power(), ina45.voltage(), ina45.current(), ina45.power(), ina4A.voltage(), ina4A.current(), ina4A.power()
 
     ina4A.sleep();
     ina40.sleep();