Changeset 360

Timestamp:

Jan 31, 2012, 7:39:34 AM (13 years ago)

Author:

Rick van der Zwet

Message:

Allow port cycle for hard-reboot of UNIT.

File:

• powerbar/npm2000.py (modified) (5 diffs)

powerbar/npm2000.py

@@ -24 +24 @@
 MAX_PORTS = 8
 
+# Wait a little while to allow device to turn off
+CYCLE_WAIT = 1
+
 # XOR all the 8bit values to get a checksum
 def checksum(s):
@@ -168 +171 @@
         doCommand('portOn', port)
 
+def cyclePort(port):
+    raw_status= doCommand('status')
+    if getPortState(port,raw_status):
+        doCommand('portOff',port)
+        time.sleep(CYCLE_WAIT)
+        doCommand('portOn',port)
+    else:
+        doCommand('portOn', port)
+        time.sleep(CYCLE_WAIT)
+        doCommand('portOff',port)
+
 
 def runTest():
@@ -214 +228 @@
     try:
         opts, args = getopt.getopt(sys.argv[1:], 
-            "hf:s:t:o:v", ["help","verbose","host=", "port=", "password=", "addresscode=","toggle=","off=", "on=", "status="])
+            "c:hf:s:t:o:v", ["cycle=", "help","verbose","host=", "port=", "password=", "addresscode=","toggle=","off=", "on=", "status="])
     except getopt.GetoptError, err:
         # print help information and exit:
@@ -243 +257 @@
             opt_action = "toggle"
             opt_port = a
+        elif o in ("-c","--cycle"):
+            opt_action = "cycle"
+            opt_port = a
         elif o in ("-f","--off"):
             opt_action = "off"
@@ -280 +297 @@
 
     if opt_action == "toggle":
-        if opt_port == "all":
-            for i in range(1,MAX_PORTS+1):
-                togglePort(getPortHex(i))
-        else:
-                togglePort(opt_port)
+      if opt_port == "all":
+        for i in range(1,MAX_PORTS+1):
+          togglePort(getPortHex(i))
+      else:
+        togglePort(opt_port)
+    elif opt_action == "cycle":
+      if opt_port == "all":
+        for i in range(1,MAX_PORTS+1):
+          cyclePort(getPortHex(i))
+      else:
+        cyclePort(opt_port)
     elif opt_action == "on":
         if opt_port == "all":