From 8f130e2deca830d39b0049af412e8a12f837e3b3 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Tue, 23 Oct 2018 17:54:04 -0400
Subject: [PATCH] Update readcurrent.py

---
 python/readcurrent.py | 66 +++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/python/readcurrent.py b/python/readcurrent.py
index 8375ca2f..34e8deb0 100644
--- a/python/readcurrent.py
+++ b/python/readcurrent.py
@@ -1,14 +1,14 @@
 SHUNT_OHMS = 0.01
 MAX_EXPECTED_AMPS = 2.5
-SHUNT_OHMS4 = 0.1
-MAX_EXPECTED_AMPS4 = 0.6 
+SHUNT_OHMS45 = 0.1
+MAX_EXPECTED_AMPS45 = 0.6 
 
 try:
     from ina219 import INA219
     from ina219 import DeviceRangeError
     INA219DISABLE=0
-    ina = INA219(SHUNT_OHMS, MAX_EXPECTED_AMPS, 0x4a)
-    ina4 = INA219(SHUNT_OHMS4, MAX_EXPECTED_AMPS4, 0x45)
+    ina4A = INA219(SHUNT_OHMS, MAX_EXPECTED_AMPS, 0x4a)
+    ina45 = INA219(SHUNT_OHMS45, MAX_EXPECTED_AMPS45, 0x45)
 except:
     print "Error"
 try:
@@ -16,43 +16,43 @@ try:
 except:
     print "Error2"
 try:
-    ina.configure(ina.RANGE_16V)
-    ina.voltage()
-    ina.current()
-    ina.power()
-    ina4.configure(ina4.RANGE_16V)
-    ina4.voltage()
-    ina4.current()
-    ina4.power()
+    ina4A.configure(ina4A.RANGE_16V)
+    ina4A.voltage()
+    ina4A.current()
+    ina4A.power()
+    ina45.configure(ina45.RANGE_16V)
+    ina45.voltage()
+    ina45.current()
+    ina45.power()
 except:
     print "1 INA219 libraries not found or hardware INA219 not found at address 0x4a, defaulting to non-INA219 output"
     INA219DISABLE=1
 
 if INA219DISABLE !=1:
-    ina = INA219(SHUNT_OHMS, MAX_EXPECTED_AMPS, 0x4a)
-    ina.wake();
-    ina.configure(ina.RANGE_16V)
+    ina4A = INA219(SHUNT_OHMS, MAX_EXPECTED_AMPS, 0x4a)
+    ina4A.wake();
+    ina4A.configure(ina4A.RANGE_16V)
 
-    ina1 = INA219(SHUNT_OHMS4, MAX_EXPECTED_AMPS4, 0x40)
-    ina1.wake();
-    ina1.configure(ina1.RANGE_16V)
+    ina40 = INA219(SHUNT_OHMS45, MAX_EXPECTED_AMPS45, 0x40)
+    ina40.wake();
+    ina40.configure(ina40.RANGE_16V)
 
-    ina2 = INA219(SHUNT_OHMS4, MAX_EXPECTED_AMPS4, 0x41)
-    ina2.wake();
-    ina2.configure(ina1.RANGE_16V)
+    ina41 = INA219(SHUNT_OHMS45, MAX_EXPECTED_AMPS45, 0x41)
+    ina41.wake();
+    ina41.configure(ina41.RANGE_16V)
 
-    ina3 = INA219(SHUNT_OHMS4, MAX_EXPECTED_AMPS4, 0x44)
-    ina3.wake();
-    ina3.configure(ina1.RANGE_16V)
+    ina44 = INA219(SHUNT_OHMS45, MAX_EXPECTED_AMPS45, 0x44)
+    ina44.wake();
+    ina44.configure(ina44.RANGE_16V)
 
-    ina4 = INA219(SHUNT_OHMS4, MAX_EXPECTED_AMPS4, 0x45)
-    ina4.wake();
-    ina4.configure(ina4.RANGE_16V)
+    ina45 = INA219(SHUNT_OHMS45, MAX_EXPECTED_AMPS45, 0x45)
+    ina45.wake();
+    ina45.configure(ina45.RANGE_16V)
 
-    print ina.voltage(), ina.current(), ina.power(), ina1.voltage(), ina1.current(), ina1.power(), ina2.voltage(), ina2.current(), ina2.power(), ina3.voltage(), ina3.current(), ina3.power(), ina4.voltage(), ina4.current(), ina4.power()
+    print ina4A.voltage(), ina4A.current(), ina4A.power(), ina40.voltage(), ina40.current(), ina40.power(), ina41.voltage(), ina41.current(), ina41.power(), ina44.voltage(), ina44.current(), ina44.power(), ina45.voltage(), ina45.current(), ina45.power()
 
-    ina.sleep();
-    ina1.sleep();
-    ina2.sleep();
-    ina3.sleep();
-    ina4.sleep();
+    ina4A.sleep();
+    ina40.sleep();
+    ina41.sleep();
+    ina44.sleep();
+    ina45.sleep();