From 01fa6c1c2ea75b0747dcc6f84c583b489292ed0e Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Mon, 19 Feb 2018 15:46:08 +0800
Subject: [PATCH] reorganize examples

---
 artiq/examples/{kasli => kasli_opticlock}/device_db.py          | 1 -
 artiq/examples/{kasli => kasli_opticlock}/idle_kernel.py        | 0
 artiq/examples/{kasli => kasli_opticlock}/repository/urukul.py  | 0
 artiq/examples/{kc705 => kc705_nist_clock}/device_db.py         | 1 -
 artiq/examples/{kc705 => kc705_nist_clock}/idle_kernel.py       | 0
 artiq/examples/{kc705 => kc705_nist_clock}/repository/ad5360.py | 0
 .../{kc705 => kc705_nist_clock}/repository/blink_forever.py     | 0
 .../{kc705 => kc705_nist_clock}/repository/core_pause.py        | 0
 .../{kc705 => kc705_nist_clock}/repository/dds_setter.py        | 0
 .../examples/{kc705 => kc705_nist_clock}/repository/dds_test.py | 0
 .../{kc705 => kc705_nist_clock}/repository/dma_blink.py         | 0
 .../examples/{kc705 => kc705_nist_clock}/repository/handover.py | 0
 .../{kc705 => kc705_nist_clock}/repository/mandelbrot.py        | 0
 .../{kc705 => kc705_nist_clock}/repository/photon_histogram.py  | 0
 .../{kc705 => kc705_nist_clock}/repository/speed_benchmark.py   | 0
 artiq/examples/{kc705 => kc705_nist_clock}/repository/tdr.py    | 0
 artiq/examples/{kc705 => kc705_nist_clock}/repository/urukul.py | 0
 artiq/examples/sayma_drtio/device_db.py                         | 2 +-
 artiq/examples/sayma_standalone/device_db.py                    | 2 +-
 19 files changed, 2 insertions(+), 4 deletions(-)
 rename artiq/examples/{kasli => kasli_opticlock}/device_db.py (99%)
 rename artiq/examples/{kasli => kasli_opticlock}/idle_kernel.py (100%)
 rename artiq/examples/{kasli => kasli_opticlock}/repository/urukul.py (100%)
 rename artiq/examples/{kc705 => kc705_nist_clock}/device_db.py (99%)
 rename artiq/examples/{kc705 => kc705_nist_clock}/idle_kernel.py (100%)
 rename artiq/examples/{kc705 => kc705_nist_clock}/repository/ad5360.py (100%)
 rename artiq/examples/{kc705 => kc705_nist_clock}/repository/blink_forever.py (100%)
 rename artiq/examples/{kc705 => kc705_nist_clock}/repository/core_pause.py (100%)
 rename artiq/examples/{kc705 => kc705_nist_clock}/repository/dds_setter.py (100%)
 rename artiq/examples/{kc705 => kc705_nist_clock}/repository/dds_test.py (100%)
 rename artiq/examples/{kc705 => kc705_nist_clock}/repository/dma_blink.py (100%)
 rename artiq/examples/{kc705 => kc705_nist_clock}/repository/handover.py (100%)
 rename artiq/examples/{kc705 => kc705_nist_clock}/repository/mandelbrot.py (100%)
 rename artiq/examples/{kc705 => kc705_nist_clock}/repository/photon_histogram.py (100%)
 rename artiq/examples/{kc705 => kc705_nist_clock}/repository/speed_benchmark.py (100%)
 rename artiq/examples/{kc705 => kc705_nist_clock}/repository/tdr.py (100%)
 rename artiq/examples/{kc705 => kc705_nist_clock}/repository/urukul.py (100%)

diff --git a/artiq/examples/kasli/device_db.py b/artiq/examples/kasli_opticlock/device_db.py
similarity index 99%
rename from artiq/examples/kasli/device_db.py
rename to artiq/examples/kasli_opticlock/device_db.py
index 418a4119a..1600797ec 100644
--- a/artiq/examples/kasli/device_db.py
+++ b/artiq/examples/kasli_opticlock/device_db.py
@@ -1,5 +1,4 @@
 # This is an example device database that needs to be adapted to your setup.
-# The RTIO channel numbers here are for OPTICLOCK on KASLI.
 # The list of devices here is not exhaustive.
 
 core_addr = "vettel.ber.quartiq.de"
diff --git a/artiq/examples/kasli/idle_kernel.py b/artiq/examples/kasli_opticlock/idle_kernel.py
similarity index 100%
rename from artiq/examples/kasli/idle_kernel.py
rename to artiq/examples/kasli_opticlock/idle_kernel.py
diff --git a/artiq/examples/kasli/repository/urukul.py b/artiq/examples/kasli_opticlock/repository/urukul.py
similarity index 100%
rename from artiq/examples/kasli/repository/urukul.py
rename to artiq/examples/kasli_opticlock/repository/urukul.py
diff --git a/artiq/examples/kc705/device_db.py b/artiq/examples/kc705_nist_clock/device_db.py
similarity index 99%
rename from artiq/examples/kc705/device_db.py
rename to artiq/examples/kc705_nist_clock/device_db.py
index 28117fca0..1beebf7c1 100644
--- a/artiq/examples/kc705/device_db.py
+++ b/artiq/examples/kc705_nist_clock/device_db.py
@@ -1,5 +1,4 @@
 # This is an example device database that needs to be adapted to your setup.
-# The RTIO channel numbers here are for NIST CLOCK on KC705.
 # The list of devices here is not exhaustive.
 
 core_addr = "kc705-1.lab.m-labs.hk"
diff --git a/artiq/examples/kc705/idle_kernel.py b/artiq/examples/kc705_nist_clock/idle_kernel.py
similarity index 100%
rename from artiq/examples/kc705/idle_kernel.py
rename to artiq/examples/kc705_nist_clock/idle_kernel.py
diff --git a/artiq/examples/kc705/repository/ad5360.py b/artiq/examples/kc705_nist_clock/repository/ad5360.py
similarity index 100%
rename from artiq/examples/kc705/repository/ad5360.py
rename to artiq/examples/kc705_nist_clock/repository/ad5360.py
diff --git a/artiq/examples/kc705/repository/blink_forever.py b/artiq/examples/kc705_nist_clock/repository/blink_forever.py
similarity index 100%
rename from artiq/examples/kc705/repository/blink_forever.py
rename to artiq/examples/kc705_nist_clock/repository/blink_forever.py
diff --git a/artiq/examples/kc705/repository/core_pause.py b/artiq/examples/kc705_nist_clock/repository/core_pause.py
similarity index 100%
rename from artiq/examples/kc705/repository/core_pause.py
rename to artiq/examples/kc705_nist_clock/repository/core_pause.py
diff --git a/artiq/examples/kc705/repository/dds_setter.py b/artiq/examples/kc705_nist_clock/repository/dds_setter.py
similarity index 100%
rename from artiq/examples/kc705/repository/dds_setter.py
rename to artiq/examples/kc705_nist_clock/repository/dds_setter.py
diff --git a/artiq/examples/kc705/repository/dds_test.py b/artiq/examples/kc705_nist_clock/repository/dds_test.py
similarity index 100%
rename from artiq/examples/kc705/repository/dds_test.py
rename to artiq/examples/kc705_nist_clock/repository/dds_test.py
diff --git a/artiq/examples/kc705/repository/dma_blink.py b/artiq/examples/kc705_nist_clock/repository/dma_blink.py
similarity index 100%
rename from artiq/examples/kc705/repository/dma_blink.py
rename to artiq/examples/kc705_nist_clock/repository/dma_blink.py
diff --git a/artiq/examples/kc705/repository/handover.py b/artiq/examples/kc705_nist_clock/repository/handover.py
similarity index 100%
rename from artiq/examples/kc705/repository/handover.py
rename to artiq/examples/kc705_nist_clock/repository/handover.py
diff --git a/artiq/examples/kc705/repository/mandelbrot.py b/artiq/examples/kc705_nist_clock/repository/mandelbrot.py
similarity index 100%
rename from artiq/examples/kc705/repository/mandelbrot.py
rename to artiq/examples/kc705_nist_clock/repository/mandelbrot.py
diff --git a/artiq/examples/kc705/repository/photon_histogram.py b/artiq/examples/kc705_nist_clock/repository/photon_histogram.py
similarity index 100%
rename from artiq/examples/kc705/repository/photon_histogram.py
rename to artiq/examples/kc705_nist_clock/repository/photon_histogram.py
diff --git a/artiq/examples/kc705/repository/speed_benchmark.py b/artiq/examples/kc705_nist_clock/repository/speed_benchmark.py
similarity index 100%
rename from artiq/examples/kc705/repository/speed_benchmark.py
rename to artiq/examples/kc705_nist_clock/repository/speed_benchmark.py
diff --git a/artiq/examples/kc705/repository/tdr.py b/artiq/examples/kc705_nist_clock/repository/tdr.py
similarity index 100%
rename from artiq/examples/kc705/repository/tdr.py
rename to artiq/examples/kc705_nist_clock/repository/tdr.py
diff --git a/artiq/examples/kc705/repository/urukul.py b/artiq/examples/kc705_nist_clock/repository/urukul.py
similarity index 100%
rename from artiq/examples/kc705/repository/urukul.py
rename to artiq/examples/kc705_nist_clock/repository/urukul.py
diff --git a/artiq/examples/sayma_drtio/device_db.py b/artiq/examples/sayma_drtio/device_db.py
index 09f70c544..039efb6bd 100644
--- a/artiq/examples/sayma_drtio/device_db.py
+++ b/artiq/examples/sayma_drtio/device_db.py
@@ -1,4 +1,4 @@
-core_addr = "sayma1.lab.m-labs.hk"
+core_addr = "sayma-1.lab.m-labs.hk"
 
 device_db = {
     "core": {
diff --git a/artiq/examples/sayma_standalone/device_db.py b/artiq/examples/sayma_standalone/device_db.py
index f603f6e13..370b3f0a6 100644
--- a/artiq/examples/sayma_standalone/device_db.py
+++ b/artiq/examples/sayma_standalone/device_db.py
@@ -1,4 +1,4 @@
-core_addr = "sayma1.lab.m-labs.hk"
+core_addr = "sayma-1.lab.m-labs.hk"
 
 device_db = {
     "core": {