From 1a3d71760d90d88d3008d5916c1cd1d41e390621 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Fri, 10 May 2019 12:17:38 +0800
Subject: [PATCH] consolidate kasli example folders

---
 artiq/examples/{kasli_tester => kasli}/device_db.py             | 2 ++
 artiq/examples/{kasli_basic => kasli}/device_db_opticlock.py    | 0
 artiq/examples/{kasli_basic => kasli}/idle_kernel.py            | 0
 .../examples/{kasli_basic => kasli}/repository/kasli_tester.py  | 0
 4 files changed, 2 insertions(+)
 rename artiq/examples/{kasli_tester => kasli}/device_db.py (99%)
 rename artiq/examples/{kasli_basic => kasli}/device_db_opticlock.py (100%)
 rename artiq/examples/{kasli_basic => kasli}/idle_kernel.py (100%)
 rename artiq/examples/{kasli_basic => kasli}/repository/kasli_tester.py (100%)

diff --git a/artiq/examples/kasli_tester/device_db.py b/artiq/examples/kasli/device_db.py
similarity index 99%
rename from artiq/examples/kasli_tester/device_db.py
rename to artiq/examples/kasli/device_db.py
index ed77d6679..83f53640f 100644
--- a/artiq/examples/kasli_tester/device_db.py
+++ b/artiq/examples/kasli/device_db.py
@@ -1,3 +1,5 @@
+# Tester device database
+
 core_addr = "kasli-1.lab.m-labs.hk"
 
 device_db = {
diff --git a/artiq/examples/kasli_basic/device_db_opticlock.py b/artiq/examples/kasli/device_db_opticlock.py
similarity index 100%
rename from artiq/examples/kasli_basic/device_db_opticlock.py
rename to artiq/examples/kasli/device_db_opticlock.py
diff --git a/artiq/examples/kasli_basic/idle_kernel.py b/artiq/examples/kasli/idle_kernel.py
similarity index 100%
rename from artiq/examples/kasli_basic/idle_kernel.py
rename to artiq/examples/kasli/idle_kernel.py
diff --git a/artiq/examples/kasli_basic/repository/kasli_tester.py b/artiq/examples/kasli/repository/kasli_tester.py
similarity index 100%
rename from artiq/examples/kasli_basic/repository/kasli_tester.py
rename to artiq/examples/kasli/repository/kasli_tester.py