Update bundle and remove debug messages from production build

Signed-off-by: Egor Savkin <es@m-labs.hk>

content/about-us/faq.md

@@ -53,6 +53,12 @@ M-Labs offers discounts in the following cases:
  
  We reserve the right of final decision regarding discount eligibility and amount.
 
+##### I am on a really tight budget, what can I do?
+
+You can build a useful ARTIQ system and spend very little money by running the open-source code on mass-produced low-cost electronics that were not made for this purpose. For example, in theory the [Colorlight-75E](https://hackaday.com/2020/01/24/new-part-day-led-driver-is-fpga-dev-board-in-disguise/) and [EBAZ4205](https://github.com/xjtuecho/EBAZ4205) can be used as core devices, and the Taobao shop [ZONRI](https://world.taobao.com/dianpu/73267337.htm) sells many inexpensive boards that can be useful as I/O peripherals such as DDS and data converters.
+
+This is not a turn-key solution; experience with electronics, FPGA, and software development is required, and you will have to spend some time studying the code, porting it to these boards, writing drivers, and building hardware adapters.
+
 ##### What are your payment terms?
 
 For most established institutions (determined at our discretion), we offer Net 15 and Net 30 terms after delivery. Please enquire from your institutional email address to help us determine your eligibility for these terms.
@@ -73,6 +79,12 @@ Yes, however processing credit cards is expensive and you need to cover the cost
 
 Exclusivity is subject to contractual minimum order volumes determined at our discretion, but generally exceeding USD 300,000.00 per year for most countries.
 
+##### What is m-labs-intl.com?
+
+[m-labs-intl.com](https://m-labs-intl.com) is a mirror site operated by us and hosted in the USA by Hetzner. It is useful in situations where your institution or local authorities block access to Hong Kong websites (.hk domains and/or Hong Kong IP addresses). To our knowledge, no internet blocking is done on the Hong Kong side other than through ISP DNS resolvers, which we do not use and which does not affect your access to our website.
+
+Some features are currently not available on the mirror site, and you may use a VPN or another circumvention measure of your choice to access these as required. 
+
 ##### We are a recruitment firm. Can we help you find talent?
  
 No.

content/experiment-control/sinara-core.md

@@ -270,6 +270,7 @@ The 4624 AWG "Phaser" is a quad channel 1.25 GS/s RF generator card with dual IQ
 
 - 2x 1.25 GS/s IQ upconverters.
 - dual IQ mixer + 0.3 GHz to 4.8 GHz VCO + PLL.
+- up to 16 dynamic tones per channel using <a href="https://github.com/quartiq/miqro-sim" target="_blank" rel="noopener noreferrer">MIQRO gateware</a> (available separately from QUARTIQ).
 - 31.5 dB range digital step attenuator (similar to Urukul).
 - 2 channels of 5 MS/s ADC (similar to Sampler).
 - Artix-7 FPGA.

static/js/shop/shop_store.js

@@ -480,7 +480,7 @@ const useCart = ((set, get) => ({
                 let itemsCopy = Array.from(crate.items);
                 const disabled = !!get().crateParams(crate.crate_mode).warnings_disabled;
                 itemsCopy = FillResources(itemsCopy, disabled);
-                itemsCopy = TriggerWarnings(itemsCopy, disabled);
+                itemsCopy = TriggerWarnings(itemsCopy, disabled, crate);
                 const [crate_warnings, occupied]  = TriggerCrateWarnings(crate);
                 return {
                     ...crate,

static/js/shop/warnings.js

@@ -30,14 +30,14 @@ const find_next_source_index = (data, index, source) => {
 }
 
 const not_enough_resource_trigger = (name) => {
-    return (_data, _index, counters) => {
+    return (_data, _index, counters, _crate) => {
         const resource = find_in_counters(counters, name);
         return resource.occupied > resource.max;
     }
 }
 
 const no_source_trigger = (name) => {
-    return (data, index, _counters) => {
+    return (data, index, _counters, _crate) => {
         const occupied = item_occupied_counters[name](data[index]);
         if (occupied > 0)
             return !find_previous_source(data, index, name);
@@ -46,12 +46,20 @@ const no_source_trigger = (name) => {
 }
 
 const wiring_constraint = (name) => {
-    return (data, index, _counters) => {
+    return (data, index, _counters, _crate) => {
         const next = find_next_source_index(data, index, name);
         return next - index === 1;
     }
 }
 
+const phaser_next_card_long = (data, index, counters, crate) => {
+    const nbrOccupied = resource_counters.hp(crate.items, -1);
+    const nbrHP = useShopStore.getState().crateParams(crate.crate_mode).hp;
+    return (index < data.length - 1) ? (
+        (data[index+1].consumes && data[index+1].consumes.depth && data[index+1].consumes.depth >= 8.5)
+    ) : (nbrOccupied >= nbrHP && nbrHP > 0)
+}
+
 const Types = {
     "eem_resource": {
         level: "warning",
@@ -88,22 +96,27 @@ const Types = {
         trigger: wiring_constraint("eem"),
         message: "Due to wiring constraints, the carrier can only connect to EEM cards immediately at its right, without crossing another carrier."
     },
+    "phaser_next_card_long": {
+        level: "reminder",
+        trigger: phaser_next_card_long,
+        message: "Next card may interfere with this Phaser. Consider placing a short card after this Phaser."
+    },
     "default": {
         level: "warning",
-        trigger: (_a, _b, _c) => {
+        trigger: (_a, _b, _c, _d) => {
             return true;
         },
         message: 'This item has unimplemented warning'
     }
 }
 
-export function TriggerWarnings(data, disabled) {
+export function TriggerWarnings(data, disabled, crate) {
     return data.map((element, index) => {
         if (!element.warnings) return element;
         element.show_warnings = disabled ? [] :element.warnings
             .map((warning, _) => {
                 if (!!Types[warning])
-                    return Types[warning].trigger(data, index, element.counted_resources) ? {trigger: undefined, name: warning, ...Types[warning]} : null;
+                    return Types[warning].trigger(data, index, element.counted_resources, crate) ? {trigger: undefined, name: warning, ...Types[warning]} : null;
                 else
                     return Types.default;
             })
@@ -143,6 +156,22 @@ const crate_warnings = {
             const nbrHPDesktop = useShopStore.getState().crate_modes.desktop.hp;
             return crate.crate_mode === useShopStore.getState().crate_modes.rack.id && occupied < nbrHPDesktop;
         }
+    },
+    "phaser_not_fit": {
+        message: "Since one or more Phasers may interfere with their next cards, they may additional space, that wouldn't fit into the crate. Consider removing cards, placing short cards after Phaser(s), or choosing larger crate.",
+        level: "warning",
+        trigger: (crate, occupied) => {
+            const nbrHP = useShopStore.getState().crateParams(crate.crate_mode).hp;
+            const stacked_phasers = crate.items.filter((elem, index, data) => {
+                    return (elem.name_codename === "Phaser") && ((index < data.length - 1) ? (
+                        (data[index + 1].consumes && data[index + 1].consumes.depth && data[index + 1].consumes.depth >= 8.5)
+                    ) : (occupied >= nbrHP && nbrHP > 0))
+                }
+            ).length;
+            // #!debug
+            console.log(stacked_phasers, occupied)
+            return stacked_phasers > 0 && (occupied + stacked_phasers*2 >= nbrHP) && nbrHP >0;
+        }
     }
 }
 

static/js/shop_data.js

@@ -221,7 +221,8 @@ const shop_data = {
           "eem_wiring_constraint"
       ],
       consumes: {
-        hp: 8
+        hp: 8,
+        depth: 20
       }
     },
     'kaslisoc': {
@@ -297,7 +298,8 @@ const shop_data = {
         "eem_wiring_constraint"
       ],
       consumes: {
-        hp: 8
+        hp: 8,
+        depth: 20
       }
     },
     'vhdcicarrier': {
@@ -322,7 +324,8 @@ const shop_data = {
         "eem_wiring_constraint"
       ],
       consumes: {
-        hp: 8
+        hp: 8,
+        depth: 16
       }
     },
     'bnc-dio': {
@@ -393,7 +396,8 @@ const shop_data = {
       ],
       consumes: {
         hp: 8,
-        eem: 1
+        eem: 1,
+        depth: 7
       }
     },
     'sma-dio': {
@@ -458,7 +462,8 @@ const shop_data = {
       ],
       consumes: {
         hp: 4,
-        eem: 1
+        eem: 1,
+        depth: 7
       }
     },
     'mcx-dio': {
@@ -549,7 +554,8 @@ const shop_data = {
       ],
       consumes: {
         hp: 4,
-        eem: 2
+        eem: 2,
+        depth: 23
       }
     },
     'rj45-dio': {
@@ -635,7 +641,8 @@ const shop_data = {
       ],
       consumes: {
         hp: 4,
-        eem: 2
+        eem: 2,
+        depth: 7
       }
     },
     'urukul': {
@@ -700,7 +707,8 @@ const shop_data = {
       consumes: {
         hp: 4,
         eem: 2,
-        clk: 1
+        clk: 1,
+        depth: 16
       }
     },
     'urukul_4412': {
@@ -738,7 +746,8 @@ const shop_data = {
       consumes: {
         hp: 4,
         eem: 2,
-        clk: 1
+        clk: 1,
+        depth: 16
       }
     },
     'phaser': {
@@ -751,6 +760,7 @@ const shop_data = {
       specs: [
         '2x 1.25 GS/s IQ upconverters.',
         'dual IQ mixer + 0.3 GHz to 4.8 GHz VCO + PLL.',
+        'up to 16 dynamic tones using MIQRO gateware (available separately from QUARTIQ).',
         '31.5 dB range digital step attenuator (similar to Urukul).',
         '2 channels of 5 MS/s ADC (similar to Sampler).',
         'Artix-7 FPGA.',
@@ -766,12 +776,14 @@ const shop_data = {
       size: 'small',
       warnings: [
         "no_eem_source",
-        "no_clk_source"
+        "no_clk_source",
+        "phaser_next_card_long"
       ],
       consumes: {
         hp: 4,
         eem: 1,
-        clk: 1
+        clk: 1,
+        depth: 16 // heatsink 8.5
       }
     },
     'zotino': {
@@ -813,7 +825,8 @@ const shop_data = {
       consumes: {
         hp: 4,
         eem: 1,
-        tec: 1
+        tec: 1,
+        depth: 16
       },
       resources: [
         {name: "idc", max: 4}
@@ -841,7 +854,8 @@ const shop_data = {
       ],
       consumes: {
         hp: 4,
-        eem: 1
+        eem: 1,
+        depth: 17
       },
       resources: [
         {name: "idc", max: 4}
@@ -865,7 +879,8 @@ const shop_data = {
       ],
       consumes: {
         hp: 8,
-        idc: 1
+        idc: 1,
+        depth: 6
       }
     },
     'hvamp32': {
@@ -902,7 +917,8 @@ const shop_data = {
       ],
       consumes: {
         hp: 4,
-        idc: 4
+        idc: 4,
+        depth: 16
       }
     },
     'idc-sma-adapter': {
@@ -923,7 +939,8 @@ const shop_data = {
       ],
       consumes: {
         hp: 4,
-        idc: 1
+        idc: 1,
+        depth: 6
       }
     },
     'hd68-idc-adapter': {
@@ -945,7 +962,8 @@ const shop_data = {
         "idc_resource"
       ],
       consumes: {
-        hp: 4
+        hp: 4,
+        depth: 5
       },
       resources: [
         {name: "idc", max: 4}
@@ -998,7 +1016,8 @@ const shop_data = {
       ],
       consumes: {
         hp: 8,
-        eem: 2
+        eem: 2,
+        depth: 16
       }
     },
     'koster': {
@@ -1024,7 +1043,8 @@ const shop_data = {
       ],
       consumes: {
         hp: 4,
-        eem: 2
+        eem: 2,
+        depth: 7.5
       }
     },
     'clocker': {
@@ -1055,7 +1075,8 @@ const shop_data = {
       consumes: {
         hp: 4,
         eem: 1,
-        clk: 1
+        clk: 1,
+        depth: 7
       },
       resources: [
         {name: "clk", max: 6}
@@ -1092,7 +1113,8 @@ const shop_data = {
       ],
       consumes: {
         hp: 4,
-        eem: 1
+        eem: 1,
+        depth: 16
       },
     },
     'fast_servo': {
@@ -1126,7 +1148,8 @@ const shop_data = {
       ],
       consumes: {
         hp: 4,
-        eem: 1
+        eem: 1,
+        depth: 16
       },
     },
     'mirny': {
@@ -1157,7 +1180,8 @@ const shop_data = {
       consumes: {
         hp: 4,
         eem: 1,
-        clk: 1
+        clk: 1,
+        depth: 16
       },
     },
     'almazny': {
@@ -1185,7 +1209,8 @@ const shop_data = {
       consumes: {
         hp: 8,
         eem: 1,
-        clk: 1
+        clk: 1,
+        depth: 16
       },
     },
     'thermostat-eem': {
@@ -1213,6 +1238,7 @@ const shop_data = {
       consumes: {
         hp: 4,
         eem: 1,
+        depth: 16
       }
     },
     'thermostat2ch': {
@@ -1231,7 +1257,8 @@ const shop_data = {
       ],
       size: 'small',
       consumes: {
-        hp: 4
+        hp: 4,
+        depth: 12
       },
       resources: [
         {name: "tec", max: 2}
@@ -1260,7 +1287,8 @@ const shop_data = {
       consumes: {
         hp: 8,
         eem: 1,
-        clk: 1
+        clk: 1,
+        depth: 8
       },
     },
     'pounder': {
@@ -1294,7 +1322,8 @@ const shop_data = {
       consumes: {
         hp: 8,
         eem: 1,
-        clk: 1
+        clk: 1,
+        depth: 16
       }
     },
     'eem_pwr_mod': {
@@ -1319,6 +1348,7 @@ const shop_data = {
       warnings: [],
       consumes: {
         hp: 8,
+        depth: 20
       },
     },
     'kirdy': {
@@ -1350,6 +1380,7 @@ const shop_data = {
       warnings: [],
       consumes: {
         hp: 8,
+        depth: 16
       },
     },
   },