max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #469

Browse Source 
469: Add support for STM32H723 and fix eth example. r=matoushybl a=matoushybl



Co-authored-by: Matous Hybl <hyblmatous@gmail.com>
This commit is contained in:
bors[bot] 2021-11-04 15:28:09 +00:00 committed by GitHub
commit 5d863ad19f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
embassy-stm32/src/eth/v2/mod.rs
View File

@ -429,8 +429,8 @@ macro_rules! impl_pin {
} }
crate::pac::peripheral_pins!( crate::pac::peripheral_pins!(
($inst:ident, eth, ETH, $pin:ident, REF_CLK) => { ($inst:ident, eth, ETH, $pin:ident, REF_CLK, $af:expr) => {
impl_pin!($pin, RefClkPin, 11); impl_pin!($pin, RefClkPin, $af);
}; };
($inst:ident, eth, ETH, $pin:ident, MDIO, $af:expr) => { ($inst:ident, eth, ETH, $pin:ident, MDIO, $af:expr) => {
impl_pin!($pin, MDIOPin, $af); impl_pin!($pin, MDIOPin, $af);

2
examples/stm32h7/Cargo.toml
View File

@ -19,7 +19,7 @@ defmt-error = []
[dependencies] [dependencies]
embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] } embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] }
embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] } embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] }
embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "stm32h743zi", "net", "memory-x", "time-driver-tim2"] } embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "stm32h743zi", "net", "time-driver-tim2"] }
embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" } embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" }
embassy-net = { path = "../../embassy-net", default-features = false, features = ["defmt-debug", "defmt", "tcp", "medium-ethernet", "pool-16"] } embassy-net = { path = "../../embassy-net", default-features = false, features = ["defmt-debug", "defmt", "tcp", "medium-ethernet", "pool-16"] }
embassy-macros = { path = "../../embassy-macros" } embassy-macros = { path = "../../embassy-macros" }

5
examples/stm32h7/memory.x Normal file
View File

@ -0,0 +1,5 @@
MEMORY
{
FLASH : ORIGIN = 0x8000000, LENGTH = 1024K
RAM : ORIGIN = 0x24000000, LENGTH = 128K
}

4
examples/stm32h7/src/bin/eth.rs
View File

@ -105,8 +105,8 @@ fn main() -> ! {
let state = STATE.put(State::new()); let state = STATE.put(State::new());
let eth = unsafe { let eth = unsafe {
ETH.put(Ethernet::new( ETH.put(Ethernet::new(
state, p.ETH, eth_int, p.PA1, p.PA2, p.PC1, p.PA7, p.PC4, p.PC5, p.PB12, p.PB13, state, p.ETH, eth_int, p.PA1, p.PA2, p.PC1, p.PA7, p.PC4, p.PC5, p.PG13, p.PB13,
p.PB11, LAN8742A, mac_addr, 1, p.PG11, LAN8742A, mac_addr, 0,
)) ))
}; };

2
stm32-data

@ -1 +1 @@
Subproject commit ed9819e91fed1da71bc5c4b994c7f03a4d66d84f Subproject commit d05e63848bdc75f19153297633ad27501d76792d