diff options
| -rw-r--r-- | embassy-stm32/src/eth/v2/mod.rs | 4 | ||||
| -rw-r--r-- | examples/stm32h7/Cargo.toml | 2 | ||||
| -rw-r--r-- | examples/stm32h7/memory.x | 5 | ||||
| -rw-r--r-- | examples/stm32h7/src/bin/eth.rs | 4 | ||||
| m--------- | stm32-data | 0 |
5 files changed, 10 insertions, 5 deletions
diff --git a/embassy-stm32/src/eth/v2/mod.rs b/embassy-stm32/src/eth/v2/mod.rs index 001ac3154..2f2dc4f38 100644 --- a/embassy-stm32/src/eth/v2/mod.rs +++ b/embassy-stm32/src/eth/v2/mod.rs | |||
| @@ -429,8 +429,8 @@ macro_rules! impl_pin { | |||
| 429 | } | 429 | } |
| 430 | 430 | ||
| 431 | crate::pac::peripheral_pins!( | 431 | crate::pac::peripheral_pins!( |
| 432 | ($inst:ident, eth, ETH, $pin:ident, REF_CLK) => { | 432 | ($inst:ident, eth, ETH, $pin:ident, REF_CLK, $af:expr) => { |
| 433 | impl_pin!($pin, RefClkPin, 11); | 433 | impl_pin!($pin, RefClkPin, $af); |
| 434 | }; | 434 | }; |
| 435 | ($inst:ident, eth, ETH, $pin:ident, MDIO, $af:expr) => { | 435 | ($inst:ident, eth, ETH, $pin:ident, MDIO, $af:expr) => { |
| 436 | impl_pin!($pin, MDIOPin, $af); | 436 | impl_pin!($pin, MDIOPin, $af); |
diff --git a/examples/stm32h7/Cargo.toml b/examples/stm32h7/Cargo.toml index eed4882c9..e83ee3585 100644 --- a/examples/stm32h7/Cargo.toml +++ b/examples/stm32h7/Cargo.toml | |||
| @@ -19,7 +19,7 @@ defmt-error = [] | |||
| 19 | [dependencies] | 19 | [dependencies] |
| 20 | embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] } | 20 | embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] } |
| 21 | embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] } | 21 | embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] } |
| 22 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "stm32h743zi", "net", "memory-x", "time-driver-tim2"] } | 22 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "stm32h743zi", "net", "time-driver-tim2"] } |
| 23 | embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" } | 23 | embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" } |
| 24 | embassy-net = { path = "../../embassy-net", default-features = false, features = ["defmt-debug", "defmt", "tcp", "medium-ethernet", "pool-16"] } | 24 | embassy-net = { path = "../../embassy-net", default-features = false, features = ["defmt-debug", "defmt", "tcp", "medium-ethernet", "pool-16"] } |
| 25 | embassy-macros = { path = "../../embassy-macros" } | 25 | embassy-macros = { path = "../../embassy-macros" } |
diff --git a/examples/stm32h7/memory.x b/examples/stm32h7/memory.x new file mode 100644 index 000000000..c23c397a4 --- /dev/null +++ b/examples/stm32h7/memory.x | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | MEMORY | ||
| 2 | { | ||
| 3 | FLASH : ORIGIN = 0x8000000, LENGTH = 1024K | ||
| 4 | RAM : ORIGIN = 0x24000000, LENGTH = 128K | ||
| 5 | } \ No newline at end of file | ||
diff --git a/examples/stm32h7/src/bin/eth.rs b/examples/stm32h7/src/bin/eth.rs index acb6ef3a6..c1b203b8e 100644 --- a/examples/stm32h7/src/bin/eth.rs +++ b/examples/stm32h7/src/bin/eth.rs | |||
| @@ -105,8 +105,8 @@ fn main() -> ! { | |||
| 105 | let state = STATE.put(State::new()); | 105 | let state = STATE.put(State::new()); |
| 106 | let eth = unsafe { | 106 | let eth = unsafe { |
| 107 | ETH.put(Ethernet::new( | 107 | ETH.put(Ethernet::new( |
| 108 | state, p.ETH, eth_int, p.PA1, p.PA2, p.PC1, p.PA7, p.PC4, p.PC5, p.PB12, p.PB13, | 108 | state, p.ETH, eth_int, p.PA1, p.PA2, p.PC1, p.PA7, p.PC4, p.PC5, p.PG13, p.PB13, |
| 109 | p.PB11, LAN8742A, mac_addr, 1, | 109 | p.PG11, LAN8742A, mac_addr, 0, |
| 110 | )) | 110 | )) |
| 111 | }; | 111 | }; |
| 112 | 112 | ||
diff --git a/stm32-data b/stm32-data | |||
| Subproject ed9819e91fed1da71bc5c4b994c7f03a4d66d84 | Subproject d05e63848bdc75f19153297633ad27501d76792 | ||
