From 3cbcb3bff6a48f6d6d71ba45f25acb48cb203135 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Fri, 18 May 2018 23:20:40 +0800 Subject: [PATCH] move mitll, sysu and ustc device_dbs to kasli_basic --- .../device_db_mitll.py} | 0 .../device_db_sysu.py} | 0 .../device_db_ustc.py} | 0 artiq/examples/kasli_mitll/repository/demo.py | 54 ------------ artiq/examples/kasli_sysu/repository/demo.py | 52 ------------ artiq/examples/kasli_ustc/repository/demo.py | 82 ------------------- 6 files changed, 188 deletions(-) rename artiq/examples/{kasli_mitll/device_db.py => kasli_basic/device_db_mitll.py} (100%) rename artiq/examples/{kasli_sysu/device_db.py => kasli_basic/device_db_sysu.py} (100%) rename artiq/examples/{kasli_ustc/device_db.py => kasli_basic/device_db_ustc.py} (100%) delete mode 100644 artiq/examples/kasli_mitll/repository/demo.py delete mode 100644 artiq/examples/kasli_sysu/repository/demo.py delete mode 100644 artiq/examples/kasli_ustc/repository/demo.py diff --git a/artiq/examples/kasli_mitll/device_db.py b/artiq/examples/kasli_basic/device_db_mitll.py similarity index 100% rename from artiq/examples/kasli_mitll/device_db.py rename to artiq/examples/kasli_basic/device_db_mitll.py diff --git a/artiq/examples/kasli_sysu/device_db.py b/artiq/examples/kasli_basic/device_db_sysu.py similarity index 100% rename from artiq/examples/kasli_sysu/device_db.py rename to artiq/examples/kasli_basic/device_db_sysu.py diff --git a/artiq/examples/kasli_ustc/device_db.py b/artiq/examples/kasli_basic/device_db_ustc.py similarity index 100% rename from artiq/examples/kasli_ustc/device_db.py rename to artiq/examples/kasli_basic/device_db_ustc.py diff --git a/artiq/examples/kasli_mitll/repository/demo.py b/artiq/examples/kasli_mitll/repository/demo.py deleted file mode 100644 index eafb6d4ea..000000000 --- a/artiq/examples/kasli_mitll/repository/demo.py +++ /dev/null @@ -1,54 +0,0 @@ -from artiq.experiment import * - - -class UrukulTest(EnvExperiment): - def build(self): - self.setattr_device("core") - self.setattr_device("urukul0_cpld") - self.setattr_device("urukul0_ch0") - self.setattr_device("urukul0_ch1") - self.setattr_device("urukul0_ch2") - self.setattr_device("urukul0_ch3") - self.setattr_device("led0") - self.setattr_device("led1") - self.ttl = self.get_device("ttl0") - - @kernel - def run(self): - self.core.reset() - self.ttl.output() - delay(1*us) - - self.urukul0_cpld.init() - self.urukul0_ch0.init() - self.urukul0_ch1.init() - self.urukul0_ch2.init() - self.urukul0_ch3.init() - - delay(1000*us) - self.urukul0_ch0.set(10*MHz) - self.urukul0_ch0.sw.on() - self.urukul0_ch0.set_att(10.) - - delay(1000*us) - self.urukul0_ch1.set(20*MHz, 0.5) - self.urukul0_ch1.sw.on() - self.urukul0_ch1.set_att(8.) - - delay(1000*us) - self.urukul0_ch2.set(30*MHz) - self.urukul0_ch2.sw.on() - self.urukul0_ch2.set_att(6.) - - delay(1000*us) - self.urukul0_ch3.set(40*MHz) - self.urukul0_ch3.sw.on() - self.urukul0_ch3.set_att(4.) - - while True: - with parallel: - self.ttl.pulse(100*ms) - self.urukul0_ch0.sw.pulse(100*ms) - delay(100*ms) - self.led0.pulse(100*ms) - self.led1.pulse(100*ms) diff --git a/artiq/examples/kasli_sysu/repository/demo.py b/artiq/examples/kasli_sysu/repository/demo.py deleted file mode 100644 index bdb3b9361..000000000 --- a/artiq/examples/kasli_sysu/repository/demo.py +++ /dev/null @@ -1,52 +0,0 @@ -from artiq.experiment import * - - -class UrukulTest(EnvExperiment): - def build(self): - self.setattr_device("core") - self.setattr_device("urukul0_cpld") - self.setattr_device("urukul0_ch0") - self.setattr_device("urukul0_ch1") - self.setattr_device("urukul0_ch2") - self.setattr_device("urukul0_ch3") - self.setattr_device("led0") - self.ttl = self.get_device("ttl16") - - @kernel - def run(self): - self.core.reset() - self.ttl.output() - delay(1*us) - - self.urukul0_cpld.init() - self.urukul0_ch0.init() - self.urukul0_ch1.init() - self.urukul0_ch2.init() - self.urukul0_ch3.init() - - delay(1000*us) - self.urukul0_ch0.set(10*MHz) - self.urukul0_ch0.sw.on() - self.urukul0_ch0.set_att(10.) - - delay(1000*us) - self.urukul0_ch1.set(20*MHz, 0.5) - self.urukul0_ch1.sw.on() - self.urukul0_ch1.set_att(8.) - - delay(1000*us) - self.urukul0_ch2.set(30*MHz) - self.urukul0_ch2.sw.on() - self.urukul0_ch2.set_att(6.) - - delay(1000*us) - self.urukul0_ch3.set(40*MHz) - self.urukul0_ch3.sw.on() - self.urukul0_ch3.set_att(4.) - - while True: - with parallel: - self.ttl.pulse(100*ms) - self.urukul0_ch0.sw.pulse(100*ms) - delay(100*ms) - self.led0.pulse(100*ms) diff --git a/artiq/examples/kasli_ustc/repository/demo.py b/artiq/examples/kasli_ustc/repository/demo.py deleted file mode 100644 index 169856a08..000000000 --- a/artiq/examples/kasli_ustc/repository/demo.py +++ /dev/null @@ -1,82 +0,0 @@ -from artiq.experiment import * - - -class UrukulTest(EnvExperiment): - def build(self): - self.setattr_device("core") - self.setattr_device("urukul0_cpld") - self.setattr_device("urukul0_ch0") - self.setattr_device("urukul0_ch1") - self.setattr_device("urukul0_ch2") - self.setattr_device("urukul0_ch3") - self.setattr_device("urukul1_cpld") - self.setattr_device("urukul1_ch0") - self.setattr_device("urukul1_ch1") - self.setattr_device("urukul1_ch2") - self.setattr_device("urukul1_ch3") - self.setattr_device("led0") - self.ttl = self.get_device("ttl16") - - @kernel - def run(self): - self.core.reset() - self.ttl.output() - delay(1*us) - - self.urukul0_cpld.init() - self.urukul0_ch0.init() - self.urukul0_ch1.init() - self.urukul0_ch2.init() - self.urukul0_ch3.init() - self.urukul1_cpld.init() - self.urukul1_ch0.init() - self.urukul1_ch1.init() - self.urukul1_ch2.init() - self.urukul1_ch3.init() - - delay(1000*us) - self.urukul0_ch0.set(10*MHz) - self.urukul0_ch0.sw.on() - self.urukul0_ch0.set_att(10.) - - delay(1000*us) - self.urukul0_ch1.set(20*MHz, 0.5) - self.urukul0_ch1.sw.on() - self.urukul0_ch1.set_att(8.) - - delay(1000*us) - self.urukul0_ch2.set(30*MHz) - self.urukul0_ch2.sw.on() - self.urukul0_ch2.set_att(6.) - - delay(1000*us) - self.urukul0_ch3.set(40*MHz) - self.urukul0_ch3.sw.on() - self.urukul0_ch3.set_att(4.) - - delay(1000*us) - self.urukul1_ch0.set(15*MHz) - self.urukul1_ch0.sw.on() - self.urukul1_ch0.set_att(10.) - - delay(1000*us) - self.urukul1_ch1.set(25*MHz, 0.5) - self.urukul1_ch1.sw.on() - self.urukul1_ch1.set_att(8.) - - delay(1000*us) - self.urukul1_ch2.set(35*MHz) - self.urukul1_ch2.sw.on() - self.urukul1_ch2.set_att(6.) - - delay(1000*us) - self.urukul1_ch3.set(45*MHz) - self.urukul1_ch3.sw.on() - self.urukul1_ch3.set_att(4.) - - while True: - with parallel: - self.ttl.pulse(100*ms) - self.urukul0_ch0.sw.pulse(100*ms) - delay(100*ms) - self.led0.pulse(100*ms)