Skip to content

Fixing status typo and adding option to use LVPM. #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
redmercury wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixing status typo and adding option to use LVPM. #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions hvpm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import sys
import time
import Monsoon.HVPM as HVPM
import Monsoon.LVPM as LVPM
import Monsoon.sampleEngine as sampleEngine
import Monsoon.Operations as op

Expand All @@ -36,8 +37,12 @@ def main(unused_argv):
if FLAGS.avg and FLAGS.avg < 0:
print "--avg must be greater than 0"
return

if FLAGS.lvpm:
mon = LVPM.Monsoon()
else:
mon = HVPM.Monsoon()

mon = HVPM.Monsoon()
mon.setup_usb()

if FLAGS.voltage is not None:
Expand All @@ -48,7 +53,7 @@ def main(unused_argv):

if FLAGS.status:
print "Serialno : %d\n" % mon.getSerialNumber();
mon.fillAllStatusPacket()
Copy link
Contributor

@ccfries ccfries Aug 23, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So,
I accidentally committed this work-in-progress :)

I did add fillAllStatusPacket (in only HVPM) in another pull request, but I had some questions as to what was the intention of it, or if my additions just belonged in fillStatusPacket.

Copy link
Collaborator

@Mbrinker Mbrinker Aug 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leaving this open for the moment. The intention of fillStatusPacket() is what you're suspecting it was, to fill in every applicable value from the firmware. Since I removed fillAllStatusPacket() from HVPM when merging them, your code will be break slightly.

mon.fillStatusPacket()
status = mon.statusPacket
attrs = vars(status)
print '\n'.join("%s : %s" % item for item in attrs.items())
Expand Down Expand Up @@ -108,6 +113,7 @@ def AmpsToApi(amps):
flags.DEFINE_list("output", ["main"], "Comma-separated list of sample types "
"to output (select from: main, usb, aux, voltage).")
flags.DEFINE_string("delimiter", " ", "Output delimiter.")
flags.DEFINE_boolean("lvpm", False, "Low-voltage power meter.")

main(FLAGS(sys.argv))