diff --git a/DCRack/dc_rack_server.py b/DCRack/dc_rack_server.py index 6cf20193..9e764218 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,7 @@ def changeLEDs(self, data): data = 4*data[0] + 2*data[1] + 1*data[2] else: data &= 0x7 - self.write([1L]) + yield self.write([1L]) yield self.write([OP_LEDS | data]) returnValue(data) @@ -518,7 +517,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 +606,7 @@ def state(self): def strState(self): """Returns the channel state as a list of strings""" - s = list(self.state) + s = list(self.state()) s[-1] = str(s[-1]) return s