From 30cb8211978309a81eb13234fe2936c6f7a66e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Mon, 25 Jul 2022 15:49:35 +0200 Subject: [PATCH] manual/installing: fix conda channel url and note --- doc/manual/installing.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/manual/installing.rst b/doc/manual/installing.rst index d2ac04a7f..ab10157d2 100644 --- a/doc/manual/installing.rst +++ b/doc/manual/installing.rst @@ -108,12 +108,12 @@ Controllers for third-party devices (e.g. Thorlabs TCube, Lab Brick Digital Atte Set up the Conda channel and install ARTIQ into a new Conda environment: :: - $ conda config --prepend channels https://conda.m-labs.hk/artiq-beta + $ conda config --prepend channels https://conda.m-labs.hk/artiq $ conda config --append channels conda-forge $ conda create -n artiq artiq .. note:: - If you do not need to flash boards, the ``artiq`` package is sufficient. The packages named ``artiq-board-*`` contain only firmware for the FPGA board, and you should not install them unless you are reflashing an FPGA board. Controllers for third-party devices (e.g. Thorlabs TCube, Lab Brick Digital Attenuator, etc.) that are not shipped with ARTIQ can also be installed with Conda. Browse `Hydra `_ or see the list of NDSPs in this manual to find the names of the corresponding packages. + The board-specific files containing bitstream and firmware for the FPGA board can be obtained through AFWS, and are only required when flashing. Controllers for third-party devices (e.g. Thorlabs TCube, Lab Brick Digital Attenuator, etc.) that are not shipped with ARTIQ can also be installed with Conda. Browse `Hydra `_ or see the list of NDSPs in this manual to find the names of the corresponding packages. After the installation, activate the newly created environment by name. ::