Skip to content

Commit

Permalink
move default TCP ports from 8887... to 3250...
Browse files Browse the repository at this point in the history
* 8888 is busy: IPython default among others
* 3250 seems less so and is the house number times ten here
jordens authored and sbourdeauducq committed Jan 13, 2015
1 parent 891c0d1 commit 0bd5492
Showing 8 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions doc/manual/drivers_reference.rst
Original file line number Diff line number Diff line change
@@ -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 |
+--------------------------+--------------+
4 changes: 2 additions & 2 deletions frontend/artiq_client.py
Original file line number Diff line number Diff line change
@@ -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",
4 changes: 2 additions & 2 deletions frontend/artiq_gui.py
Original file line number Diff line number Diff line change
@@ -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()

4 changes: 2 additions & 2 deletions frontend/artiq_master.py
Original file line number Diff line number Diff line change
@@ -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()

2 changes: 1 addition & 1 deletion frontend/lda_client.py
Original file line number Diff line number Diff line change
@@ -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")
2 changes: 1 addition & 1 deletion frontend/lda_controller.py
Original file line number Diff line number Diff line change
@@ -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")
2 changes: 1 addition & 1 deletion frontend/pdq2_client.py
Original file line number Diff line number Diff line change
@@ -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]")
2 changes: 1 addition & 1 deletion frontend/pdq2_controller.py
Original file line number Diff line number Diff line change
@@ -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,

0 comments on commit 0bd5492

Please sign in to comment.