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

[TR3FIR-141] Update embassy to latest #5

Merged
merged 397 commits into from
May 9, 2024
Merged

Conversation

mattcaron-token
Copy link

@mattcaron-token mattcaron-token commented May 9, 2024

There are 3 merges here which likely don't need to be fully reviewed:

  1. Merge of main into this branch (at the time, it was named pull_upstream2). This is just upstream commits, but I do resolve some conflicts. The conflict resolution bears review.
  2. Merge of token-main into this branch. This is commits from Taylor's PR which have already been reviewed.
  3. Another merge of main into this branch. This is also just upstream commits.

There are also 3 commits which are normal commits.

Everything that should be reviewed is tagged with TR3FIR-141. Everything else is just nonconflicting merges, etc.

This also implements the new versioning scheme.

eZioPan and others added 30 commits April 5, 2024 00:51
This avoids cfg's, because it works both for timers that have a a dedicated CC interrupt
line, and timers where all interrupts go to a single interrupt line.
…up_and_pull-down

Add parameter for enabling pull-up and pull-down in RP PWM input mode
stm32/qspi: autodeduce transfer len from buffer len.
stm32: adc: v3: [h5] set OR.OP0 to 1 when ADCx_INP0 is selected, per RM
Co-authored-by: becothas <41289937+becothas@users.noreply.github.com>
[embassy-stm32] added comments explaining multiprio interrupts
embassy-sync: Add len, is_empty and is_full functions to Channel.
…ll_ functions

This is a breaking change for users of the poll_ functions. (Some might
not notice if they already pass in an IpEndpoint into poll_send_to, or
discard that item in poll_recv_from).
Fix the comment about the default value: this defaults to 64 rather
than 8 bytes.

It seems like the max packet size for endpoint 0 should normally be
selected automatically, rather than being part of the config.  At best
it seems like this setting should just be a hint that gets used if when
the bus is operating at full speed.  The contents of the device
descriptor should ideally be updated with the correct max packet size
after bus enumeration completes.  In practice always using 64 is
probably fine if low speed environments never need to be supported.
(Super speed requires a max packet size of 512 bytes, which I didn't
list in the comments here.)
USB: fix comments about the config.max_packet_size_0 field
onestacked and others added 16 commits May 5, 2024 19:43
…-unused-deps

Removes some unused dependencies in embedded-net.
embassy_sync::Mutex: Implement traits to match std
impl ReadReady for tcp call can_recv() insted of may_recv()
Fix soundness issue introduced in a previous soundness fix embassy-rs#2602 .
PeripheralRef must not implement DerefMut itself, but the blanket impl must still require DerefMut. Otherwise
you can create two instances of a driver on the same uart by using `&my_uart`.
…deref

Fix PeripheralRef soundness issue allowing &T.
Current name clashes with "regular" stm32h7 thus generating cargo
warning.
stm32: examples: Use unique crate name for stm32h7rs examples
rp: Add raw interrupt handler example
Merging after Taylor's merge.
We did another upstream sync after the original. Merge that so we get
those new pieces too.
Now that I've gotten it all working, go back to using artifactory instead of paths.
embassy-stm32/src/time_driver.rs Outdated Show resolved Hide resolved
This was something that Taylor fixed in
20faa0a and I had noticed when
resolving the conflict, but I accepted the wrong side.
@mattcaron-token
Copy link
Author

I'm not merging this yet because it's not being built. I've asked @DavidZemon to have a look, since he's the CI guy.

@mattcaron-token
Copy link
Author

I'm not merging this yet because it's not being built. I've asked @DavidZemon to have a look, since he's the CI guy.

David says it's only building token-main, not all feature branches.

I'm fine with this.

@mattcaron-token mattcaron-token merged commit 3d69805 into token-main May 9, 2024
@mattcaron-token mattcaron-token deleted the update_embassy branch May 9, 2024 17:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.