diff --git a/doc/manual/drivers_reference.rst b/doc/manual/drivers_reference.rst index 06cd0cf6f..96604e6bb 100644 --- a/doc/manual/drivers_reference.rst +++ b/doc/manual/drivers_reference.rst @@ -33,11 +33,11 @@ When writing a new driver, choose a free TCP port and add it to this list. +--------------------------+--------------+ | Component | Default port | +==========================+==============+ -| Master (notifications) | 8887 | +| Master (notifications) | 3250 | +--------------------------+--------------+ -| Master (control) | 8888 | +| Master (control) | 3251 | +--------------------------+--------------+ -| PDQ2 | 8889 | +| PDQ2 | 3252 | +--------------------------+--------------+ -| LDA | 8890 | +| LDA | 3253 | +--------------------------+--------------+ diff --git a/frontend/artiq_client.py b/frontend/artiq_client.py index 3d8aaeef8..9ff4f1e31 100755 --- a/frontend/artiq_client.py +++ b/frontend/artiq_client.py @@ -181,7 +181,7 @@ def _show_parameters(parameters): def _run_subscriber(host, port, subscriber): if port is None: - port = 8887 + port = 3250 loop = asyncio.get_event_loop() try: loop.run_until_complete(subscriber.connect(host, port)) @@ -232,7 +232,7 @@ def main(): print("Unknown object to show, use -h to list valid names.") sys.exit(1) else: - port = 8888 if args.port is None else args.port + port = 3251 if args.port is None else args.port target_name = { "submit": "master_schedule", "cancel": "master_schedule", diff --git a/frontend/artiq_gui.py b/frontend/artiq_gui.py index 2a11a48e5..6d6c04a43 100755 --- a/frontend/artiq_gui.py +++ b/frontend/artiq_gui.py @@ -18,10 +18,10 @@ def _get_args(): "-s", "--server", default="::1", help="hostname or IP of the master to connect to") parser.add_argument( - "--port-notify", default=8887, type=int, + "--port-notify", default=3250, type=int, help="TCP port to connect to for notifications") parser.add_argument( - "--port-control", default=8888, type=int, + "--port-control", default=3251, type=int, help="TCP port to connect to for control") return parser.parse_args() diff --git a/frontend/artiq_master.py b/frontend/artiq_master.py index 8a4a239ae..dbe47c74c 100755 --- a/frontend/artiq_master.py +++ b/frontend/artiq_master.py @@ -16,10 +16,10 @@ def _get_args(): "--bind", default="::1", help="hostname or IP address to bind to") parser.add_argument( - "--port-notify", default=8887, type=int, + "--port-notify", default=3250, type=int, help="TCP port to listen to for notifications") parser.add_argument( - "--port-control", default=8888, type=int, + "--port-control", default=3251, type=int, help="TCP port to listen to for control") return parser.parse_args() diff --git a/frontend/lda_client.py b/frontend/lda_client.py index c11e52dd7..23317cd92 100755 --- a/frontend/lda_client.py +++ b/frontend/lda_client.py @@ -9,7 +9,7 @@ def main(): parser = argparse.ArgumentParser() parser.add_argument('-s', '--server', default="::1", help="hostname or IP of the controller to connect to") - parser.add_argument('-p', '--port', default=8890, type=int, + parser.add_argument('-p', '--port', default=3253, type=int, help="TCP port to use to connect to the controller") parser.add_argument('-a', '--attenuation', type=float, help="attenuation value to set") diff --git a/frontend/lda_controller.py b/frontend/lda_controller.py index dfc76a7ce..857dd4b73 100755 --- a/frontend/lda_controller.py +++ b/frontend/lda_controller.py @@ -12,7 +12,7 @@ def main(): choices=["LDA-102", "LDA-602", "sim"]) parser.add_argument('--bind', default="::1", help="hostname or IP address to bind to") - parser.add_argument('-p', '--port', default=8890, type=int, + parser.add_argument('-p', '--port', default=3253, type=int, help="TCP port to listen to") parser.add_argument('-s', '--serial', default=None, help="USB serial number of the device") diff --git a/frontend/pdq2_client.py b/frontend/pdq2_client.py index 1386a347f..bacb2215b 100755 --- a/frontend/pdq2_client.py +++ b/frontend/pdq2_client.py @@ -17,7 +17,7 @@ def _get_args(): them to the controller.""") parser.add_argument("-s", "--server", default="::1", help="hostname or IP of the controller to connect to") - parser.add_argument("--port", default=8889, type=int, + parser.add_argument("--port", default=3252, type=int, help="TCP port to use to connect to the controller") parser.add_argument("-c", "--channel", default=0, type=int, help="channel: 3*board_num+dac_num [%(default)s]") diff --git a/frontend/pdq2_controller.py b/frontend/pdq2_controller.py index dc8e993a9..867503f91 100755 --- a/frontend/pdq2_controller.py +++ b/frontend/pdq2_controller.py @@ -11,7 +11,7 @@ def _get_args(): parser = argparse.ArgumentParser(description="PDQ2 controller") parser.add_argument("--bind", default="::1", help="hostname or IP address to bind to") - parser.add_argument("-p", "--port", default=8889, type=int, + parser.add_argument("-p", "--port", default=3252, type=int, help="TCP port to listen to") parser.add_argument( "-s", "--serial", default=None,