From 1d647ee6ed354c838d04b80cbfdc1d6d7d79a961 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sat, 9 Mar 2019 09:49:57 -0500 Subject: [PATCH 1/3] fixed +X labeling --- python/telem.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python/telem.py b/python/telem.py index ded0e022..e92b0a21 100644 --- a/python/telem.py +++ b/python/telem.py @@ -84,9 +84,9 @@ if INA219DISABLE !=1: except: FAIL = 1 print -print "X+ (0x40) v=",ina40v, "V i=", ina40i, "mA p=", ina40p, "mW " -print "Y+ (0x41) v=",ina41v, "V i=", ina41i, "mA p=", ina41p, "mW " -print "Z+ (0x44) v=",ina44v, "V i=", ina44i, "mA p=", ina44p, "mW " -print "X- (0x45) v=",ina45v, "V i=", ina45i, "mA p=", ina45p, "mW " +print "+X (0x40) v=",ina40v, "V i=", ina40i, "mA p=", ina40p, "mW " +print "+Y (0x41) v=",ina41v, "V i=", ina41i, "mA p=", ina41p, "mW " +print "+Z (0x44) v=",ina44v, "V i=", ina44i, "mA p=", ina44p, "mW " +print "-X (0x45) v=",ina45v, "V i=", ina45i, "mA p=", ina45p, "mW " print "5V Supply(0x4a) v=",ina4av, "V i=", ina4ai, "mA p=", ina4ap, "mW " print From f0457202b86b6d0c7aae8323d1a76eef763d76bd Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sat, 9 Mar 2019 09:58:49 -0500 Subject: [PATCH 2/3] output data in comma separated format every 1 second --- python/readdata.py | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 python/readdata.py diff --git a/python/readdata.py b/python/readdata.py new file mode 100644 index 00000000..1e2929cf --- /dev/null +++ b/python/readdata.py @@ -0,0 +1,88 @@ +SHUNT_OHMS = 0.01 +MAX_EXPECTED_AMPS = 2.5 +SHUNT_OHMS45 = 0.1 +MAX_EXPECTED_AMPS45 = 0.6 +ina40v = 0 +ina40i = 0 +ina40p = 0 +ina41v = 0 +ina41i = 0 +ina41p = 0 +ina44v = 0 +ina44i = 0 +ina44p = 0 +ina45v = 0 +ina45i = 0 +ina45p = 0 +ina4av = 0 +ina4ai = 0 +ina4ap = 0 + +FAIL = -1 + +try: + from ina219 import INA219 + from ina219 import DeviceRangeError + INA219DISABLE=-1 +except: + INA219DISABLE=1 + +while True: + time.sleep(1) + if INA219DISABLE !=1: + try: + ina40 = INA219(SHUNT_OHMS45, MAX_EXPECTED_AMPS45, 0x40) + ina40.wake(); + ina40.configure(ina40.RANGE_16V) + ina40.busnum = 0; + ina40v = ina40.voltage() + ina40i = ina40.current() + ina40p = ina40.power() + ina40.sleep(); + except: + FAIL = 1 + try: + ina41 = INA219(SHUNT_OHMS45, MAX_EXPECTED_AMPS45, 0x41) + ina41.wake(); + ina41.configure(ina41.RANGE_16V) + ina41.busnum = 1; + ina41v = ina41.voltage() + ina41i = ina41.current() + ina41p = ina41.power() + ina41.sleep(); + except: + FAIL = 1 + try: + ina44 = INA219(SHUNT_OHMS45, MAX_EXPECTED_AMPS45, 0x44) + ina44.wake(); + ina44.configure(ina44.RANGE_16V) + ina44.busnum = 1; + ina44v = ina44.voltage() + ina44i = ina44.current() + ina44p = ina44.power() + ina44.sleep(); + except: + FAIL = 1 + try: + ina45 = INA219(SHUNT_OHMS45, MAX_EXPECTED_AMPS45, 0x45) + ina45.wake(); + ina45.configure(ina45.RANGE_16V) + ina45.busnum = 1; + ina45v = ina45.voltage() + ina45i = ina45.current() + ina45p = ina45.power() + ina45.sleep(); + except: + FAIL = 1 + try: + ina4a = INA219(SHUNT_OHMS, MAX_EXPECTED_AMPS, 0x4a) + ina4a.wake(); + ina4a.configure(ina4a.RANGE_16V) + ina4a.busnum = 1; + ina4av = ina4a.voltage() + ina4ai = ina4a.current() + ina4ap = ina4a.power() + ina4a.sleep(); + except: + FAIL = 1 + print ina40v, ",", ina40i,",", ina40p,",", ina41v,",", ina41i,",", ina41p,",", ina44v,",", ina44i,",", ina44p,",", ina45v,",", ina45i,",", ina45p,",", ina4av,",", ina4ai,",", ina4ap From 0b352d75ec003540b78ee23e8e19e6869fad4cd5 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sat, 16 Mar 2019 20:12:40 -0400 Subject: [PATCH 3/3] changed 1000 to 999 in fgets --- afsk/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index 0258835c..6a332eb3 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -161,7 +161,7 @@ int main(void) { if (charging) { FILE* file1 = popen("/home/pi/mopower/mpcmd LED_STAT=1", "r"); - fgets(cmdbuffer, 1000, file1); + fgets(cmdbuffer, 999, file1); pclose(file1); // printf("LED state: %s\n", cmdbuffer); @@ -178,7 +178,7 @@ int main(void) { } ax5043_wait_for_transmit(); FILE* file2 = popen("/home/pi/mopower/mpcmd LED_STAT=0", "r"); - fgets(cmdbuffer, 1000, file2); + fgets(cmdbuffer, 999, file2); pclose(file2); // printf("LED state: %s\n", cmdbuffer); @@ -233,7 +233,7 @@ int get_tlm(int tlm[][5]) { char cmdbuffer[1000]; FILE* file = popen("sudo python /home/pi/CubeSatSim/python/readcurrent.py 2>&1", "r"); - fgets(cmdbuffer, 1000, file); + fgets(cmdbuffer, 999, file); pclose(file); printf("I2C Sensor data: %s\n", cmdbuffer); @@ -251,7 +251,7 @@ int get_tlm(int tlm[][5]) { // Reading MoPower telemetry info file = popen("/home/pi/mopower/mpcmd show data", "r"); - fgets(cmdbuffer, 1000, file); + fgets(cmdbuffer, 999 file); pclose(file); // printf("MoPower data: %s\n", cmdbuffer);