From f96f597ecbffd6ca66f11a94ae705db0ebf90e2c Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Thu, 12 Apr 2018 15:15:07 +0800 Subject: [PATCH] doc: update Sinara information --- README.rst | 8 +++----- doc/manual/introduction.rst | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/README.rst b/README.rst index dd54d3dd6..5f6397c8b 100644 --- a/README.rst +++ b/README.rst @@ -9,11 +9,9 @@ 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. -It is designed to be portable to hardware platforms from different vendors and FPGA manufacturers. -Currently, several different configurations of a `high-end FPGA evaluation kit `_ are used and supported. This FPGA platform can be combined with any number of additional peripherals, either already accessible from ARTIQ or made accessible with little effort. - -Custom hardware components with widely extended capabilities and advanced support for scalable and fully distributed real-time control of experiments `are being designed `_. +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 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. ARTIQ and its dependencies are available in the form of `conda packages `_ for both Linux and Windows. Packages containing pre-compiled binary images to be loaded onto the hardware platforms are supplied for each configuration. diff --git a/doc/manual/introduction.rst b/doc/manual/introduction.rst index 821f8ef8f..d628d2554 100644 --- a/doc/manual/introduction.rst +++ b/doc/manual/introduction.rst @@ -10,11 +10,9 @@ 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. -It is designed to be portable to hardware platforms from different vendors and FPGA manufacturers. -Currently, several different configurations of a `high-end FPGA evaluation kit `_ are used and supported. This FPGA platform can be combined with any number of additional peripherals, either already accessible from ARTIQ or made accessible with little effort. - -Custom hardware components with widely extended capabilities and advanced support for scalable and fully distributed real-time control of experiments `are being designed `_. +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 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. ARTIQ and its dependencies are available in the form of `conda packages `_ for both Linux and Windows. Packages containing pre-compiled binary images to be loaded onto the hardware platforms are supplied for each configuration.