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: 7ec0bc047028
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: a84f76bf0991
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on May 29, 2015

  1. manual: after artiq is installed, frontends can be used without path …

    …prefix
    
    except non-python frontends like artiq_flash.sh
    fallen committed May 29, 2015
    Copy the full SHA
    d5fb50b View commit details
  2. Copy the full SHA
    a84f76b View commit details
Showing with 2 additions and 20 deletions.
  1. +2 −20 doc/manual/installing.rst
22 changes: 2 additions & 20 deletions doc/manual/installing.rst
Original file line number Diff line number Diff line change
@@ -128,7 +128,7 @@ The communication parameters are 115200 8-N-1.

* You can either set it by generating a flash storage image and then flash it: ::

$ ~/artiq-dev/artiq/frontend/artiq_mkfs.py flash_storage.img -s mac xx:xx:xx:xx:xx:xx -s ip xx.xx.xx.xx
$ artiq_mkfs flash_storage.img -s mac xx:xx:xx:xx:xx:xx -s ip xx.xx.xx.xx
$ ~/artiq-dev/artiq/frontend/artiq_flash.sh -f flash_storage.img

* Or you can set it via the runtime test mode command line
@@ -217,31 +217,13 @@ Installing the host-side software
.. note::
Compilation of LLVM can take more than 30 min on some machines.

* Install ARTIQ (without the GUI): ::
* Install ARTIQ: ::

$ cd ~/artiq-dev
$ git clone https://github.com/m-labs/artiq # if not already done
$ cd artiq
$ python3 setup.py develop --user

* Install ARTIQ (with the GUI): ::

$ cd ~/artiq-dev
$ git clone https://github.com/m-labs/cairoplot3
$ cd cairoplot3
$ python3 setup.py install --user
$ cd -
$ git clone https://github.com/m-labs/gbulb
$ cd gbulb
$ python3 setup.py install --user
$ cd -
$ git clone https://github.com/m-labs/artiq # if not already done
$ cd artiq
$ ARTIQ_GUI=1 python3 setup.py develop --user

.. note::
Use ARTIQ_GUI=1 to install GUI dependencies which are only supported on Linux for now, to install ARTIQ on Windows do not set ARTIQ_GUI.

* Build the documentation: ::

$ cd ~/artiq-dev/artiq/doc/manual