M-Labs
/
web2019
5
0
Fork 2
Code Issues 16 Pull Requests Releases Wiki Activity

Compare commits

base: M-Labs:cb616e491753b5f8a0935f82ace93bd99643ce4c
Branches Tags
M-Labs:master
..
compare: M-Labs:b4989500ecee0ad6b49f7ce2d05d90b066192bf5
Branches Tags
M-Labs:master

31 Commits
cb616e4917 ... b4989500ec

Author SHA1 Message Date
Egor Savkin b4989500ec Slightly promote new functionality and consider mono_eem modes on sampler/urukul for suservo 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin 1244ac1775 Update shop bundle 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin 0762572956 Fix cards state being not updated on touchables 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin a8e3bae08e Fix not-disappearing warnings and clocker clock slots 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin 11aac2323d Small duplication removal 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin a705feebc2 Remove redundant notifications about connectors and AD9910 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin 718a4509f4 Integrate clock/slots configuration into the calculator 
Also adjust sizes

Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin 1b1736ea15 Fixed initial display of empty options in the options summary 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin 264e583d82 Still fixing the bug 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin 3a6dfef9b7 Fix scroll issue and found another bug 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin c2cf323cf4 Add groups of options and some fixes for long lists of options 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin 4b5ea7c1db Add external data for use per every card. Apply it for TTL and Suservo 
Signed-off-by: esavkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin 832a538c22 Fix tooltip showed out when options overlay was closed 
Signed-off-by: esavkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin 3980ece5b5 Use tips on more cards 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin 4e6447c3d2 Add tooltips with hints for the user 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin a4e7fce0f4 Add icons to options titles 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin 9b650b4a2c Remove MAC from options 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin 3454a1b4cd Reposition summary popup relative to icon respective to window width, hide on scroll 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin 22372116ad Hide popups on clicking outside of them 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin a6a6d758e9 Update bundle file 
Add custom options to more cards

Minor design adjustments: add margin-left to icon and optimize the icon

Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin 712d8664f1 Add popover for cart summary with options data 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin bd7e39927d Make overlay appear on button click 
And fix options absense for non-carrier cards

Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin b2250680c9 Make the design more compact 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin 2eb4bc99dd Adjust styles 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin 759e41681f Fix add of useless options to JSON 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin 4c64879fbc Add switchline compact design 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin 6e54da2c71 Add switch and line 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin 47d9af400d Fix JSON shop load 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin 7b394c8203 Make it update state 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:40 +08:00
Egor Savkin ae23c18b0c Add basic demo example 
Kinda works, but buggy

Signed-off-by: Egor Savkin <es@m-labs.hk>
 2023-09-25 16:47:39 +08:00
Sebastien Bourdeauducq a7c4c079a4 add link to UCLA AMO 2023-09-11 21:02:44 +08:00
1 changed files with 6 additions and 0 deletions
Show Stats Expand all files Collapse all files

6
content/experiment-control/resources.md
View File

@ -146,6 +146,12 @@ We welcome inquiries from research groups of all sizes.<br>[See what has been fu
<a href="https://github.com/OxfordIonTrapGroup/oitg" target="_blank" rel="noopener noreferrer">Repository</a>
{% end %}
{% layout_card(title="UCLA routines", sameheight=120) %}
<small>ARTIQ experiments in use at UCLA AMO</small>
<a href="https://github.com/EGGS-Experiment/LAX_exp" target="_blank" rel="noopener noreferrer">Repository</a>
{% end %}
{% layout_card(title="nvOS", sameheight=120) %}
<small>A quantum operating system built around ARTIQ and NV centers in diamond.</small>