Skip to content
This repository has been archived by the owner on Oct 14, 2022. It is now read-only.

Commit

Permalink
voltages: pass async through
Browse files Browse the repository at this point in the history
  • Loading branch information
jordens committed Feb 19, 2019
1 parent f162870 commit 0be5035
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions ptb/voltage_protocol.py
Expand Up @@ -87,7 +87,7 @@ async def _values(self, action, name, values, channels=None):
# assert values_ret == values
return values_ret, channels_ret

def set_voltage(self, values, channels=None):
async def set_voltage(self, values, channels=None):
"""Set output voltages. Voltages become active only after
:meth:`ldac`.
Expand All @@ -99,11 +99,11 @@ def set_voltage(self, values, channels=None):
list(float): Actual values returned by the device.
"""
values = ["{:.4f}".format(_) for _ in values]
values, channels = self._values("set", "volt", values, channels)
values, channels = await self._values("set", "volt", values, channels)
values = [float(_) for _ in values]
return values, channels

def set_gain(self, values, channels=None):
async def set_gain(self, values, channels=None):
"""Set channel gains. Channel gains are processed within the
microcontroller and become active on :meth:`set_volt` and a subsequent
:meth:`ldac`.
Expand All @@ -119,11 +119,11 @@ def set_gain(self, values, channels=None):
list(float): Actual values returned by the device.
"""
values = ["{:.4f}".format(_) for _ in values]
values, channels = self._values("set", "gain", values, channels)
values, channels = await self._values("set", "gain", values, channels)
values = [float(_) for _ in values]
return values, channels

def set_offset(self, values, channels=None):
async def set_offset(self, values, channels=None):
"""Set channel offsets. Channel gains are processed within the
microcontroller and become active on :meth:`set_volt` and a subsequent
:meth:`ldac`.
Expand All @@ -138,11 +138,11 @@ def set_offset(self, values, channels=None):
list(int): Actual values returned by the device.
"""
values = ["{:d}".format(_) for _ in values]
values, channels = self._values("set", "offset", values, channels)
values, channels = await self._values("set", "offset", values, channels)
values = [int(_) for _ in values]
return values, channels

def set_data(self, values, channels=None):
async def set_data(self, values, channels=None):
"""Set raw channel output values. Values are given in DAC LSBs
(integers). Data becomes active only after :meth:`ldac`.
Expand All @@ -154,11 +154,11 @@ def set_data(self, values, channels=None):
list(int): Actual values returned by the device.
"""
values = ["{:d}".format(_) for _ in values]
values, channels = self._values("set", "data", values, channels)
values, channels = await self._values("set", "data", values, channels)
values = [int(_) for _ in values]
return values, channels

def get_data(self, channels=None):
async def get_data(self, channels=None):
"""Get raw channel output values. Values are given in DAC LSBs
(integers).
Expand All @@ -171,6 +171,6 @@ def get_data(self, channels=None):
if channels is None:
channels = list(range(1, 8 + 1))
values = ["0" for i in range(len(channels))]
values, channels = self._values("get", "data", values, channels)
values, channels = await self._values("get", "data", values, channels)
values = [int(_) for _ in values]
return values, channels

0 comments on commit 0be5035

Please sign in to comment.