Refactor code making it easier to add new device types #249
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Pending is an infinite loop, this means that if run() terminates the program will be stuck in an endless (unresponsive) loop: remove the usage of pending and replace it with a join on run so that if the program exits due to an error systemd can restart it; this also avoids using an unnecessary task. Also avoid losing reference to the spawned Ctrl+C task.
NeroReflex
force-pushed
the
main_refactor
branch
from
7b09cad to
e7ccb08
Compare
…:devnode being populated For a future implementation of leds it is important checks of devnode being populated are pushed where devnode is acually used: do that while also splitting up a gigantic method that both leaked a reference to a spaned task and was very hard to work with.
…ctually requires it In order to implement LED(s) handling and potentially other device types that don't have a node in /dev early checks for devnode() being valid must be dropped.
NeroReflex
force-pushed
the
main_refactor
branch
from
e7ccb08 to
4bb68a9
Compare
ShadowApex
requested changes
Jan 3, 2025
NeroReflex
force-pushed
the
main_refactor
branch
8 times, most recently
from
81ba6f6 to
91d58d9
Compare
pastaq
requested changes
Jan 3, 2025
NeroReflex
force-pushed
the
main_refactor
branch
2 times, most recently
from
08a0005 to
2927a34
Compare
ShadowApex
reviewed
Jan 4, 2025
NeroReflex
force-pushed
the
main_refactor
branch
2 times, most recently
from
d035686 to
e5a9f36
Compare
pastaq
reviewed
Jan 6, 2025
pastaq
reviewed
Jan 6, 2025
… the manager component This makes it easier in the future to add new device types suc as led devices.
NeroReflex
force-pushed
the
main_refactor
branch
from
e5a9f36 to
34d32d9
Compare
pastaq
approved these changes
Jan 7, 2025
pastaq
requested changes
Jan 9, 2025
There was a problem hiding this comment.
When ManageAllDevices is set to true, Manager fails to create a CompositeDevice for an external controller. We get a false positive for a virtual controller when it should detect as a bluetooth device.
Tested on Xbox Elite Series 2 Controller.
[2025-01-09T00:46:30Z DEBUG inputplumber::input::manager] Xbox Wireless Controller (event21) is virtual, skipping consideration for /devices/virtual/misc/uhid/0005:045E:0B22.002C/input/input125/event21
| "Unable to create UdevDevice from {base_path}/{name} to check initialization" | ||
| ); | ||
| attempt += 1; | ||
| tokio::time::sleep(Duration::from_millis(10)).await; |
There was a problem hiding this comment.
I know this was 10ms before, but my Elite 2 controller doesn't initialize fully before the 800ms have passed. It seems to connect fine if this is 50ms.
| if let Err(e) = result { | ||
| log::error!("Unable to send command: {:?}", e); | ||
| } | ||
| tokio::time::sleep(Duration::from_millis(10)).await; |
pastaq
reviewed
Jan 9, 2025
|
|
||
| // Check if the virtual device is using the bluetooth bus | ||
| // TODO: Can we get properties from UdevDevice::get_attribute_from_tree? | ||
| let id_bus = device_info.properties.get("ID_BUS"); | ||
|
|
||
| log::debug!("Bus ID for {dev_node}: {id_bus:?}"); | ||
| log::debug!("Bus ID for {dev_path}: {id_bus:?}"); |
There was a problem hiding this comment.
devnode is required for virtual device checks, devpath will not match the bus ID .
There was a problem hiding this comment.
This is just a debug, am I missing something here?
There was a problem hiding this comment.
Look at the two lines above. The device_info grabbed for devnode is not the same as devpath. devpath wont return the same udev device instance, so the info will be different.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since LEDs devices do not have a devnode the hard requirement for source devices of having one is to be removed and the presence check must be postponed to type of devices that actually have one and requires it to work properly.
Refactor manager.rs to remove device specialization where no particular benefits are provided by that specialization.
This PR reduces the overall number of running threads, without changing how the application behaves.