From 2146e58d202bf2d62a3dbf3dc2f9591a601943c5 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Mon, 1 Dec 2014 15:20:35 +0800 Subject: [PATCH] frontend: rename files to avoid conflicts --- doc/manual/writing_a_driver.rst | 2 +- frontend/{artiq.py => artiq_client.py} | 0 frontend/{artiqd.py => artiq_master.py} | 0 frontend/{identify-controller.py => identify_controller.py} | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename frontend/{artiq.py => artiq_client.py} (100%) rename frontend/{artiqd.py => artiq_master.py} (100%) rename frontend/{identify-controller.py => identify_controller.py} (100%) diff --git a/doc/manual/writing_a_driver.rst b/doc/manual/writing_a_driver.rst index 0c62d9e5a..cc750edc0 100644 --- a/doc/manual/writing_a_driver.rst +++ b/doc/manual/writing_a_driver.rst @@ -51,7 +51,7 @@ and verify that you can connect to the TCP port: :: Also verify that you can get the type of the server (the "hello" string passed to ``simple_server_loop``) using the ``identify-controller.py`` program from the ARTIQ front-end tools: :: - $ identify-controller.py ::1 7777 + $ identify_controller.py ::1 7777 Type: hello The client diff --git a/frontend/artiq.py b/frontend/artiq_client.py similarity index 100% rename from frontend/artiq.py rename to frontend/artiq_client.py diff --git a/frontend/artiqd.py b/frontend/artiq_master.py similarity index 100% rename from frontend/artiqd.py rename to frontend/artiq_master.py diff --git a/frontend/identify-controller.py b/frontend/identify_controller.py similarity index 100% rename from frontend/identify-controller.py rename to frontend/identify_controller.py