Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: adds support for machine peripherals #1383

Merged

Conversation

pedrolamas
Copy link
Member

@pedrolamas pedrolamas commented Mar 4, 2024

Adds support for the new Moonraker Machine Peripherals (Devices)

CAN bus tab will appear if one or more CAN interfaces exist -> this bit has not been thoroughly tested as I do not have a CAN network myself that I can use for testing purposes.

Shortcut on system info card

image

Shortcut on file editor

image

On open

image

After refresh, no devices found

image

After refresh, serial devices found

image

After refresh, usb devices found

image

Resolves #1290

@pedrolamas pedrolamas added the FR - Enhancement New feature or request label Mar 4, 2024
@pedrolamas pedrolamas added this to the 1.28.2 milestone Mar 4, 2024
@pedrolamas
Copy link
Member Author

I am still iterating on the UI of this (trying expander panels, tabs, etc.), but this is what I am thinking in terms of dialog with expander panels:

All collapsed

image

Serial expanded

image

USB expanded

image

@pedrolamas pedrolamas force-pushed the pedrolamas/machine-peripherals branch from c397f04 to d8e7787 Compare March 6, 2024 00:40
Copy link
Contributor

@thijstriemstra thijstriemstra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIce! I would not add the usb id in the title since some device names can be quite long, and it's also an important piece of info I'd rather see in the table, easier to find and copy/paste. Also: Usb -> USB and Uart -> UART

@pedrolamas
Copy link
Member Author

I honestly am a bit on a lost with how best to show this dialog and that it would look good in both desktop and mobile... for copy-paste I will probably just add some buttons on the values, but the whole look/organization of it is what I am more on a loss.

The expanders (as shown above) look a bit weird when they are all collapsed... Mainsail went for tabs, I am not fully on board with that too...

@thijstriemstra
Copy link
Contributor

The expanders (as shown above) look a bit weird when they are all collapsed..

what about using tabs instead?

@thijstriemstra
Copy link
Contributor

thijstriemstra commented Mar 7, 2024

some device names can be quite long,

e.g. a BTT U2C v2.1 shows up as OpenMoko, Inc. Geschwister Schneider CAN adapter with lsusb:

Bus 001 Device 005: ID 1d50:606f OpenMoko, Inc. Geschwister Schneider CAN adapter

@pedrolamas
Copy link
Member Author

pedrolamas commented Mar 10, 2024

Tabs seem to be ok'ish...

On open

image

After refresh, no devices found

image

After refresh, devices found

image

@pedrolamas pedrolamas force-pushed the pedrolamas/machine-peripherals branch 2 times, most recently from 2d151e3 to 8824b1d Compare March 12, 2024 13:04
@pedrolamas pedrolamas marked this pull request as ready for review March 12, 2024 13:08
@pedrolamas pedrolamas requested a review from matmen March 12, 2024 13:08
@pedrolamas pedrolamas force-pushed the pedrolamas/machine-peripherals branch from 8824b1d to c9f21b6 Compare March 13, 2024 16:07
Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
@pedrolamas pedrolamas force-pushed the pedrolamas/machine-peripherals branch from c9f21b6 to bbc1afa Compare March 13, 2024 16:46
Copy link
Member

@matmen matmen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Functionality wise this LGTM, just a couple i18n related things:

src/components/common/PeripheralsDialog.vue Outdated Show resolved Hide resolved
src/components/common/PeripheralsDialog.vue Outdated Show resolved Hide resolved
src/components/common/PeripheralsDialog.vue Outdated Show resolved Hide resolved
Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
@pedrolamas pedrolamas requested a review from matmen March 13, 2024 17:32
@pedrolamas pedrolamas merged commit b97b53c into fluidd-core:develop Mar 13, 2024
4 checks passed
@pedrolamas pedrolamas deleted the pedrolamas/machine-peripherals branch March 13, 2024 17:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
FR - Enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Simplify finding MCU IDs
3 participants