From d0641acb437a703e41d29bd0ec842487e8cd3c7d Mon Sep 17 00:00:00 2001
From: Alexander Opremcak <opremcak@wisc.edu>
Date: Fri, 11 Dec 2015 10:39:05 -0600
Subject: [PATCH 1/2] Fix asynchrony bugs in dc_rack_server.py

---
 DCRack/dc_rack_server.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/DCRack/dc_rack_server.py b/DCRack/dc_rack_server.py
index 6cf20193..6befd4e1 100644
--- a/DCRack/dc_rack_server.py
+++ b/DCRack/dc_rack_server.py
@@ -175,7 +175,6 @@ def shutdown(self):
     def write(self, code):
         """Write a data value to the dc rack."""
         yield self.packet().write(code).send()
-        print code
 
     @inlineCallbacks
     def initDACs(self):
@@ -273,7 +272,6 @@ def changeLEDs(self, data):
             data = 4*data[0] + 2*data[1] + 1*data[2]
         else:
             data &= 0x7
-        self.write([1L])
         yield self.write([OP_LEDS | data])
         returnValue(data)
 
@@ -518,7 +516,7 @@ def list_cards(self, c):
         """List cards configured in the registry (does not query cards directly)."""
         dev = self.selectedDevice(c)
         cards = dev.returnCardList()
-        returnValue(cards)
+        return cards
 
     @setting(455, 'get_preamp_state')
     def getPreampState(self, c, cardNumber, channel):
@@ -607,7 +605,7 @@ def state(self):
 
     def strState(self):
         """Returns the channel state as a list of strings"""
-        s = list(self.state)
+        s = list(self.state()) # self.state is a method, not an attribute... 
         s[-1] = str(s[-1])
         return s
 

From 2b05ffba941b63783c6b461100e2848b5ba6888b Mon Sep 17 00:00:00 2001
From: Alexander Opremcak <opremcak@wisc.edu>
Date: Tue, 15 Dec 2015 16:32:17 -0600
Subject: [PATCH 2/2] Removed comment from strState method and added back in
 write statement into changeLEDs method

---
 DCRack/dc_rack_server.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/DCRack/dc_rack_server.py b/DCRack/dc_rack_server.py
index 6befd4e1..9e764218 100644
--- a/DCRack/dc_rack_server.py
+++ b/DCRack/dc_rack_server.py
@@ -272,6 +272,7 @@ def changeLEDs(self, data):
             data = 4*data[0] + 2*data[1] + 1*data[2]
         else:
             data &= 0x7
+        yield self.write([1L])
         yield self.write([OP_LEDS | data])
         returnValue(data)
 
@@ -605,7 +606,7 @@ def state(self):
 
     def strState(self):
         """Returns the channel state as a list of strings"""
-        s = list(self.state()) # self.state is a method, not an attribute... 
+        s = list(self.state())
         s[-1] = str(s[-1])
         return s