Changeset 75

Timestamp:

Feb 11, 2010, 8:10:33 PM (15 years ago)

Author:

Rick van der Zwet

Message:

Status hack

File:

• powerbar/npm4000.py (modified) (9 diffs)

powerbar/npm4000.py

@@ +1 @@
+#!/usr/bin/env python
 # NPM 4000 powerbar managment script, to be used instead of the windows
 # application. 
+#
 # XXX: Not all features are ported yet (like amp monitoring)
 # XXX: Some dirty poking around with hex representations and numeric representations of ports
-# 
+# XXX: Make proper classes for use 
+# XXX: Documentation
+#
 # Licence: BSD
 # Version: $Id: npm4000.py 750 2009-09-27 14:34:55Z rick $
 # Rick van der Zwet <info@rickvanderzwet.nl>
+
 import socket, time
 import getopt, sys
@@ -130 +135 @@
         return False
 
-def getPortStatus(port):
+def getPortStatus(i):
     raw_status = doCommand('status')
-    retval = getPortState(port,raw_status)
-    dprint("Port %i: %s" % (port, retval))
+    print "Port %02i [%s]:" % (i, getPortName(i)),
+    if getPortState(i,raw_status):
+        print "1"
+    else:
+        print "0"
     return(retval)
 
-def getStatus():
+def getStatusAll():
     raw_status= doCommand('status')
     for i in range(1,25):
@@ -146 +154 @@
 
 def togglePort(port):
-    portNumber = getPortNumber("%X" % port)
-    if getPortStatus(portNumber):
+    if getPortState(port):
         doCommand('portOff',port)
     else:
@@ -198 +205 @@
     try:
         opts, args = getopt.getopt(sys.argv[1:], 
-            "hf:st:o:v", ["help","verbose","host=", "port=", "password=", "addresscode=","toggle=","off=", "on=", "status"])
+            "hf:s:t:o:v", ["help","verbose","host=", "port=", "password=", "addresscode=","toggle=","off=", "on=", "status="])
     except getopt.GetoptError, err:
         # print help information and exit:
@@ -207 +214 @@
     opt_port = None
     opt_action = None
-    opt_status = None
     for o, a in opts:
         if o in ("-v", "--verbose"):
@@ -223 +229 @@
             inet_port = a
         elif o in ("-s", "--status"):
-            opt_status = True
+            opt_action = "status"
+            opt_port = a
         elif o in ("-t","--toggle"):
             opt_action = "toggle"
@@ -236 +243 @@
             assert False, "unhandled option"
 
-    if (opt_status):
-        getStatus()
-        sys.exit(0)
-    elif (opt_port == None or opt_action == None):
+    if (opt_port == None or opt_action == None):
         usage()
         sys.exit(2)
 
     dprint ('action: ' + opt_action + ' port: ' + opt_port) 
+
+    s.connect((inet_addr, inet_port))
+
+    # Status needs real integers, hack
+    if opt_action == "status":
+        if opt_port == "all":
+            getStatusAll()
+        else:
+            print "XXX: Implement"
+        sys.exit(0)
 
     # Resolve port to proper number
@@ -256 +270 @@
         dprint('Hexcode of port: %i' % opt_port)
 
-    s.connect((inet_addr, inet_port))
-
     if opt_action == "toggle":
         if opt_port == "all":
@@ -275 +287 @@
             doCommand("portOn", opt_port)
 
+
 if __name__ == "__main__":
     main()