diff --git a/content/experiment-control/control-loops.md b/content/experiment-control/control-loops.md index 9f6d4eed..ac3627a0 100644 --- a/content/experiment-control/control-loops.md +++ b/content/experiment-control/control-loops.md @@ -99,6 +99,6 @@ This module is still in development and is not currently available. With the SU-Servo feature of ARTIQ, the Sinara 4410 DDS (which has fine amplitude control) can be used in combination with the 5108 Sampler to form a laser intensity servo. In this application, the 4410 DDS drives AOMs and photodiodes are connected to the 5108 Sampler to monitor laser intensities. When ordering your system, specify that you want SU-Servo integrated into the gateware. -See the Sinara Core page for the relevant devices (1123 Processor "Kasli", 5108 Sampler, and 4410 DDS "Urukul"). +See the Sinara Core page for the relevant devices (1123 Carrier "Kasli", 5108 Sampler, and 4410 DDS "Urukul"). {% end %} diff --git a/content/experiment-control/sinara-core.md b/content/experiment-control/sinara-core.md index 626b3e32..1d740a2b 100644 --- a/content/experiment-control/sinara-core.md +++ b/content/experiment-control/sinara-core.md @@ -22,9 +22,9 @@ Kasli and EEMs can be ordered now. We can deliver a rack-mountable crate that co {% layout_text_img(src="images/kasli@2x.png", popup="images/origin/kasli.jpg", alt="", shadow=false) %} -##### Sinara 1123 Processor "Kasli" +##### Sinara 1123 Carrier "Kasli" -One of the main devices in the Sinara family is the 1123 Processor (codenamed Kasli). It contains an Artix-7 100T FPGA, DDR3 SDRAM, three SFP connectors, and can control up to 8 daughtercards (Eurocard Extension Module, EEM) or 12 with the "backplane adapter". The Kasli can act as a stand-alone core device, or as a DRTIO satellite or repeater. The Kasli and its EEMs are installed in one Eurocard 3U chassis. One SFP connector is used for a Gigabit Ethernet connection to your computer network. +One of the main devices in the Sinara family is the 1123 Carrier (codenamed Kasli). It contains an Artix-7 100T FPGA, DDR3 SDRAM, three SFP connectors, and can control up to 8 daughtercards (Eurocard Extension Module, EEM) or 12 with the "backplane adapter". The Kasli can act as a stand-alone core device, or as a DRTIO satellite or repeater. The Kasli and its EEMs are installed in one Eurocard 3U chassis. One SFP connector is used for a Gigabit Ethernet connection to your computer network. More information diff --git a/static/js/shop_data.js b/static/js/shop_data.js index 6ac052ec..4722382b 100644 --- a/static/js/shop_data.js +++ b/static/js/shop_data.js @@ -42,7 +42,7 @@ const shop_data = { /* keys are also ids, avoid changing them */ 'kasli': { id: 'kasli', - name: 'Processor', + name: 'Carrier', name_number: '1123', name_codename: 'Kasli', price: 3600, @@ -99,7 +99,7 @@ const shop_data = { }, 'kasli-backplane': { id: 'kasli-backplane', - name: 'Processor', + name: 'Carrier', name_number: '1123b', name_codename: 'Kasli + BP adapter', price: 3830,