From 0ec7ef1e88b382149c2db2c97390bee14c84e3ba Mon Sep 17 00:00:00 2001 From: Egor Savkin Date: Tue, 10 Oct 2023 16:39:18 +0800 Subject: [PATCH 1/2] Add shuttler to the shop Signed-off-by: Egor Savkin --- static/images/shop/graphic-03_Shuttler.svg | 1 + static/js/shop_data.js | 27 +++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 static/images/shop/graphic-03_Shuttler.svg diff --git a/static/images/shop/graphic-03_Shuttler.svg b/static/images/shop/graphic-03_Shuttler.svg new file mode 100644 index 0000000..b72d4cd --- /dev/null +++ b/static/images/shop/graphic-03_Shuttler.svg @@ -0,0 +1 @@ + diff --git a/static/js/shop_data.js b/static/js/shop_data.js index 6684248..82c6cd4 100644 --- a/static/js/shop_data.js +++ b/static/js/shop_data.js @@ -868,6 +868,30 @@ const shop_data = { slotOccupied: 1, clockOccupied: 0 }, + 'shuttler': { + id: 'shuttler', + name: 'FMC/DAC', + name_number: '5716', + name_codename: 'Shuttler', + price: 8500, + image: '/shop/graphic-03_Shuttler.svg', + specs: [ + '16-ch, 125 MSPS DAC in FMC form factor, with remote analog front end board.', + 'High dc resolution (~18 bits) for trap electrode bias.', + '~15 MHz analog bandwidth.', + 'AD9117 DACs (14 bits @ 125 MSPS, <1 LSB DNL).', + 'Differential analog output (+/-5 V differential) via COTS connector with shielded impedance-matched pairs (mini-SAS HD).', + 'Remote analog front-end (AFE) board converts differential signals on mini-SAS HD cables to single-ended, with additional gain/filtering as desired.', + ], + size: 'big', + type: null, + hp: 8, + nbrSlotMin: 0, + nbrSlotMax: 0, + nbrClockMax: 0, + slotOccupied: 0, + clockOccupied: 0, + }, 'pounder': { id: 'pounder', name: 'PDH lock generator', @@ -950,7 +974,8 @@ const shop_data = { itemIds: [ 'zotino', 'fastino', - 'novo']}, + 'novo', + 'shuttler']}, { name: 'Adapters', itemIds: [ 'idc-bnc-adapter', -- 2.42.0 From 7d1bc7a9b98525ae3a949429ce0e10e386703851 Mon Sep 17 00:00:00 2001 From: Egor Savkin Date: Wed, 11 Oct 2023 10:33:04 +0800 Subject: [PATCH 2/2] Remove FMC in shuttler names Signed-off-by: Egor Savkin --- static/images/shop/graphic-03_Shuttler.svg | 2 +- static/js/shop_data.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/static/images/shop/graphic-03_Shuttler.svg b/static/images/shop/graphic-03_Shuttler.svg index b72d4cd..43b1d3a 100644 --- a/static/images/shop/graphic-03_Shuttler.svg +++ b/static/images/shop/graphic-03_Shuttler.svg @@ -1 +1 @@ - + diff --git a/static/js/shop_data.js b/static/js/shop_data.js index 82c6cd4..3387bb5 100644 --- a/static/js/shop_data.js +++ b/static/js/shop_data.js @@ -870,7 +870,7 @@ const shop_data = { }, 'shuttler': { id: 'shuttler', - name: 'FMC/DAC', + name: 'DAC', name_number: '5716', name_codename: 'Shuttler', price: 8500, @@ -881,7 +881,7 @@ const shop_data = { '~15 MHz analog bandwidth.', 'AD9117 DACs (14 bits @ 125 MSPS, <1 LSB DNL).', 'Differential analog output (+/-5 V differential) via COTS connector with shielded impedance-matched pairs (mini-SAS HD).', - 'Remote analog front-end (AFE) board converts differential signals on mini-SAS HD cables to single-ended, with additional gain/filtering as desired.', + 'Included remote analog front-end (AFE) board converts differential signals on mini-SAS HD cables to single-ended, with additional gain/filtering as desired.', ], size: 'big', type: null, -- 2.42.0