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: 26f55f20108e
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: 62eae5eb3464
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 10, 2016

  1. installing.rst: triple colons

    @jordens
    jordens committed Apr 10, 2016
    Copy the full SHA
    7f7750e View commit details

  2. installing.rst: adapters renaming from ed1c368

    @jordens
    jordens committed Apr 10, 2016
    Copy the full SHA
    62eae5e View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 doc/manual/installing.rst
8 changes: 4 additions & 4 deletions doc/manual/installing.rst
View file
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ Choose the package containing the binaries for your hardware:
* ``artiq-kc705-nist_clock`` for the KC705 board with the NIST "clock" FMC backplane and AD9914 DDS chips.
* ``artiq-kc7005-nist_qc2`` for the KC705 board with the NIST QC2 FMC backplane and AD9914 DDS chips.

Conda will create the environment, automatically resolve, download, and install the necessary dependencies and install the packages you select:::
Conda will create the environment, automatically resolve, download, and install the necessary dependencies and install the packages you select::

$ conda create -n artiq-main artiq-pipistrello-nist_qc1

@@ -76,7 +76,7 @@ Upgrading ARTIQ

When upgrading ARTIQ or when testing different versions it is recommended that new environments are created instead of upgrading the packages in existing environments.
Keep previous environments around until you are certain that they are not needed anymore and a new environment is known to work correctly.
You can create a new conda environment specifically to test a certain version of ARTIQ:::
You can create a new conda environment specifically to test a certain version of ARTIQ::

$ conda create -n artiq-test-1.0rc2 artiq-pipistrello-nist_qc1=1.0rc2

@@ -125,11 +125,11 @@ Then, you can flash the board:

* For the Pipistrello board::

$ artiq_flash -t pipistrello -m qc1
$ artiq_flash -t pipistrello -m nist_qc1

* For the KC705 board (selecting the appropriate hardware peripheral)::

$ artiq_flash -t kc705 -m [qc1/clock/qc2]
$ artiq_flash -t kc705 -m [nist_qc1/nist_clock/nist_qc2]

For the KC705, the next step is to flash the MAC and IP addresses to the board. See :ref:`those instructions <flash-mac-ip-addr>`.