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: 998db5121bf0
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: a1c7efd0aee4
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Aug 13, 2015

  1. ttl: add input/output doc

    @sbourdeauducq
    sbourdeauducq committed Aug 13, 2015
    Copy the full SHA
    f073dfa View commit details

  2. doc: use m-labs anaconda account

    @sbourdeauducq
    sbourdeauducq committed Aug 13, 2015
    Copy the full SHA
    a1c7efd View commit details
Showing with 10 additions and 4 deletions.
  1. +8 −2 artiq/coredevice/ttl.py
  2. +2 −2 doc/manual/installing.rst
10 changes: 8 additions & 2 deletions artiq/coredevice/ttl.py
View file
Original file line number Diff line number Diff line change
@@ -87,10 +87,12 @@ def set_oe(self, oe):

@kernel
def output(self):
"""Set the direction to output."""
self.set_oe(True)

@kernel
def input(self):
"""Set the direction to input."""
self.set_oe(False)

@kernel
@@ -107,12 +109,16 @@ def sync(self):

@kernel
def on(self):
"""Set the output to a logic high state."""
"""Set the output to a logic high state.
The channel must be in output mode."""
self.set_o(True)

@kernel
def off(self):
"""Set the output to a logic low state."""
"""Set the output to a logic low state.
The channel must be in output mode."""
self.set_o(False)

@kernel
4 changes: 2 additions & 2 deletions doc/manual/installing.rst
View file
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ If it prints the help of the ``conda`` command, your install is OK.
If not, then make sure your ``$PATH`` environment variable contains the path to anaconda3/bin (or miniconda3/bin)::

$ echo $PATH
/home/fallen/miniconda3/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
/home/..../miniconda3/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games

If your ``$PATH`` misses reference the miniconda3/bin or anaconda3/bin you can fix this by typing::

@@ -36,7 +36,7 @@ Installing the host side software

For this, you need to add our binstar repository to your conda configuration::

$ conda config --add channels http://conda.anaconda.org/fallen/channel/dev
$ conda config --add channels http://conda.anaconda.org/m-labs/channel/dev

Then you can install the ARTIQ package, it will pull all the necessary dependencies::