Skip to content

Instantly share code, notes, and snippets.

@jbqubit
Created October 23, 2016 20:49
Show Gist options
  • Save jbqubit/690fcba84d73e94aad62f09e9c4aa769 to your computer and use it in GitHub Desktop.
Save jbqubit/690fcba84d73e94aad62f09e9c4aa769 to your computer and use it in GitHub Desktop.
$ cat out.txt
diff --git a/artiq/devices/novatech409b/driver.py b/artiq/devices/novatech409b/driver.py
index 4a73454..bda3742 100644
--- a/artiq/devices/novatech409b/driver.py
+++ b/artiq/devices/novatech409b/driver.py
@@ -108,6 +108,14 @@ class Novatech409B:
"""Save current state to EEPROM."""
await self._ser_send("S")
+ async def external_clock(self, ext=False):
+ """Use external clock."""
+ if ext:
+ await self._ser_send("C E")
+ else:
+ await self._ser_send("C I")
+ await self._ser_send("S")
+
async def set_phase_continuous(self, is_continuous):
"""Toggle phase continuous mode.
diff --git a/artiq/examples/artiq_ipython_notebook.ipynb b/artiq/examples/artiq_ipython_notebook.ipynb
index 6a37fa8..1d195ef 100644
--- a/artiq/examples/artiq_ipython_notebook.ipynb
+++ b/artiq/examples/artiq_ipython_notebook.ipynb
@@ -343,7 +343,9 @@
"collapsed": true
},
"outputs": [],
- "source": []
+ "source": [
+ ""
+ ]
}
],
"metadata": {
@@ -355,7 +357,7 @@
"language_info": {
"codemirror_mode": {
"name": "ipython",
- "version": 3
+ "version": 3.0
},
"file_extension": ".py",
"mimetype": "text/x-python",
@@ -367,4 +369,4 @@
},
"nbformat": 4,
"nbformat_minor": 0
-}
+}
\ No newline at end of file
diff --git a/artiq/examples/master/device_db.pyon b/artiq/examples/master/device_db.pyon
index f5811ee..01613fe 100644
--- a/artiq/examples/master/device_db.pyon
+++ b/artiq/examples/master/device_db.pyon
@@ -7,7 +7,7 @@
"type": "local",
"module": "artiq.coredevice.comm_tcp",
"class": "Comm",
- "arguments": {"host": "kc705.lab.m-labs.hk"}
+ "arguments": {"host": "192.168.1.71"}
},
"core": {
"type": "local",
diff --git a/artiq/examples/phaser/device_db.pyon b/artiq/examples/phaser/device_db.pyon
index c9bfe06..0c5e9b8 100644
--- a/artiq/examples/phaser/device_db.pyon
+++ b/artiq/examples/phaser/device_db.pyon
@@ -5,7 +5,7 @@
"type": "local",
"module": "artiq.coredevice.comm_tcp",
"class": "Comm",
- "arguments": {"host": "kc705aux.lab.m-labs.hk"}
+ "arguments": {"host": "192.168.1.71"}
},
"core": {
"type": "local",
diff --git a/artiq/examples/phaser/repository/dac_setup.py b/artiq/examples/phaser/repository/dac_setup.py
index ed9a2da..6b5e913 100644
--- a/artiq/examples/phaser/repository/dac_setup.py
+++ b/artiq/examples/phaser/repository/dac_setup.py
@@ -1,9 +1,13 @@
+import logging
+
+
from jesd204b.common import (JESD204BPhysicalSettings,
JESD204BTransportSettings,
JESD204BSettings)
from artiq.experiment import *
from artiq.coredevice.ad9154_reg import *
+
# ad9154 mode 2:
ps = JESD204BPhysicalSettings(
l=4, # lanes
@@ -27,6 +31,7 @@ jesd_checksum = jesd_settings.get_configuration_checksum()
class DACSetup(EnvExperiment):
def build(self):
+ logging.debug("build()")
self.setattr_device("core")
self.setattr_device("led")
self.setattr_device("ad9154")
@@ -38,7 +43,9 @@ class DACSetup(EnvExperiment):
# https://github.com/m-labs/jesd204b/issues/6
# is resolved
for i in range(99):
+ logging.debug(i)
try:
+ logging.debug(i)
self.cfg()
return
except:
@@ -47,14 +54,22 @@ class DACSetup(EnvExperiment):
@kernel
def cfg(self):
+ logging.debug("cfg core reset")
self.core.reset()
+ logging.debug("cfg enabling jesd")
self.ad9154.jesd_enable(0)
+ logging.debug("cfg jesd_prbs")
self.ad9154.jesd_prbs(0)
+ logging.debug("cfg jesd_stpl")
self.ad9154.jesd_stpl(0)
self.busywait_us(10000)
+ logging.debug("cfg jesd_enable")
self.ad9154.jesd_enable(1)
+ logging.debug("cfg 9154 init")
self.ad9154.init()
+ logging.debug("cfg dac_setup")
self.dac_setup()
+ #print("debug 2")
self.ad9154.jesd_enable(0)
self.busywait_us(10000)
self.ad9154.jesd_enable(1)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment