Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ce57794e7f75
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3c09577ed02e
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 29, 2016

  1. doc/dds: fix init timing margin

    @sbourdeauducq
    sbourdeauducq committed Mar 29, 2016
    Copy the full SHA
    5088886 View commit details

  2. device/thorlabs_tcube: fix port read

    @sbourdeauducq
    sbourdeauducq committed Mar 29, 2016
    Copy the full SHA
    3c09577 View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 artiq/coredevice/dds.py
  2. +2 −2 artiq/devices/thorlabs_tcube/driver.py
2 changes: 1 addition & 1 deletion artiq/coredevice/dds.py
View file
Original file line number Diff line number Diff line change
@@ -145,7 +145,7 @@ def init(self):
This function cannot be used in a batch; the correct way of
initializing multiple DDS channels is to call this function
sequentially with a delay between the calls. 500us provides a good
sequentially with a delay between the calls. 2ms provides a good
timing margin."""
dds_init(now_mu(), self.bus_channel, self.channel)

4 changes: 2 additions & 2 deletions artiq/devices/thorlabs_tcube/driver.py
View file
Original file line number Diff line number Diff line change
@@ -193,12 +193,12 @@ async def send(self, message):
await self.port.write(message.pack())

async def recv(self):
header = await self.port.read(6)
header = await self.port.read_exactly(6)
logger.debug("received header: %s", header)
data = b""
if header[4] & 0x80:
(length, ) = st.unpack("<H", header[2:4])
data = await self.port.read(length)
data = await self.port.read_exactly(length)
r = Message.unpack(header + data)
logger.debug("receiving: %s", r)
return r