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

Add options for the cards #93

Merged
sb10q merged 42 commits from esavkin/web2019:85-variants into master 2023-11-28 15:32:34 +08:00
Conversation 24 Commits 42 Files Changed 9
esavkin commented 2023-08-22 17:56:12 +08:00
Collaborator

Closes #85
Closes #80

Example:

{
   "items":[
      {
         "pn":"1124",
         "options":{
            "variant":"master",
            "ipv4":"192.168.1.75/24",
            "ipv6":{
               "text":"",
               "checked":false
            },
            "mac":{
               "text":"",
               "checked":false
            },
            "ext_clk":{
               "text":"125 MHz",
               "checked":false
            }
         }
      },
      {
         "pn":"2118",
         "options":{
            "out_first_group":true,
            "out_second_group":true
         }
      },
      {
         "pn":"4456",
         "options":{
            "ext_clk":{
               "text":"125 MHz",
               "checked":false
            }
         }
      }
   ],
   "type":"rack"
}

TODO:

  • optimize UX on touchables/smaller screens
  • add additional options for cards (???)
  • add cross-cards interaction possibility (make only first ttl default input, suservo, etc...) (???)
  • polishing
  • integration with other scripts
  • ???

Suggestions and findings are welcome!

Closes #85 Closes #80 Example: ``` { "items":[ { "pn":"1124", "options":{ "variant":"master", "ipv4":"192.168.1.75/24", "ipv6":{ "text":"", "checked":false }, "mac":{ "text":"", "checked":false }, "ext_clk":{ "text":"125 MHz", "checked":false } } }, { "pn":"2118", "options":{ "out_first_group":true, "out_second_group":true } }, { "pn":"4456", "options":{ "ext_clk":{ "text":"125 MHz", "checked":false } } } ], "type":"rack" } ``` TODO: * ~~optimize UX on touchables/smaller screens~~ * ~~add additional options for cards (???)~~ * ~~add cross-cards interaction possibility (make only first ttl default input, suservo, etc...) (???)~~ * ~~polishing~~ * ~~integration with other scripts~~ * ??? Suggestions and findings are welcome!
Screenshot from 2023-08-22 17-43-55.png
93 KiB
Screenshot from 2023-08-22 17-54-46.png
43 KiB
Screenshot from 2023-08-22 17-43-55.png Screenshot from 2023-08-22 17-54-46.png
esavkin added 11 commits 2023-08-22 17:56:13 +08:00
b8a293f34a Add basic demo example 
Kinda works, but buggy

Signed-off-by: Egor Savkin <es@m-labs.hk>
aad1386002 Make it update state 
Signed-off-by: Egor Savkin <es@m-labs.hk>
ed543a006b Fix JSON shop load 
Signed-off-by: Egor Savkin <es@m-labs.hk>
de3ddeb6c9 Add switch and line 
Signed-off-by: Egor Savkin <es@m-labs.hk>
5516e32d39 Add switchline compact design 
Signed-off-by: Egor Savkin <es@m-labs.hk>
9fa93af24f Fix add of useless options to JSON 
Signed-off-by: Egor Savkin <es@m-labs.hk>
256f5a00a3 Adjust styles 
Signed-off-by: Egor Savkin <es@m-labs.hk>
18ccc1a9a9 Make the design more compact 
Signed-off-by: Egor Savkin <es@m-labs.hk>
2ea7759868 Make overlay appear on button click 
And fix options absense for non-carrier cards

Signed-off-by: Egor Savkin <es@m-labs.hk>
1c3a75318b Add popover for cart summary with options data 
Signed-off-by: Egor Savkin <es@m-labs.hk>
7f2225ea10 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>
sb10q commented 2023-08-22 17:59:57 +08:00
Owner

Your screenshot shows an IP address for Mirny and an external clock for BNC-DIO.

Your screenshot shows an IP address for Mirny and an external clock for BNC-DIO.
sb10q commented 2023-08-22 18:00:29 +08:00
Owner

And I don't think we want configurable MAC addresses in the store.

And I don't think we want configurable MAC addresses in the store.
esavkin added 3 commits 2023-08-23 17:02:32 +08:00
3ab7a8ffd0 Hide popups on clicking outside of them 
Signed-off-by: Egor Savkin <es@m-labs.hk>
58243cff11 Remove MAC from options 
Signed-off-by: Egor Savkin <es@m-labs.hk>
esavkin commented 2023-08-23 17:09:01 +08:00
Poster
Collaborator

Your screenshot shows an IP address for Mirny and an external clock for BNC-DIO.

Actually no, it was just possible to open several popups at the same time and the data it showed is actually correct. Now it closes popup on any click outside of it (+ on scroll for summary). Here are the updated screenshots (also added screenshot from ipad simulation).

> Your screenshot shows an IP address for Mirny and an external clock for BNC-DIO. Actually no, it was just possible to open several popups at the same time and the data it showed is actually correct. Now it closes popup on any click outside of it (+ on scroll for summary). Here are the updated screenshots (also added screenshot from ipad simulation).
Screenshot from 2023-08-23 17-08-17.png
57 KiB
Screenshot from 2023-08-23 17-08-32.png
37 KiB
Screenshot from 2023-08-23 17-12-20.png
34 KiB
Screenshot from 2023-08-23 17-08-17.png Screenshot from 2023-08-23 17-08-32.png Screenshot from 2023-08-23 17-12-20.png
esavkin added 3 commits 2023-09-06 17:15:19 +08:00
c06497ecaa Add icons to options titles 
Signed-off-by: Egor Savkin <es@m-labs.hk>
62f12a44d8 Add tooltips with hints for the user 
Signed-off-by: Egor Savkin <es@m-labs.hk>
db3a5d298b Use tips on more cards 
Signed-off-by: Egor Savkin <es@m-labs.hk>
esavkin added 1 commit 2023-09-08 17:22:57 +08:00
esavkin added 1 commit 2023-09-08 18:27:26 +08:00
esavkin force-pushed 85-variants from 019036ca5f to 4ff436dfe4 2023-09-08 18:29:25 +08:00 Compare
esavkin added 1 commit 2023-09-11 17:38:42 +08:00
esavkin added 1 commit 2023-09-12 17:39:02 +08:00
33418fbe8c Fix scroll issue and found another bug 
Signed-off-by: Egor Savkin <es@m-labs.hk>
esavkin added 1 commit 2023-09-14 17:47:52 +08:00
3aa4cff4bf Still fixing the bug 
Signed-off-by: Egor Savkin <es@m-labs.hk>
esavkin added 1 commit 2023-09-18 11:50:08 +08:00
esavkin added 3 commits 2023-09-19 14:31:24 +08:00
e79ca57a52 Integrate clock/slots configuration into the calculator 
Also adjust sizes

Signed-off-by: Egor Savkin <es@m-labs.hk>
90560397e8 Remove redundant notifications about connectors and AD9910 
Signed-off-by: Egor Savkin <es@m-labs.hk>
ab9718d6a5 Small duplication removal 
Signed-off-by: Egor Savkin <es@m-labs.hk>
esavkin commented 2023-09-25 10:57:16 +08:00
Poster
Collaborator

It can be shown in the quote as this section, coming after crate table: image

It can be shown in the quote as this section, coming after crate table: ![image](/attachments/12e0860a-1059-43b7-bb75-fe966e0efc4c)
image.png
97 KiB
sb10q commented 2023-09-25 14:54:46 +08:00
Owner

Good!

Good!
esavkin added 2 commits 2023-09-25 15:12:38 +08:00
fda37da6d5 Fix not-disappearing warnings and clocker clock slots 
Signed-off-by: Egor Savkin <es@m-labs.hk>
b95256d13d Fix cards state being not updated on touchables 
Signed-off-by: Egor Savkin <es@m-labs.hk>
esavkin added 1 commit 2023-09-25 15:47:21 +08:00
cde98a7aa4 Update shop bundle 
Signed-off-by: Egor Savkin <es@m-labs.hk>
esavkin added 1 commit 2023-09-25 16:46:58 +08:00
esavkin force-pushed 85-variants from cb616e4917 to b4989500ec 2023-09-25 16:48:06 +08:00 Compare
esavkin added 1 commit 2023-09-25 17:49:04 +08:00
b412fae177 Change ttl groups to banks and remove green leaf 
Signed-off-by: Egor Savkin <es@m-labs.hk>
esavkin added 1 commit 2023-09-26 14:44:48 +08:00
9f5fb7606e Leave opt-out option only to the first kasli 
Signed-off-by: Egor Savkin <es@m-labs.hk>
esavkin added 1 commit 2023-09-27 16:37:22 +08:00
2e65aa48d3 Add HD68 cable options and fix first small cards options 
Signed-off-by: Egor Savkin <es@m-labs.hk>
esavkin force-pushed 85-variants from 2e65aa48d3 to a207d4662f 2023-09-27 17:39:30 +08:00 Compare
esavkin changed title from WIP: Add options for the cards to Add options for the cards 2023-09-28 10:17:48 +08:00
esavkin added 1 commit 2023-09-28 12:10:01 +08:00
5b5a2cf230 Add edge counter for the options to TTL 
Signed-off-by: Egor Savkin <es@m-labs.hk>
esavkin force-pushed 85-variants from 5b5a2cf230 to d3a5ee8a3d 2023-10-11 11:03:44 +08:00 Compare
esavkin force-pushed 85-variants from d3a5ee8a3d to 8f014d00e9 2023-10-11 13:01:10 +08:00 Compare
esavkin force-pushed 85-variants from 8f014d00e9 to beac4a1d33 2023-10-18 10:34:13 +08:00 Compare
esavkin added 1 commit 2023-11-01 15:41:59 +08:00
21b6df91e0 Add termination choices to stabilizer 
Signed-off-by: Egor Savkin <es@m-labs.hk>
esavkin force-pushed 85-variants from 21b6df91e0 to 6596ba0f77 2023-11-07 17:05:13 +08:00 Compare
esavkin force-pushed 85-variants from 6596ba0f77 to 851b9014fb 2023-11-08 12:23:45 +08:00 Compare
esavkin commented 2023-11-15 17:29:20 +08:00
Poster
Collaborator

Better to be reviewed and merged, because there were already cases where this feature would greatly help, and seems they will happen again

Better to be reviewed and merged, because there were already cases where this feature would greatly help, and seems they will happen again
sb10q commented 2023-11-20 14:38:24 +08:00
Owner

It's called "optical fiber" not "optic fiber".

It's called "optical fiber" not "optic fiber".
👍 1
sb10q commented 2023-11-20 14:39:44 +08:00
Owner

There should be a note that most of those options can be modified after shipment.

There should be a note that most of those options can be modified after shipment.
👍 1
sb10q commented 2023-11-20 14:40:37 +08:00
Owner

The configure button layout is completely different from the remove button layout. Why?

The configure button layout is completely different from the remove button layout. Why?
sb10q commented 2023-11-20 14:41:45 +08:00
Owner

"By default, we use the AD9910 as it provides more features. If you need the higher frequency resolution of the AD9912, leave us a note."
This should be removed if we have a AD9912 config option.

"By default, we use the AD9910 as it provides more features. If you need the higher frequency resolution of the AD9912, leave us a note." This should be removed if we have a AD9912 config option.
👍 1
sb10q commented 2023-11-20 14:42:29 +08:00
Owner

Alternatively just have two different Urukul cards for AD9910 and AD9912. They were merged into one to save space, but this no longer an issue since we are grouping cards by function.

Alternatively just have two different Urukul cards for AD9910 and AD9912. They were merged into one to save space, but this no longer an issue since we are grouping cards by function.
👍 1
sb10q commented 2023-11-20 14:43:33 +08:00
Owner

IP address on Stabilizer and derived cards should be configurable.

IP address on Stabilizer and derived cards should be configurable.
👍 1
sb10q commented 2023-11-20 14:44:33 +08:00
Owner

USB stick should be a global setting, not tied to Kasli. What should we do with a RFQ containing a Kasli with the USB stick option and another one without?

Maybe remove it for now and do it with the other global option NUC.

USB stick should be a global setting, not tied to Kasli. What should we do with a RFQ containing a Kasli with the USB stick option and another one without? Maybe remove it for now and do it with the other global option NUC.
👍 1
sb10q commented 2023-11-20 14:46:00 +08:00
Owner

Okay I see it disables it on the next Kasli. Weird design still. Those options rather belong under the card list.

Okay I see it disables it on the next Kasli. Weird design still. Those options rather belong under the card list.
sb10q commented 2023-11-20 14:49:11 +08:00
Owner

If there is a warning on the card, it conflicts with the options button and the options button cannot be clicked.

If there is a warning on the card, it conflicts with the options button and the options button cannot be clicked.
sb10q commented 2023-11-20 14:52:33 +08:00
Owner

Options missing for 2245 LVDS-TTL

Options missing for 2245 LVDS-TTL
👍 1
esavkin commented 2023-11-20 14:52:38 +08:00
Poster
Collaborator

The configure button layout is completely different from the remove button layout. Why?

To highlight the feature of the card (some cards are not customized).
Also the behavior should be different from removal button - no hover interactions, since the popup requires more time to work with.

> The configure button layout is completely different from the remove button layout. Why? To highlight the feature of the card (some cards are not customized). Also the behavior should be different from removal button - no hover interactions, since the popup requires more time to work with.
sb10q commented 2023-11-20 14:56:45 +08:00
Owner

HD68 cable length can be selected, but not optical fiber length.

HD68 cable length can be selected, but not optical fiber length.
👍 1
esavkin commented 2023-11-21 13:03:03 +08:00
Poster
Collaborator

If there is a warning on the card, it conflicts with the options button and the options button cannot be clicked.

It is intentional, and doesn't really conflict with the logic of the cards - standalonable cards don't have such warnings anyway. So users should arrange cards properly first, and then configure the options

> If there is a warning on the card, it conflicts with the options button and the options button cannot be clicked. It is intentional, and doesn't really conflict with the logic of the cards - standalonable cards don't have such warnings anyway. So users should arrange cards properly first, and then configure the options
esavkin force-pushed 85-variants from 851b9014fb to 937a767e0a 2023-11-21 14:35:01 +08:00 Compare
esavkin force-pushed 85-variants from 937a767e0a to f11ebc1152 2023-11-21 15:30:49 +08:00 Compare
esavkin added 1 commit 2023-11-21 16:48:26 +08:00
b7087711aa Replace axios with built-in Fetch API 
Decreases size of the bundle from 375 to 347 KB

Signed-off-by: Egor Savkin <es@m-labs.hk>
sb10q commented 2023-11-21 20:52:42 +08:00
Owner

That sounds like a pretty user-hostile decision. Why not just put the warning somewhere else?

That sounds like a pretty user-hostile decision. Why not just put the warning somewhere else?
esavkin added 1 commit 2023-11-27 17:12:25 +08:00
38541f8928 Combine warning and options iconed buttons in one line 
Signed-off-by: Egor Savkin <es@m-labs.hk>
esavkin commented 2023-11-27 17:13:14 +08:00
Poster
Collaborator

Redid the buttons like on the screenshot

Redid the buttons like on the screenshot
Screenshot from 2023-11-27 17-10-22.png
101 KiB
Screenshot from 2023-11-27 17-10-22.png
👍 1
sb10q commented 2023-11-27 17:43:41 +08:00
Owner

Are all the other items addressed?

Are all the other items addressed?
esavkin added 1 commit 2023-11-28 12:16:21 +08:00
esavkin commented 2023-11-28 12:17:31 +08:00
Poster
Collaborator

Are all the other items addressed?

Yes

> Are all the other items addressed? Yes
sb10q commented 2023-11-28 13:02:49 +08:00
Owner

image

Variant should be changed to "DRTIO role". Terminology has to be consistent.

![image](/attachments/0e15f2b1-24f1-4ff6-9fb2-fec4ea5ef903) Variant should be changed to "DRTIO role". Terminology has to be consistent.
image.png
14 KiB
👍 1
esavkin added 1 commit 2023-11-28 14:41:15 +08:00
e7cb6619e3 Update variants -> drtio role and add a tip 
Signed-off-by: Egor Savkin <es@m-labs.hk>
sb10q merged commit 9966593166 into master 2023-11-28 15:32:34 +08:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: M-Labs/web2019#93
There is no content yet.
Delete Branch "esavkin/web2019:85-variants"

Deleting a branch is permanent. Although the deleted branch may exist for a short time before cleaning up, in most cases it CANNOT be undone. Continue?