From 3b10782fcc40702a6e699629efd98db179773d60 Mon Sep 17 00:00:00 2001
From: "sebastian.sjoholm" <sebastian.sjoholm@gmail.com>
Date: Wed, 9 Jan 2013 19:17:23 +0000
Subject: Fix with "all"

---
 drcontrol.py | 48 +++++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

(limited to 'drcontrol.py')

diff --git a/drcontrol.py b/drcontrol.py
index ba8a1e6..5618d41 100755
--- a/drcontrol.py
+++ b/drcontrol.py
@@ -146,33 +146,35 @@ def set_relay():
         with BitBangDevice(cmdarg.device) as bb:
 			
             # Action towards specific relay
-            if int(cmdarg.relay) >= 1 and int(cmdarg.relay) <= 8:
+            if cmdarg.relay.isdigit():
+				
+                if int(cmdarg.relay) >= 1 and int(cmdarg.relay) <= 8:
 
-                # Turn relay ON
-                if cmdarg.command == "on":
-                    if cmdarg.verbose:
-                        print "Relay " + str(cmdarg.relay) + " to ON"
-                    bb.port |= int(relay.address[cmdarg.relay], 16)
-
-                # Turn relay OFF
-                elif cmdarg.command == "off":
-                    if cmdarg.verbose:
-                        print "Relay "  + str(cmdarg.relay) + " to OFF"
-                    bb.port &= ~int(relay.address[cmdarg.relay], 16)
-
-                # Print relay status
-                elif cmdarg.command == "state":
-                    state = get_relay_state( bb.port, cmdarg.relay )
-                    if state == 0:
+                    # Turn relay ON
+                    if cmdarg.command == "on":
                         if cmdarg.verbose:
-                            print "Relay " + cmdarg.relay + " state:\tOFF (" + str(state) + ")"
-                        else:
-                            print "OFF"
-                    else:
+                            print "Relay " + str(cmdarg.relay) + " to ON"
+                        bb.port |= int(relay.address[cmdarg.relay], 16)
+
+                    # Turn relay OFF
+                    elif cmdarg.command == "off":
                         if cmdarg.verbose:
-                            print "Relay " + cmdarg.relay + " state:\tON (" + str(state) + ")"
+                            print "Relay "  + str(cmdarg.relay) + " to OFF"
+                        bb.port &= ~int(relay.address[cmdarg.relay], 16)
+
+                    # Print relay status
+                    elif cmdarg.command == "state":
+                        state = get_relay_state( bb.port, cmdarg.relay )
+                        if state == 0:
+                            if cmdarg.verbose:
+                                print "Relay " + cmdarg.relay + " state:\tOFF (" + str(state) + ")"
+                            else:
+                                print "OFF"
                         else:
-                            print "ON"
+                            if cmdarg.verbose:
+                                print "Relay " + cmdarg.relay + " state:\tON (" + str(state) + ")"
+                            else:
+                                print "ON"
 
             # Action towards all relays
             elif cmdarg.relay == "all":
-- 
cgit v1.1