Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 91336f974d09
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 768fa21488e9
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Mar 23, 2015

  1. Copy the full SHA
    b597483 View commit details
  2. Copy the full SHA
    bd145bb View commit details
  3. Copy the full SHA
    768fa21 View commit details
Showing with 6 additions and 6 deletions.
  1. +2 −2 artiq/devices/thorlabs_tcube/driver.py
  2. +2 −2 artiq/frontend/artiq_master.py
  3. +1 −0 artiq/frontend/lda_controller.py
  4. +1 −2 artiq/tools.py
4 changes: 2 additions & 2 deletions artiq/devices/thorlabs_tcube/driver.py
Original file line number Diff line number Diff line change
@@ -284,7 +284,7 @@ def hardware_stop_update_messages(self):

self.send(Message(MGMSG.HW_STOP_UPDATEMSGS))

def hardware_request_informations(self):
def hardware_request_information(self):
return self.send_request(MGMSG.HW_REQ_INFO,
MGMSG.HW_GET_INFO)

@@ -293,7 +293,7 @@ def is_channel_enabled(self):

def ping(self):
try:
self.hw_req_info()
self.hardware_request_information()
except:
return False
return True
4 changes: 2 additions & 2 deletions artiq/frontend/artiq_master.py
Original file line number Diff line number Diff line change
@@ -22,10 +22,10 @@ def get_argparser():
help="hostname or IP address to bind to")
group.add_argument(
"--port-notify", default=3250, type=int,
help="TCP port to listen to for notifications (default: 3250)")
help="TCP port to listen to for notifications (default: %(default)d)")
group.add_argument(
"--port-control", default=3251, type=int,
help="TCP port to listen to for control (default: 3251)")
help="TCP port to listen to for control (default: %(default)d)")
verbosity_args(parser)
return parser

1 change: 1 addition & 0 deletions artiq/frontend/lda_controller.py
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@ def get_argparser():
parser = argparse.ArgumentParser(
description="ARTIQ controller for the Lab Brick Digital Attenuator")
parser.add_argument("-P", "--product", default="LDA-102",
help="product type (default: %(default)s)",
choices=["LDA-102", "LDA-602"])
simple_network_args(parser, 3253)
parser.add_argument("-d", "--device", default=None,
3 changes: 1 addition & 2 deletions artiq/tools.py
Original file line number Diff line number Diff line change
@@ -54,8 +54,7 @@ def simple_network_args(parser, default_port):
group.add_argument("--bind", default="::1",
help="hostname or IP address to bind to")
group.add_argument("-p", "--port", default=default_port, type=int,
help="TCP port to listen to (default: {})"
.format(default_port))
help="TCP port to listen to (default: %(default)d)")


def init_logger(args):