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: b226dbd2573b
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: b3e4a1df03c0
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 21, 2016

  1. Copy the full SHA
    c73b1af View commit details
  2. sawg: adapt basic example

    jordens committed Nov 21, 2016
    Copy the full SHA
    b3e4a1d View commit details
Showing with 13 additions and 13 deletions.
  1. +1 −1 artiq/coredevice/sawg.py
  2. +12 −12 artiq/examples/phaser/repository/sawg.py
2 changes: 1 addition & 1 deletion artiq/coredevice/sawg.py
Original file line number Diff line number Diff line change
@@ -107,7 +107,7 @@ class SAWG:
"""
kernel_invariants = {"channel_base", "core",
"amplitude1", "frequency1", "phase1",
"amplitude2", "frequency2", "phase2"
"amplitude2", "frequency2", "phase2",
"frequency0", "phase0", "offset"}

def __init__(self, dmgr, channel_base, parallelism, core_device="core"):
24 changes: 12 additions & 12 deletions artiq/examples/phaser/repository/sawg.py
Original file line number Diff line number Diff line change
@@ -15,18 +15,18 @@ def build(self):
def run(self):
self.core.break_realtime()

self.sawg0.set_amplitude(.1)
self.sawg0.set_frequency(10*MHz)
self.sawg0.set_phase(0.)
self.sawg1.set_amplitude(-.9)
self.sawg1.set_frequency(20*MHz)
self.sawg1.set_phase(0.)
self.sawg2.set_amplitude(.5)
self.sawg2.set_frequency(30*MHz)
self.sawg2.set_phase(0.)
self.sawg3.set_amplitude(.5)
self.sawg3.set_frequency(30*MHz)
self.sawg3.set_phase(.5)
self.sawg0.amplitude1.set(.1)
self.sawg0.frequency0.set(10*MHz)
self.sawg0.phase0.set(0.)
self.sawg1.amplitude1.set(-.9)
self.sawg1.frequency0.set(20*MHz)
self.sawg1.phase0.set(0.)
self.sawg2.amplitude1.set(.5)
self.sawg2.frequency0.set(30*MHz)
self.sawg2.phase0.set(0.)
self.sawg3.amplitude1.set(.5)
self.sawg3.frequency0.set(30*MHz)
self.sawg3.phase0.set(.5)

for i in range(10):
self.led.pulse(100*ms)