config.toml

@@ -3,6 +3,7 @@ title = "M-Labs"
 description = "Open tools for open physics."
 
 compile_sass = true
+insert_anchor_links = true
 build_search_index = false
 
 [markdown]

content/experiment-control/resources.md

@@ -170,6 +170,13 @@ We welcome inquiries from research groups of all sizes.<br>[See what has been fu
 <a href="https://github.com/cnourshargh/Bham-ARTIQ-examples" target="_blank" rel="noopener noreferrer">Repository</a>
 {% end %}
 
+
+{% layout_card(title="Deltaflow-on-ARTIQ", sameheight=120) %}
+<small>Run programs in the Deltaflow language from Riverlane on simulated ARTIQ</small>
+
+<a href="https://github.com/riverlane/deltaflow-on-artiq" target="_blank" rel="noopener noreferrer">Repository</a>
+{% end %}
+
 {% layout_card(title="DAX - Duke ARTIQ extensions", sameheight=120) %}
 <small>A library to provide tools for system organization/abstraction and to improve usability by automating common functionality.</small>
 
@@ -227,12 +234,6 @@ We welcome inquiries from research groups of all sizes.<br>[See what has been fu
 <a href="https://github.com/vuthalab/artiq" target="_blank" rel="noopener noreferrer">Repository</a>
 {% end %}
 
-{% layout_card(title="OffsetStabilizer", sameheight=120) %}
-<small>Stabilizer firmware for laser frequency offset stabilization</small>
-
-<a href="https://github.com/PhBrb/OffsetStabilizer" target="_blank" rel="noopener noreferrer">Repository</a>
-{% end %}
-
 </div>
 
 {% layout_div(css="col-12 text-center") %}

content/experiment-control/sinara-core.md

@@ -28,10 +28,6 @@ One of the main devices in the Sinara family is the 1124 Carrier (codenamed Kasl
 
 <a href="https://github.com/sinara-hw/Kasli/wiki" target="_blank" rel="noopener noreferrer">More information</a>
 
-<p style="padding-top: 8px">
-    <span class='doc-icon'></span> <a href="/docs/sinara-datasheets/1124.pdf" target="_blank" rel="noopener noreferrer">1124 Carrier Kasli 2.0 datasheet</a>
-</p>
-
 {% end %}
 
 {% layout_text_img(src="images/kasli-soc@2x.png", popup="images/origin/kasli-soc.jpg", alt="", textleft=true, shadow=false) %}
@@ -44,10 +40,6 @@ See our paper <a href="https://arxiv.org/abs/2111.15290" target="_blank" rel="no
 
 <a href="https://github.com/sinara-hw/Kasli-SoC/wiki" target="_blank" rel="noopener noreferrer">More information</a>
 
-<p style="padding-top: 8px">
-    <span class='doc-icon'></span> <a href="/docs/sinara-datasheets/1125.pdf" target="_blank" rel="noopener noreferrer">1125 Carrier Kasli SoC datasheet</a>
-</p>
-
 {% end %}
 
 {% layout_text_img(src="images/isolated-ttl@2x.png", popup="images/origin/dio.jpg", alt="", shadow=false) %}
@@ -175,11 +167,6 @@ Comparing Mirny to Urukul:
 
 <a href="https://github.com/sinara-hw/mirny/wiki" target="_blank" rel="noopener noreferrer">More information</a>
 
-<p style="padding-top: 8px">
-    <span class='doc-icon'></span> <a href="/docs/sinara-datasheets/4456.pdf" target="_blank" rel="noopener noreferrer">4456 Synthesizer Mirny datasheet</a>
-</p>
-
-
 {% end %}
 
 
@@ -246,11 +233,6 @@ In SU-Servo mode, the 5108 Sampler can be used in combination with the 4410 DDS
 
 Note that update rate specification on this page is for the hardware only; ARTIQ kernel and RTIO overhead make the effective sample rate lower. Typically, only with gateware (e.g. SU-Servo) can the maximum bandwidth be achieved. SU-Servo is part of the regular ARTIQ firmware; development of other gateware can be purchased separately.
 
-<p style="padding-top: 8px">
-    <span class='doc-icon'></span> <a href="/docs/sinara-datasheets/5108.pdf" target="_blank" rel="noopener noreferrer">5108 ADC Sampler datasheet</a>
-</p>
-
-
 {% end %}
 
 
@@ -277,11 +259,6 @@ The Sinara 7210 is a low-noise clock distribution module that can be used to dis
 
 <a href="https://github.com/sinara-hw/Clocker/wiki" target="_blank" rel="noopener noreferrer">More information</a>
 
-<p style="padding-top: 8px">
-    <span class='doc-icon'></span> <a href="/docs/sinara-datasheets/7210.pdf" target="_blank" rel="noopener noreferrer">7210 Clocker datasheet</a>
-</p>
-
-
 {% end %}
 
 

sass/css/_base.scss

@@ -90,53 +90,29 @@ a {
   }
 }
 
-.navbar {
-  .navbar-light .navbar-nav .nav-link,
-  .dropdown-item {
-    outline: none;
+.navbar-light .navbar-nav .nav-link,
+.dropdown-item {
+  outline: none;
+  color: $color-primary;
+  text-decoration: none;
+
+  &:visited {
     color: $color-primary;
-    text-decoration: none;
-
-    &:visited {
-      color: $color-primary;
-    }
-
-    &:hover {
-      color: $color-secondary;
-    }
   }
 
-  .navbar-light .navbar-nav .active>.nav-link,
-  .navbar-light .navbar-nav .nav-link.active,
-  .navbar-light .navbar-nav .nav-link.show,
-  .navbar-light .navbar-nav .show>.nav-link {
+  &:hover {
     color: $color-secondary;
   }
-
-  .dropdown-menu {
-    border: none;
-  }
-  .dropdown-item {
-    &:hover,
-    &:active {
-      background-color: transparent;
-    }
-  }
-  .dropdown-item.active {
-    color: $color-secondary;
-    background-color: transparent;
-  }
-
-  .navbar-toggler {
-    outline: none;
-
-    &:focus,
-    &:hover {
-      outline: none;
-    }
-  }
 }
 
+.navbar-light .navbar-nav .active>.nav-link,
+.navbar-light .navbar-nav .nav-link.active,
+.navbar-light .navbar-nav .nav-link.show,
+.navbar-light .navbar-nav .show>.nav-link {
+  color: $color-secondary;
+}
+
+
 
 /**
  * Custom
@@ -151,6 +127,22 @@ a {
   border: 1px solid transparent;
 }
 
+.dropdown-menu {
+  border: none;
+  margin-top: 0;
+  padding-top: 0;
+}
+.dropdown-item {
+  &:hover,
+  &:active {
+    background-color: transparent;
+  }
+}
+.dropdown-item.active {
+  color: $color-secondary;
+  background-color: transparent;
+}
+
 .btn-primary {
   background-color: $btn-primary-2;
   color: #fff !important;
@@ -163,11 +155,18 @@ a {
     border: 1px solid $btn-secondary-2 !important;
   }
 }
-
 .btn-lg {
   font-size: 1rem;
   padding: 1rem 1.25rem;
 }
+.navbar-toggler {
+  outline: none;
+
+  &:focus,
+  &:hover {
+    outline: none;
+  }
+}
 
 ul.th {
   list-style: none;
@@ -201,63 +200,6 @@ ul:not(.navbar-nav) li {
 }
 
 
-.download-selector {
-  display: inline-flex;
-
-  .divider {
-    border-right: solid 1px white;
-    margin: 0.125rem 0;
-    height: inherit;
-    z-index: 10;
-  }
-
-  .dropdown-menu {
-    border: none;
-    margin-top: 0;
-    padding-top: 0;
-  }
-
-  .btn {
-    background-color: $btn-primary-2;
-    &:hover {
-      background-color: $btn-secondary-2;
-    }
-    &:after {
-      align-self: center;
-    }
-  }
-  button {
-    &[aria-expanded='true']:after {
-      transform: rotate(-180deg);
-    }
-    span {
-      margin-right: 0.5rem;
-    }
-  }
-
-  ul {
-    list-style: none;
-    margin-left: 0!important;
-    width: 100%;
-    padding: 0;
-
-    li {
-      padding: 0;
-      margin: 0;
-
-      a {
-        padding: 0.75rem 0.5rem 0.75rem 1.25rem;
-      }
-    }
-
-    li::before {
-      content: none;
-      display: none;
-    }
-  }
-}
-
-
 .bg-white-shadow {
   background: url(../images/migen-links@2x.png);
   background-repeat: no-repeat;

static/images/icons/icon-windows.svg

@@ -1 +0,0 @@
-<svg width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg"><g fill="#fff" stroke-linecap="round" stroke-opacity=".6" stroke-width=".35269"><path d="m0.52917 0.52917h5.5563v5.5563h-5.5563z"/><path d="m6.6146 0.52917h5.5563v5.5563h-5.5563z"/><path d="m0.52917 6.6146h5.5563v5.5563h-5.5563z"/><path d="m6.6146 6.6146h5.5563v5.5563h-5.5563z"/></g></svg>

static/js/shop/count_resources.js

@@ -27,7 +27,7 @@ const count_item_occupied_hp = (item) => {
 }
 
 const count_item_occupied_tec = (item) => {
-    return (item.options_data && item.options_data.tec === false) ? 0 : ((item.consumes && item.consumes.tec) || 0);
+    return (item.options_data && item.options_data.tec === false) ? 0 : (item.consumes && item.consumes.tec);
 }
 
 export const item_occupied_counters = {

static/js/shop_data.js

@@ -178,8 +178,6 @@ const shop_data = {
         '4 MMCX clock outputs.',
         'Price includes bitstream generation, flashing, testing, and firmware updates for 1 year (USD 1,400.00).',
       ],
-      datasheet_file: '/docs/sinara-datasheets/1124.pdf',
-      datasheet_name: '1124 Carrier Kasli 2.0 datasheet',
       size: 'big',
       options: [
         {type: "Radio", args: {title: "DRTIO role", outvar: "drtio_role", variants: ["standalone", "master", "satellite"], tip: "Distributed Real Time Input/Output allows ARTIQ RTIO channels to be distributed among several satellite devices synchronized and controlled by a central core(master) device. Standalone option disables this feature."}},
@@ -244,8 +242,6 @@ const shop_data = {
         '12 EEM connectors.',
         '4 MMCX clock outputs.',
       ],
-      datasheet_file: '/docs/sinara-datasheets/1125.pdf',
-      datasheet_name: '1124 Carrier Kasli SoC datasheet',
       size: 'big',
       hp: 8,
       nbrSlotMin: 0,
@@ -864,8 +860,6 @@ const shop_data = {
         'Each card provides 8 channels.',
         'Breaking out all 32 channels from a Zotino requires 4 IDC-BNC cards.'
       ],
-      datasheet_file: '/docs/sinara-datasheets/5518-5528.pdf',
-      datasheet_name: '5518 BNC-IDC / 5528 SMA-IDC datasheet',
       size: 'big',
       warnings: [
         "no_idc_source"
@@ -880,17 +874,26 @@ const shop_data = {
       name: 'HV Amplifier',
       name_number: '5633',
       name_codename: '',
-      price: 1950,
+      price: 1500,
       image: '/images/shop/graphic-03_HVAMP32.svg',
       specs: [
-        'Amplifier: LTC6090, 32 channels.',
-        'Output voltage: ±50V.',
+        'Amplifier: LTC6090 or OPA462, 32 channels.',
+        'Amplification range up to ±25V and ±55V available.',
         'Over-temperature protection.',
         'External 12V power supply.',
         'Slew rate 21V/us typical.',
-        'Bandwidth: 12MHz/gain, 2.4MHz typical.',
+        'Bandwidth: 12MHz/gain, for ±25V range BW is 4.8MHz typical.',
         'The same connector as in Zotino and Fastino.'
       ],
+      options: [
+        {type: "Radio",
+          args: {
+            title: "Amplification range",
+            outvar: "hvamp",
+            variants: ["±25V", "±55V"],
+            fallback: 0
+        }},
+      ],
       size: 'small',
       warnings: [
         "no_idc_source"
@@ -955,8 +958,6 @@ const shop_data = {
       specs: [
         'Connects an external HD68 cable to IDC-BNC, IDC-SMA or IDC-MCX cards.',
       ],
-      datasheet_file: '/docs/sinara-datasheets/5568.pdf',
-      datasheet_name: '5518 BNC-IDC / 5528 SMA-IDC datasheet',
       size: 'small',
       options: [
         {type: "Radio", args: {title: "Cable length", outvar: "hd68_cable_len", variants: ["1 M", "2 M", "3 M"], tip: "The desired length of the HD68 cable", fallback: 1}},
@@ -988,8 +989,6 @@ const shop_data = {
         'Full-scale input ranges between +-10mV and +-10V.',
         'Supports SU-Servo laser intensity stabilization servo in conjunction with Urukul.'
       ],
-      datasheet_file: '/docs/sinara-datasheets/5108.pdf',
-      datasheet_name: '5108 ADC Sampler datasheet',
       options: [
         {type: "Switch", args: {title: "1 EEM mode", outvar: "mono_eem"}},
         {
@@ -1064,8 +1063,6 @@ const shop_data = {
         'Frequency up to 1GHz.',
         'Low jitter <100fs RMS.'
       ],
-      datasheet_file: '/docs/sinara-datasheets/7210.pdf',
-      datasheet_name: '7210 Clocker datasheet',
       options: [
         {type: "Switch", args: {title: "Ext CLK", outvar: "ext_clk"}},
         {type: "Switch", args: {title: "Ext power", outvar: "ext_pwr", "tip": "Use external power supply in order to reduce number of used EEM connectors"}}
@@ -1169,8 +1166,6 @@ const shop_data = {
         'Lower jitter and phase noise.',
         'Large frequency changes take several milliseconds.',
       ],
-      datasheet_file: '/docs/sinara-datasheets/4456.pdf',
-      datasheet_name: '4456 Synthesizer Mirny datasheet',
       options: [
         {type: "SwitchLine", args: {title: "Ext CLK", outvar: "ext_clk",
             validator: {name: "frequency", params: {min: 10e6, max: 600e6}},

templates/index.html

@@ -53,29 +53,12 @@
               <a href="{{ get_url(path='@/experiment-control/place-order.md') }}" class="btn btn-primary btn-inversed btn-lg">Order hardware</a>
               <a href="https://m-labs.hk/artiq/manual/" class="btn btn-primary btn-lg">Manual</a>
               <a href="https://forum.m-labs.hk" class="btn btn-primary btn-lg">Forum</a>
+              <a href="https://nixbld.m-labs.hk/job/artiq/extra/msys2-offline-installer/latest/download/1" class="btn btn-primary btn-lg d-inline-flex">
+                  <img src="/images/icons/icon-download.svg" class="d-inline-block align-self-center mx-1" style="height: 1rem" alt="download">
+                Windows installer
+              </a>
               <a href="{{ get_url(path='@/experiment-control/artiq.md') }}" class="btn btn-primary btn-lg">More...</a>
-              <div class="btn-group download-selector">
-                <a class="btn btn-primary btn-lg d-inline-flex" href="https://nixbld.m-labs.hk/job/artiq/extra/msys2-offline-installer/latest/download/1">
-                  <img src="/images/icons/icon-windows.svg" class="d-inline-block align-self-center mx-1" style="height: 1rem" alt="windows">
-                  <span class="d-inline-block">Download <sup>.exe</sup></span>
-                </a>
-                <div class="divider"></div>
-                <button type="button" class="btn btn-primary btn-lg dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false">
-                  <span>stable</span>
-                </button>
-                <ul class="dropdown-menu shadow dropdown-menu-end">
-                  <li>
-                    <a class="dropdown-item" href="https://nixbld.m-labs.hk/job/artiq/extra/msys2-offline-installer/latest/download/1">
-                    ARTIQ-8 (stable) for Windows
-                    </a>
-                  </li>
-                  <li>
-                    <a class="dropdown-item" href="https://nixbld.m-labs.hk/job/artiq/extra-beta/msys2-offline-installer/latest/download/1">
-                      ARTIQ-9 (beta) for Windows
-                    </a>
-                  </li>
-                </ul>
-              </div>
+
             </div>
 
           </div>