Compare commits

..

34 Commits

Author SHA1 Message Date
Egor Savkin d3a5ee8a3d Add edge counter for the options to TTL
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 7e7905e522 Add HD68 cable options and fix first small cards options
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 67a6e772f3 Leave opt-out option only to the first kasli
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 893ca829e1 Change ttl groups to banks and remove green leaf
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 9da249aa95 Slightly promote new functionality and consider mono_eem modes on sampler/urukul for suservo
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 44bed4a4e1 Update shop bundle
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 0126a663ea Fix cards state being not updated on touchables
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 2fee470e11 Fix not-disappearing warnings and clocker clock slots
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 4c584efdf3 Small duplication removal
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 631e1dd6b1 Remove redundant notifications about connectors and AD9910
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 248fd9782e Integrate clock/slots configuration into the calculator
Also adjust sizes

Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin eddf408f26 Fixed initial display of empty options in the options summary
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 9cdf563d26 Still fixing the bug
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 4838f50b60 Fix scroll issue and found another bug
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 3d8f82fcd6 Add groups of options and some fixes for long lists of options
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 65f896f517 Add external data for use per every card. Apply it for TTL and Suservo
Signed-off-by: esavkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin ba054ee2a2 Fix tooltip showed out when options overlay was closed
Signed-off-by: esavkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin c95ce76b00 Use tips on more cards
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin c57a27f762 Add tooltips with hints for the user
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 55492c5090 Add icons to options titles
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin a6994416d0 Remove MAC from options
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin a92ec4289c Reposition summary popup relative to icon respective to window width, hide on scroll
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin fa406b7d49 Hide popups on clicking outside of them
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 8483d101d6 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-10-11 11:03:19 +08:00
Egor Savkin 45c5b388aa Add popover for cart summary with options data
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin e5c3c0bada Make overlay appear on button click
And fix options absense for non-carrier cards

Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin ef64c3ce6c Make the design more compact
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin adac15f803 Adjust styles
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 019a6f384b Fix add of useless options to JSON
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 02f8e916a7 Add switchline compact design
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 577fc6520c Add switch and line
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 0e556c270a Fix JSON shop load
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin a6f131e781 Make it update state
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
Egor Savkin 2eb2c37178 Add basic demo example
Kinda works, but buggy

Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-10-11 11:03:19 +08:00
4 changed files with 11 additions and 41 deletions

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 38 KiB

File diff suppressed because one or more lines are too long

View File

@ -2015,7 +2015,7 @@ class Shop extends React.PureComponent {
source.indexes.forEach((card_index, _) => {
dragged_items.push(itemsUnfoldedList[card_index]);
})
} else if (source.index >= 0) {
} else if (source.index) {
dragged_items.push(itemsUnfoldedList[source.index]);
}

View File

@ -670,9 +670,6 @@ const shop_data = {
'Channels can also be broken out to BNC or SMA using IDC-BNC, IDC-SMA or IDC-MCX cards.',
'DAC temperature can be stabilized using the Sinara 8451 Thermostat (sold separately).'
],
options: [
{type: "Switch", args: {title: "TEC chip", outvar: "tec_chip", tip: "Used for stabilizing temperature with Sinara 8451 Thermostat"}},
],
datasheet_file: '/docs/sinara-datasheets/5432.pdf',
datasheet_name: '5432 Zotino datasheet',
size: 'small',
@ -905,21 +902,6 @@ const shop_data = {
{type: "Switch", args: {title: "SUServo mode", outvar: "suservo"}},
null
]
},
{type: "Switch", args: {title: "Configure termination", outvar: "config_term"}},
{
"if": [
{"var": "config_term"},
{type: "Group", items: [
{type: "Switch", args: {title: "Termination #0", outvar: "term_0", tip: "Enable termination on channel #0"}},
{type: "Switch", args: {title: "Termination #1", outvar: "term_1", tip: "Enable termination on channel #1"}},
{type: "Switch", args: {title: "Termination #2", outvar: "term_2", tip: "Enable termination on channel #2"}},
{type: "Switch", args: {title: "Termination #3", outvar: "term_3", tip: "Enable termination on channel #3"}},
{type: "Switch", args: {title: "Termination #4", outvar: "term_4", tip: "Enable termination on channel #4"}},
{type: "Switch", args: {title: "Termination #5", outvar: "term_5", tip: "Enable termination on channel #5"}},
{type: "Switch", args: {title: "Termination #6", outvar: "term_6", tip: "Enable termination on channel #6"}},
{type: "Switch", args: {title: "Termination #7", outvar: "term_7", tip: "Enable termination on channel #7"}},
]}]
}
],
size: 'big',
@ -1125,9 +1107,6 @@ const shop_data = {
'Up to 16W (+4A 4V) from MAX1969 drivers.',
'100Base-T Ethernet with PoE.'
],
options: [
{type: "Switch", args: {title: "Ext power", outvar: "ext_pwr", "tip": "Use external power supply in order to reduce number of used EEM connectors"}}
],
size: 'small',
type: null,
hp: 4,
@ -1145,12 +1124,12 @@ const shop_data = {
price: 8500,
image: '/shop/graphic-03_Shuttler.svg',
specs: [
'16-ch, 125 MSPS DAC EEM with remote analog front end board.',
'High DC resolution (up to ~18 bits with sigma-delta modulation) for trap electrode bias.',
'~15MHz default analog bandwidth.',
'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 via mini-SAS HD with shielded impedance-matched pairs.',
'Included remote analog front-end (AFE) board converts differential signals to ±10V single-ended at the point of use, with additional gain and filtering.',
'Differential analog output (+/-5 V differential) via COTS connector with shielded impedance-matched pairs (mini-SAS HD).',
'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,
@ -1158,16 +1137,8 @@ const shop_data = {
nbrSlotMin: 0,
nbrSlotMax: 0,
nbrClockMax: 0,
slotOccupied: 1,
clockOccupied: 1,
rules: {
resources: {
type: 'shuttler',
icon: '/shop/icon-warning.svg',
name: 'Shuttler',
message: 'This card needs a card that provides a EEM connector (e.g. Kasli) at its left.',
},
}
slotOccupied: 0,
clockOccupied: 0,
},
'pounder': {
id: 'pounder',
@ -1182,8 +1153,7 @@ const shop_data = {
'AD9959 DDS (500MSPS, 10-bit).'
],
options: [
{type: "Switch", args: {title: "Ext power", outvar: "ext_pwr", "tip": "Use external power supply in order to reduce number of used EEM connectors"}},
{type: "SwitchLine", args: {title: "Ext CLK", outvar: "ext_clk", fallback: {text: "125 MHz", checked: false}}}
{type: "Switch", args: {title: "Ext power", outvar: "ext_pwr", "tip": "Use external power supply in order to reduce number of used EEM connectors"}}
],
size: 'big',
type: null,