From 66817e3b82b3248cb2f347eb788e9541a75739e0 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Thu, 12 Apr 2018 15:18:04 +0800 Subject: [PATCH] doc: add note about Sinara requiring ARTIQ-4+ --- README.rst | 2 +- doc/manual/introduction.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 5f6397c8b..36859dcee 100644 --- a/README.rst +++ b/README.rst @@ -9,7 +9,7 @@ It is maintained and developed by `M-Labs `_ and the initial The system features a high-level programming language that helps describing complex experiments, which is compiled and executed on dedicated hardware with nanosecond timing resolution and sub-microsecond latency. It includes graphical user interfaces to parametrize and schedule experiments and to visualize and explore the results. -ARTIQ uses FPGA hardware to perform its time-critical tasks. The `Sinara hardware `_, and in particular the Kasli FPGA carrier, is designed to work with ARTIQ. +ARTIQ uses FPGA hardware to perform its time-critical tasks. The `Sinara hardware `_, and in particular the Kasli FPGA carrier, is designed to work with ARTIQ (support for Sinara is available in ARTIQ-4 and above). ARTIQ is designed to be portable to hardware platforms from different vendors and FPGA manufacturers. Several different configurations of a `high-end FPGA evaluation kit `_ are also used and supported. FPGA platforms can be combined with any number of additional peripherals, either already accessible from ARTIQ or made accessible with little effort. diff --git a/doc/manual/introduction.rst b/doc/manual/introduction.rst index d628d2554..773d2cabe 100644 --- a/doc/manual/introduction.rst +++ b/doc/manual/introduction.rst @@ -10,7 +10,7 @@ It is maintained and developed by `M-Labs `_ and the initial The system features a high-level programming language that helps describing complex experiments, which is compiled and executed on dedicated hardware with nanosecond timing resolution and sub-microsecond latency. It includes graphical user interfaces to parametrize and schedule experiments and to visualize and explore the results. -ARTIQ uses FPGA hardware to perform its time-critical tasks. The `Sinara hardware `_, and in particular the Kasli FPGA carrier, is designed to work with ARTIQ. +ARTIQ uses FPGA hardware to perform its time-critical tasks. The `Sinara hardware `_, and in particular the Kasli FPGA carrier, is designed to work with ARTIQ (support for Sinara is available in ARTIQ-4 and above). ARTIQ is designed to be portable to hardware platforms from different vendors and FPGA manufacturers. Several different configurations of a `high-end FPGA evaluation kit `_ are also used and supported. FPGA platforms can be combined with any number of additional peripherals, either already accessible from ARTIQ or made accessible with little effort.