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: 4cae5531ec05
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: 54f982e3e6ab
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 28, 2014

  1. doc/manual: add missing shell prompt

    @sbourdeauducq
    sbourdeauducq committed Oct 28, 2014
    Copy the full SHA
    65254a2 View commit details

Commits on Oct 29, 2014

  1. doc: bump Python version to 3.4+ (required for enum)

    @sbourdeauducq
    sbourdeauducq committed Oct 29, 2014
    Copy the full SHA
    54f982e View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 doc/manual/installing.rst
  2. +1 −1 doc/manual/writing_a_driver.rst
2 changes: 1 addition & 1 deletion doc/manual/installing.rst
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ You will need:

* Get them from http://www.xilinx.com/support/download/index.htm

* Python 3.3+
* Python 3.4+

* OpenRISC GCC/binutils toolchain (or1k-elf-...)

2 changes: 1 addition & 1 deletion doc/manual/writing_a_driver.rst
View file
Original file line number Diff line number Diff line change
@@ -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`` program from the ARTIQ front-end tools: ::

./identify-controller ::1 7777
$ identify-controller ::1 7777
Type: hello

The client