From ede2829c9230daf6a42513b7ea00dc1aa4a410d1 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 6 Nov 2019 14:48:26 +0800 Subject: [PATCH] update shop data --- ...02_EEM-16x.svg => graphic-02_RJ45-DIO.svg} | 0 ...2_EEM-Octal.svg => graphic-02_SMA-DIO.svg} | 0 ...abiliser.svg => graphic-02_Stabilizer.svg} | 0 static/js/shop.jsx | 4 +- static/js/shop.min.js | 2 +- static/js/shop_data.js | 306 +++++++----------- 6 files changed, 111 insertions(+), 201 deletions(-) rename static/images/shop/{graphic-02_EEM-16x.svg => graphic-02_RJ45-DIO.svg} (100%) rename static/images/shop/{graphic-02_EEM-Octal.svg => graphic-02_SMA-DIO.svg} (100%) rename static/images/shop/{graphic-02_Stabiliser.svg => graphic-02_Stabilizer.svg} (100%) diff --git a/static/images/shop/graphic-02_EEM-16x.svg b/static/images/shop/graphic-02_RJ45-DIO.svg similarity index 100% rename from static/images/shop/graphic-02_EEM-16x.svg rename to static/images/shop/graphic-02_RJ45-DIO.svg diff --git a/static/images/shop/graphic-02_EEM-Octal.svg b/static/images/shop/graphic-02_SMA-DIO.svg similarity index 100% rename from static/images/shop/graphic-02_EEM-Octal.svg rename to static/images/shop/graphic-02_SMA-DIO.svg diff --git a/static/images/shop/graphic-02_Stabiliser.svg b/static/images/shop/graphic-02_Stabilizer.svg similarity index 100% rename from static/images/shop/graphic-02_Stabiliser.svg rename to static/images/shop/graphic-02_Stabilizer.svg diff --git a/static/js/shop.jsx b/static/js/shop.jsx index af0edac..155f0f9 100644 --- a/static/js/shop.jsx +++ b/static/js/shop.jsx @@ -1663,9 +1663,7 @@ class Shop extends React.PureComponent { h[d].nbrSlotMax&&(j[d].warnings.maxSlotWarning=_objectSpread({},h[d].rules.maxSlotWarning)),"hd68"===h[d].type){var f=!1;d400 MHz.', + 'Nominal max output power 10 dBm.', + 'Digital step attenuator 0 to -31.5dB.', + 'RF switch (1ns temporal resolution), 70dB isolation.', + 'AD9910 or AD9912 chip.', + 'By default, we use the AD9910 as it provides more features. If you need the higher frequency resolution of the AD9912, leave us a note.', + 'External 5W power amplifier is available separately, leave us a note if interested.' ], size: 'small', type: 'urukul', @@ -295,34 +256,22 @@ const shop_data = { type: 'urukul', icon: '/shop/icon-warning.svg', name: 'Urukul', - message: 'This card needs a card that provides XXX connector (e.g. Kasli) at its left.', + message: 'This card needs a card that provides EEM and clocking connectors (e.g. Kasli) at its left.', }, }, }, 'zotino': { id: 'zotino', name: 'Zotino', - price: 1000, + price: 1600, image: '/shop/graphic-02_zotino.svg', specs: [ - 'Artix 7 100T FPGA', - '4GB DDR3 SDRAM', - '128MB SPI Flash', - '3 SFP 6GB/s slots', - '1 SATA 6GB/s connector', - 'Clock recovery and distribution', - '4 MMCX clock outputs', - '4 channel USB connectivity', - 'I2C tree to EEMs via USB and FPGA', - '8 EEM connectors on board', - '4 EEM on backplane extension', - '4 EEM on backplane extension', - '4 EEM on backplane extension', - '4 EEM on backplane extension', - '4 EEM on backplane extension', - '4 EEM on backplane extension', - '4 EEM on backplane extension', - '4 EEM on backplane extension', + '32-channel DAC.', + '16-bit resolution.', + '1 MSPS shared between all channels.', + 'Output voltage +-10V.', + 'HD68 connector with all channels.', + 'Channels can also be broken out to BNC or SMA using IDC-BNC, IDC-SMA or IDC-MCX cards.' ], size: 'small', type: 'zotino', @@ -350,20 +299,19 @@ const shop_data = { type: 'zotino', icon: '/shop/icon-warning.svg', name: 'Zotino', - message: 'This card needs a card that provides XXX connector (e.g. Kasli) at its left.', + message: 'This card needs a card that provides a EEM connector (e.g. Kasli) at its left.', }, }, }, 'idc-bnc-adapter': { id: 'idc-bnc-adapter', name: 'IDC-BNC', - price: 1000, + price: 160, image: '/shop/graphic-02_IDC-BNC-adapter.svg', specs: [ - 'Artix 7 100T FPGA', - '4GB DDR3 SDRAM', - '128MB SPI Flash', - '3 SFP 6GB/s slots', + 'Breaks out analog signals from Zotino or HD68-IDC to BNC connectors.', + 'Each card provides 8 channels.', + 'Breaking out all 32 channels from a Zotino requires 8 IDC-BNC cards.' ], size: 'big', type: 'idc-bnc', @@ -385,20 +333,10 @@ const shop_data = { 'hd68-idc-adapter': { id:'hd68-idc-adapter', name: 'HD68-IDC', - price: 1000, + price: 150, image: '/shop/graphic-02_HD68.svg', specs: [ - 'Artix 7 100T FPGA', - '4GB DDR3 SDRAM', - '128MB SPI Flash', - '3 SFP 6GB/s slots', - '1 SATA 6GB/s connector', - 'Clock recovery and distribution', - '4 MMCX clock outputs', - '4 channel USB connectivity', - 'I2C tree to EEMs via USB and FPGA', - '8 EEM connectors on board', - '4 EEM on backplane extension', + 'Connects an external HD68 cable to IDC-BNC, IDC-SMA or IDC-MCX cards.', ], size: 'small', type: 'hd68', @@ -433,20 +371,16 @@ const shop_data = { 'novo': { id: 'novo', name: 'Novo', - price: 1000, + price: 1600, image: '/shop/graphic-02_Novo.svg', specs: [ - 'Artix 7 100T FPGA', - '4GB DDR3 SDRAM', - '128MB SPI Flash', - '3 SFP 6GB/s slots', - '1 SATA 6GB/s connector', - 'Clock recovery and distribution', - '4 MMCX clock outputs', - '4 channel USB connectivity', - 'I2C tree to EEMs via USB and FPGA', - '8 EEM connectors on board', - '4 EEM on backplane extension', + '8-channel ADC.', + '16-bit resolution.', + '1.5 MSPS simultaneously on all channels.', + 'When used with ARTIQ-Python driver, effective sample rate is lower.', + 'Digitally programmable input gain.', + 'Full-scale input ranges between +-10mV and +-10V.', + 'Supports SU-Servo laser intensity stabilization servo in conjunction with Urukul.' ], size: 'big', type: 'novo', @@ -467,27 +401,21 @@ const shop_data = { type: 'novo', icon: '/shop/icon-warning.svg', name: 'Novo', - message: 'This card needs a card that provides XXX connector (e.g. Kasli) at its left.', + message: 'This card needs a card that provides EEM connectors (e.g. Kasli) at its left.', }, } }, 'koster': { id: 'koster', name: 'Koster', - price: 1000, + price: 550, image: '/shop/graphic-02_Koster.svg', specs: [ - 'Artix 7 100T FPGA', - '4GB DDR3 SDRAM', - '128MB SPI Flash', - '3 SFP 6GB/s slots', - '1 SATA 6GB/s connector', - 'Clock recovery and distribution', - '4 MMCX clock outputs', - '4 channel USB connectivity', - 'I2C tree to EEMs via USB and FPGA', - '8 EEM connectors on board', - '4 EEM on backplane extension', + 'Camera input interface card.', + 'Supports some EMCCD cameras.', + 'Allows image processing to occur in the FPGA with lower latency.', + 'Existing stack supports summing over rectangular ROIs and reporting the result to ARTIQ kernels.', + 'Camera signal is entirely processed in the Kasli FPGA.', ], size: 'small', type: 'koster', @@ -495,40 +423,34 @@ const shop_data = { nbrSlotMin: 0, nbrSlotMax: 0, nbrClockMax: 0, - slotOccupied: 3, + slotOccupied: 2, clockOccupied: 0, rules: { connectors: { type: 'koster', icon: '/shop/icon-reminder.svg', name: 'Koster', - message: 'This configuration uses 3 EEM connectors. If you prefer to use 1 or 2 EEM connectors, please inform us by leaving an additional note.', + message: 'This configuration uses 2 EEM connectors. If you prefer to use 1 or 3 EEM connectors, please inform us by leaving an additional note.', }, resources: { type: 'koster', icon: '/shop/icon-warning.svg', name: 'Koster', - message: 'This card needs a card that provides XXX connector (e.g. Kasli) at its left.', + message: 'This card needs a card that provides EEM connectors (e.g. Kasli) at its left.', }, } }, 'clocker': { id: 'clocker', name: 'Clocker', - price: 1000, + price: 525, image: '/shop/graphic-02_Clocker.svg', specs: [ - 'Artix 7 100T FPGA', - '4GB DDR3 SDRAM', - '128MB SPI Flash', - '3 SFP 6GB/s slots', - '1 SATA 6GB/s connector', - 'Clock recovery and distribution', - '4 MMCX clock outputs', - '4 channel USB connectivity', - 'I2C tree to EEMs via USB and FPGA', - '8 EEM connectors on board', - '4 EEM on backplane extension', + 'Distribute a low jitter clock signal among cards.', + '2 inputs.', + '10 outputs including 4 SMAs.', + 'Frequency up to 1GHz.', + 'Low jitter <100fs RMS.' ], size: 'small', type: 'clocker', @@ -553,23 +475,18 @@ const shop_data = { }, }, }, - 'stabiliser': { - id: 'stabiliser', + 'stabilizer': { + id: 'stabilizer', name: 'Stabilizer', - price: 1000, - image: '/shop/graphic-02_Stabiliser.svg', + price: 3000, + image: '/shop/graphic-02_Stabilizer.svg', specs: [ - 'Artix 7 100T FPGA', - '4GB DDR3 SDRAM', - '128MB SPI Flash', - '3 SFP 6GB/s slots', - '1 SATA 6GB/s connector', - 'Clock recovery and distribution', - '4 MMCX clock outputs', - '4 channel USB connectivity', - 'I2C tree to EEMs via USB and FPGA', - '8 EEM connectors on board', - '4 EEM on backplane extension', + 'CPU-based dual-channel fast servo.', + '400MHz STM32H743ZIT6.', + 'Dual 16bit ADC with x2, x5, x10 PGA (2MS/s).', + '16bit AD5542A DAC (1us settling time).', + '100Base-T Ethernet.', + 'Can be controlled by Kasli or work stand-alone with PoE supply.' ], size: 'small', type: null, @@ -583,20 +500,15 @@ const shop_data = { 'mirny': { id: 'mirny', name: 'Mirny', - price: 1000, + price: 2660, image: '/shop/graphic-02_Mirny.svg', specs: [ - 'Artix 7 100T FPGA', - '4GB DDR3 SDRAM', - '128MB SPI Flash', - '3 SFP 6GB/s slots', - '1 SATA 6GB/s connector', - 'Clock recovery and distribution', - '4 MMCX clock outputs', - '4 channel USB connectivity', - 'I2C tree to EEMs via USB and FPGA', - '8 EEM connectors on board', - '4 EEM on backplane extension', + '4-channel Wide-band PLL/VCO-based microwave frequency synthesiser.', + '53 MHz to >4 GHz.', + 'Up to 13.6 GHz when using the mezzanine.',, + 'Much higher frequency resolution than Urukul.', + 'Lower jitter and phase noise.', + 'Large frequency changes take several milliseconds.', ], size: 'small', type: null, @@ -611,7 +523,7 @@ const shop_data = { type: 'mirny', icon: '/shop/icon-warning.svg', name: 'Mirny', - message: 'This card needs a card that provides XXX connector (e.g. Kasli) at its left.', + message: 'This card needs a card that provides a EEM connector (e.g. Kasli) at its left.', }, }, }, @@ -630,17 +542,17 @@ const shop_data = { 'kasli', 'kasli-backplane', 'bnc-dio', - 'eem-octal', - 'eem-16x', + 'sma-dio', + 'rj45-dio', 'urukul', + 'mirny', 'zotino', 'idc-bnc-adapter', 'hd68-idc-adapter', 'novo', 'koster', 'clocker', - 'stabiliser', - 'mirny' + 'stabilizer', ], },