From aff57d79915c826c0deadc65ec1ce28329fd85fe Mon Sep 17 00:00:00 2001 From: Egor Savkin Date: Fri, 4 Aug 2023 17:37:39 +0800 Subject: [PATCH 1/2] Add Pounder, but the picture needs updating and merging with stabilizer Signed-off-by: Egor Savkin --- static/images/shop/graphic-03_Pounder.svg | 1 + static/js/shop.jsx | 2 +- static/js/shop_data.js | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 static/images/shop/graphic-03_Pounder.svg diff --git a/static/images/shop/graphic-03_Pounder.svg b/static/images/shop/graphic-03_Pounder.svg new file mode 100644 index 0000000..bc374c2 --- /dev/null +++ b/static/images/shop/graphic-03_Pounder.svg @@ -0,0 +1 @@ + diff --git a/static/js/shop.jsx b/static/js/shop.jsx index 01f19f9..bf7f32a 100644 --- a/static/js/shop.jsx +++ b/static/js/shop.jsx @@ -2183,7 +2183,7 @@ class Shop extends React.PureComponent { } - // check for number of recommanded EEM connectors + // check for number of recommended EEM connectors ['novo', 'urukul', 'koster'].map(_type => { if (itemsCloned.find(elem => elem.type === _type)) { rules[this.state.items[_type].rules.connectors.type] = {...this.state.items[_type].rules.connectors}; diff --git a/static/js/shop_data.js b/static/js/shop_data.js index 1c23f58..1240551 100644 --- a/static/js/shop_data.js +++ b/static/js/shop_data.js @@ -867,6 +867,27 @@ const shop_data = { nbrClockMax: 0, slotOccupied: 1, clockOccupied: 0 + }, + 'pounder': { + id: 'pounder', + name: 'PDH lock generator', + name_number: '4459', + name_codename: 'Stabilizer + Pounder', + price: 4460, + image: '/shop/graphic-03_Pounder.svg', + specs: [ + '2 channel Pound Drever Hall (PDH) lock generator for Stabilizer.', + 'AD9959 DDS (500MSPS, 10-bit).', + '1-200 MHz.' + ], + size: 'big', + type: null, + hp: 8, + nbrSlotMin: 0, + nbrSlotMax: 0, + nbrClockMax: 0, + slotOccupied: 1, + clockOccupied: 1, } }, @@ -913,6 +934,7 @@ const shop_data = { itemIds: [ 'koster', 'stabilizer', + 'pounder', 'thermostat-eem']} ], }, -- 2.47.0 From 15187ebaf21c40aa7a7cd14451e74b07e7ef8992 Mon Sep 17 00:00:00 2001 From: Egor Savkin Date: Mon, 7 Aug 2023 12:27:56 +0800 Subject: [PATCH 2/2] Merge pictures of Pounder with Stabilizer Signed-off-by: Egor Savkin --- content/experiment-control/control-loops.md | 2 +- static/images/shop/graphic-03_Pounder.svg | 2 +- static/js/shop_data.js | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/content/experiment-control/control-loops.md b/content/experiment-control/control-loops.md index 66ab708..fb8c382 100644 --- a/content/experiment-control/control-loops.md +++ b/content/experiment-control/control-loops.md @@ -19,7 +19,7 @@ The Sinara 8452 DSP is a CPU-based dual-channel digital signal processing platfo - connectors for optional analog front-end (AFE) module - IDC connectors for BNC-IDC/SMA-IDC extension for digital IO and aux analog inputs and outputs -It can be used as a general-purpose PID controller. Several AFE extensions are under development including high current power supply for magnets. +It can be used as a general-purpose PID controller. Several AFE extensions are under development including high current power supply for magnets and 2-channel Pound Drever Hall (PDH) lock generator. More information diff --git a/static/images/shop/graphic-03_Pounder.svg b/static/images/shop/graphic-03_Pounder.svg index bc374c2..625ea03 100644 --- a/static/images/shop/graphic-03_Pounder.svg +++ b/static/images/shop/graphic-03_Pounder.svg @@ -1 +1 @@ - + diff --git a/static/js/shop_data.js b/static/js/shop_data.js index 1240551..147c2a8 100644 --- a/static/js/shop_data.js +++ b/static/js/shop_data.js @@ -876,9 +876,9 @@ const shop_data = { price: 4460, image: '/shop/graphic-03_Pounder.svg', specs: [ - '2 channel Pound Drever Hall (PDH) lock generator for Stabilizer.', - 'AD9959 DDS (500MSPS, 10-bit).', - '1-200 MHz.' + 'Stabilizer with Pounder daughter card.', + '2-channel Pound Drever Hall (PDH) lock generator.', + 'AD9959 DDS (500MSPS, 10-bit).' ], size: 'big', type: null, -- 2.47.0