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

Ptp [will not merge, for gh actions only] #5

Open
wants to merge 78 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
9ab5ffd
Added ptp changes from stm32-eth h7-take2 branch
ZachParallel Jul 28, 2023
313cefc
Removed default features
ZachParallel Jul 28, 2023
a2d53a6
Removed unused lifetime from Devive impl
ZachParallel Jul 28, 2023
f9ee699
Added the a lifetime back
ZachParallel Jul 28, 2023
5fe9187
Removed a
ZachParallel Jul 28, 2023
d7eae1f
Muttable reference DMA
ZachParallel Jul 28, 2023
051785f
Added a
ZachParallel Jul 31, 2023
3541cab
Explicit Device
ZachParallel Jul 31, 2023
5012a2d
Added ptp feature
ZachParallel Jul 31, 2023
b4bea4d
PTP error correction
ZachParallel Jul 31, 2023
29fbfc4
Added defmt info comments
ZachParallel Aug 1, 2023
3a200ec
Removed info
ZachParallel Aug 1, 2023
5aac15b
Add defmt feature
ZachParallel Aug 1, 2023
ee4cd73
Change
ZachParallel Aug 1, 2023
3149dd3
Change
ZachParallel Aug 1, 2023
7e52521
Change
ZachParallel Aug 1, 2023
30bf9dd
Fix defmt
ZachParallel Aug 1, 2023
d37828a
Change
ZachParallel Aug 1, 2023
73a631c
Change
ZachParallel Aug 1, 2023
417b719
Change
ZachParallel Aug 1, 2023
91bf810
Change
ZachParallel Aug 1, 2023
6656b19
Change
ZachParallel Aug 1, 2023
767916e
Change
ZachParallel Aug 1, 2023
6f6ff4c
Change
ZachParallel Aug 1, 2023
c94dc1a
Removed register setting that did not exist in stm32-eth
ZachParallel Aug 1, 2023
b7b0445
Change
ZachParallel Aug 1, 2023
e498306
Added PTP instance
ZachParallel Aug 1, 2023
fe78ddc
Added Parts
ZachParallel Aug 1, 2023
7c9b04c
Working timestamping hal
ZachParallel Aug 1, 2023
7e3d205
Removed uncessary defmt
ZachParallel Aug 2, 2023
9d17c47
Converted totoal nanos to i128
ZachParallel Aug 7, 2023
b1ca3a4
Converted totoal nanos to u64
ZachParallel Aug 7, 2023
a7d9adb
Error corrected total_nanos
ZachParallel Aug 7, 2023
82eda19
Added safe add functionality to timestamp
ZachParallel Aug 7, 2023
a51e083
Changed how time was set
ZachParallel Aug 7, 2023
25f9878
Test
ZachParallel Aug 18, 2023
8a7b44c
Removed poor comments and unused imports as well as added the async f…
ZachParallel Aug 21, 2023
2dffefc
adding device impl for ethernetdma value (not ref) as well
Aug 28, 2023
44f43ae
adding missing token impls
Aug 28, 2023
c02c47d
setting packet_id in transmit
Aug 28, 2023
dfac2f2
fixing dma impls
Aug 31, 2023
8bfee82
adding func to enable multicast
Sep 7, 2023
01d0a7e
fixing multicast bug
Sep 7, 2023
bff29fb
removing impl on dma ref
Sep 14, 2023
0eb4fce
capturing and saving ptp frames
Sep 18, 2023
a8e67cb
importing networkendian
Sep 18, 2023
e5f5e36
bug fixes
Sep 20, 2023
37b7f4e
more bug fixes
Sep 20, 2023
02a2fb9
more bug fixes
Sep 20, 2023
ec574c8
adding functions to access ptp frames
Sep 20, 2023
1b10cf9
adding lifetime removing networkendian usage
Sep 20, 2023
2d9a212
adding send ptp frame func
Sep 20, 2023
e0083f6
devie import error fix
Sep 20, 2023
f804473
Revert "removing impl on dma ref"
Sep 20, 2023
f8c8f2e
adding ptp frame buf for dma ref impl
Sep 20, 2023
98597be
ptp send uses frame length to copy
Sep 20, 2023
0f0c47c
adding credit to @datdenkikniet (Johannes Draaijer)
Sep 21, 2023
b64d97a
moving comment to prevent error
Sep 21, 2023
d324c1e
some clippy fixes
Oct 2, 2023
3422177
cargo fmt
Oct 2, 2023
0d74740
adding copy for ptpframewithid
Oct 2, 2023
c093c47
adding clone
Oct 2, 2023
e7b7925
adding clippy allows
Oct 2, 2023
ba4fd99
nucleo example fix
Oct 2, 2023
79fedc6
735 fix
Oct 2, 2023
c00cebc
cargo fmt
Oct 2, 2023
986170e
adding desc num
Oct 2, 2023
ad717ef
clippy passing
Oct 2, 2023
ad8f8b4
fmt
Oct 2, 2023
e687a30
removing bad defaults
Oct 2, 2023
6638912
fixing all ci micro checks/examples
Oct 2, 2023
ec81090
clippy check fix
Oct 2, 2023
8e4fb54
Merge branch 'stm32-rs:master' into ptp
HarishgunaS Oct 2, 2023
cca418f
fixing 735 example
Oct 2, 2023
bb7b50c
fmt
Oct 2, 2023
43e2854
export ptpframewithid
Oct 3, 2023
3fbfee4
making struct fields pub
Oct 3, 2023
d6d268f
fmt
Oct 3, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix defmt
  • Loading branch information
ZachParallel committed Aug 1, 2023
commit 30bf9dd23cc0f1c6bcc8917ca38842b35b4ae64a
9 changes: 8 additions & 1 deletion src/ethernet/tx/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,15 @@ impl TxRing<'_> {

if self.entry_available(entry) {
#[cfg(feature = "defmt")]
let time = self.entry_timestamp(entry);
defmt::info!("Entry: {} available", entry);
Poll::Ready(Ok(self.entry_timestamp(entry)))
if let Some(ts) = time {
#[cfg(feature = "defmt")]
defmt::info!("Timestamp: {}", ts.total_nanos())
} else {
defmt::info!("No ts");
}
Poll::Ready(Ok(ts))
} else {
#[cfg(feature = "defmt")]
defmt::info!("Entry: {} not available", entry);
Expand Down