Merge branch 'master' into i2c_ina219

pull/1/head
alanbjohnston 7 years ago committed by GitHub
commit 201ae20f67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -322,7 +322,9 @@ int get_tlm(int tlm[][5]) {
// Reading MoPower telemetry info // Reading MoPower telemetry info
/* /*
file = popen("/home/pi/mopower/mpcmd show data", "r"); file = popen("/home/pi/mopower/mpcmd show data", "r");
fgets(cmdbuffer, 999, file); fgets(cmdbuffer, 999, file);
pclose(file); pclose(file);
// printf("MoPower data: %s\n", cmdbuffer); // printf("MoPower data: %s\n", cmdbuffer);

@ -28,6 +28,7 @@ try:
INA219DISABLE=-1 INA219DISABLE=-1
except: except:
INA219DISABLE=1 INA219DISABLE=1
print "+X v\t+X i\t+X p\t+Y v\t+Y i\t+Y p\t+Z v\t+Z i\t+Z p\tVbatt\tibatt\tpbatt\tV5\ti5\tp5\t+X v\t+X i\t+X p\t" print "+X v\t+X i\t+X p\t+Y v\t+Y i\t+Y p\t+Z v\t+Z i\t+Z p\tVbatt\tibatt\tpbatt\tV5\ti5\tp5\t+X v\t+X i\t+X p\t"
while True: while True:
@ -63,6 +64,7 @@ while True:
ina44v = ina44.voltage() ina44v = ina44.voltage()
ina44i = ina44.current() ina44i = ina44.current()
ina44p = ina44.power() ina44p = ina44.power()
ina44.sleep(); ina44.sleep();
except: except:
FAIL = 1 FAIL = 1
@ -89,3 +91,4 @@ while True:
except: except:
FAIL = 1 FAIL = 1
print ina40v, "\t", ina40i,"\t", ina40p,"\t", ina41v,"\t", ina41i,"\t", ina41p,"\t", ina44v,"\t", ina44i,"\t", ina44p,"\t", ina45v,"\t", ina45i,"\t", ina45p,"\t", ina4av,"\t", ina4ai,"\t", ina4ap print ina40v, "\t", ina40i,"\t", ina40p,"\t", ina41v,"\t", ina41i,"\t", ina41p,"\t", ina44v,"\t", ina44i,"\t", ina44p,"\t", ina45v,"\t", ina45i,"\t", ina45p,"\t", ina4av,"\t", ina4ai,"\t", ina4ap

@ -84,9 +84,9 @@ if INA219DISABLE !=1:
except: except:
FAIL = 1 FAIL = 1
print print
print "X+ (0x40) v=",ina40v, "V i=", ina40i, "mA p=", ina40p, "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 "+Y (0x41) v=",ina41v, "V i=", ina41i, "mA p=", ina41p, "mW "
print "Z+ (0x44) v=",ina44v, "V i=", ina44i, "mA p=", ina44p, "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 (0x45) v=",ina45v, "V i=", ina45i, "mA p=", ina45p, "mW "
print "5V Supply(0x4a) v=",ina4av, "V i=", ina4ai, "mA p=", ina4ap, "mW " print "5V Supply(0x4a) v=",ina4av, "V i=", ina4ai, "mA p=", ina4ap, "mW "
print print

Loading…
Cancel
Save

Powered by TurnKey Linux.