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: 179416dac75d
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: 4e35a247d1fa
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 28, 2015

  1. devices/pdq2: add RPC getter functions

    @sbourdeauducq
    sbourdeauducq committed Oct 28, 2015
    Copy the full SHA
    d708002 View commit details

  2. pdq2_client: remove init call

    @sbourdeauducq
    sbourdeauducq committed Oct 28, 2015
    Copy the full SHA
    3789273 View commit details

  3. pdq2_client: remove unnecessary calls

    @sbourdeauducq
    sbourdeauducq committed Oct 28, 2015
    Copy the full SHA
    4e35a24 View commit details
Showing with 6 additions and 3 deletions.
  1. +6 −0 artiq/devices/pdq2/driver.py
  2. +0 −3 artiq/frontend/pdq2_client.py
6 changes: 6 additions & 0 deletions artiq/devices/pdq2/driver.py
View file
Original file line number Diff line number Diff line change
@@ -139,6 +139,12 @@ def __init__(self, url=None, dev=None, num_boards=3):
self.num_channels = self.num_dacs * self.num_boards
self.channels = [Channel() for i in range(self.num_channels)]

def get_num_boards(self):
return self.num_boards

def get_num_channels(self):
return self.num_channels

def close(self):
self.dev.close()
del self.dev
3 changes: 0 additions & 3 deletions artiq/frontend/pdq2_client.py
View file
Original file line number Diff line number Diff line change
@@ -55,7 +55,6 @@ def main():
args = get_argparser().parse_args()
init_logger(args)
dev = Client(args.server, args.port, "pdq2")
dev.init()

if args.reset:
dev.write(b"\x00\x00") # flush any escape
@@ -66,8 +65,6 @@ def main():
dev.cmd("DCM", args.dcm)
freq = 100e6 if args.dcm else 50e6
dev.set_freq(freq)
num_channels = dev.get_num_channels()
num_frames = dev.get_num_frames()
times = eval(args.times, globals(), {})
voltages = eval(args.voltages, globals(), dict(t=times))