Skip to content

Fix asynchrony bugs in dc_rack_server.py #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amopremcak wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix asynchrony bugs in dc_rack_server.py #293

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0641ac
Fix asynchrony bugs in dc_rack_server.py
amopremcak Dec 11, 2015
2b05ffb
Removed comment from strState method and added back in write statemen…
amopremcak Dec 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions DCRack/dc_rack_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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])
Copy link
Member

@DanielSank DanielSank Dec 12, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice if someone could comment on why this was here in the first place. @zchen088 @thchwhite?

Copy link
Contributor

@zchen088 zchen088 Dec 12, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no idea what this does.

returnValue(data)

Expand Down Expand Up @@ -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):
Expand Down Expand Up @@ -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

Expand Down