Adds function and macro to create usb logger without device (also fixes a logger issue) #2414
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
JomerDev
commented
Jan 7, 2024
embassy-usb-logger/src/lib.rs
Outdated
| @@ -105,6 +105,34 @@ impl<const N: usize> UsbLogger<N> { | |||
| join(run_fut, join(log_fut, discard_fut)).await; | |||
| } | |||
| } | |||
|
|
|||
| // Creates the futures needed for the logger from a given class | |||
| pub async fn create_future_from_class<'d, D>(&'d self, class: CdcAcmClass<'d, D> ) | |||
There was a problem hiding this comment.
I tried to use create_future_from_class inside run to not duplicate the code, but couldn't make it work since neither the class nor sender and receiver can be copied. If somebody finds a good way to clean this up, feel free to let me know
JomerDev
changed the title
lulf
reviewed
Feb 9, 2024
embassy-usb-logger/src/lib.rs
Outdated
Comment on lines
121
to
141
| loop { | ||
| let log_fut = async { | ||
| let mut rx: [u8; MAX_PACKET_SIZE as usize] = [0; MAX_PACKET_SIZE as usize]; | ||
| sender.wait_connection().await; | ||
| loop { | ||
| let len = self.buffer.read(&mut rx[..]).await; | ||
| let _ = sender.write_packet(&rx[..len]).await; | ||
| if len as u8 == MAX_PACKET_SIZE { | ||
| let _ = sender.write_packet(&[]).await; | ||
| } | ||
| } | ||
| }; | ||
| let discard_fut = async { | ||
| let mut discard_buf: [u8; MAX_PACKET_SIZE as usize] = [0; MAX_PACKET_SIZE as usize]; | ||
| receiver.wait_connection().await; | ||
| loop { | ||
| let _ = receiver.read_packet(&mut discard_buf).await; | ||
| } | ||
| }; | ||
| join(log_fut, discard_fut).await; | ||
| } |
There was a problem hiding this comment.
What if you make this an internal fn that takes a &mut sender and &mut receiver in order to reuse code?
Move const to the outside of the logger
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.
This can be used in cases where the user wants to log something via usb but the usb connection is already in use.
It also serves as an example on how to create multiple usb classes with one device.
Finally this fixes an issue in the usb logger where messages that were exactly MAX_PACKET_SIZE (in this case 64) bytes long wouldn't show up in the log straight away, as explained in the CdcAcmClass (see the third point about messages with exactly the length of MAX_PACKET_SIZE)