Skip to content

Commit

Permalink
Update everything to use latest esp-hal and `embedded-hal-async 1.0…
Browse files Browse the repository at this point in the history
….0`, smoltcp to `0.11.0` (esp-rs#417)

* Update everything to use latest esp-hal

* Change to upstream as PR is merged

* Remove hard dep on backtrace

* Add required feature for heapless

* Update examples

* Update

* update rev

* Remove patches to crates as they are released

* Remove last patch as  is released

* Update changelog
  • Loading branch information
ProfFan authored and bjoernQ committed May 23, 2024
1 parent 711e604 commit bfff1c7
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 9 deletions.
6 changes: 5 additions & 1 deletion esp-wifi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,11 @@ toml-cfg.workspace = true

[dev-dependencies]
esp-println = { workspace = true, features = ["log"] }
esp-backtrace.workspace = true
esp-backtrace = { workspace = true, features = [
"panic-handler",
"exception-handler",
"print-uart",
] }
embassy-executor.workspace = true
embassy-time.workspace = true
embassy-net.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion esp-wifi/examples/embassy_access_point.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ async fn main(spawner: Spawner) -> ! {
esp_wifi::wifi::new_with_mode(&init, wifi, WifiApDevice).unwrap();

let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks);
embassy::init(&clocks, timer_group0.timer0);
embassy::init(&clocks, timer_group0);

let config = Config::ipv4_static(StaticConfigV4 {
address: Ipv4Cidr::new(Ipv4Address::new(192, 168, 2, 1), 24),
Expand Down
2 changes: 1 addition & 1 deletion esp-wifi/examples/embassy_access_point_with_sta.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ async fn main(spawner: Spawner) -> ! {
esp_wifi::wifi::new_ap_sta(&init, wifi).unwrap();

let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks);
embassy::init(&clocks, timer_group0.timer0);
embassy::init(&clocks, timer_group0);

let ap_config = Config::ipv4_static(StaticConfigV4 {
address: Ipv4Cidr::new(Ipv4Address::new(192, 168, 2, 1), 24),
Expand Down
2 changes: 1 addition & 1 deletion esp-wifi/examples/embassy_bench.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ async fn main(spawner: Spawner) -> ! {
esp_wifi::wifi::new_with_mode(&init, wifi, WifiApDevice).unwrap();

let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks);
embassy::init(&clocks, timer_group0.timer0);
embassy::init(&clocks, timer_group0);

let config = Config::dhcpv4(Default::default());

Expand Down
2 changes: 1 addition & 1 deletion esp-wifi/examples/embassy_ble.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ async fn main(_spawner: Spawner) -> ! {
.unwrap();

let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks);
embassy::init(&clocks, timer_group0.timer0);
embassy::init(&clocks, timer_group0);

let mut bluetooth = peripherals.BT;

Expand Down
2 changes: 1 addition & 1 deletion esp-wifi/examples/embassy_dhcp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ async fn main(spawner: Spawner) -> ! {
esp_wifi::wifi::new_with_mode(&init, wifi, WifiStaDevice).unwrap();

let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks);
embassy::init(&clocks, timer_group0.timer0);
embassy::init(&clocks, timer_group0);

let config = Config::dhcpv4(Default::default());

Expand Down
2 changes: 1 addition & 1 deletion esp-wifi/examples/embassy_esp_now.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ async fn main(_spawner: Spawner) -> ! {
println!("esp-now version {}", esp_now.get_version().unwrap());

let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks);
embassy::init(&clocks, timer_group0.timer0);
embassy::init(&clocks, timer_group0);

let mut ticker = Ticker::every(Duration::from_secs(5));
loop {
Expand Down
2 changes: 1 addition & 1 deletion esp-wifi/examples/embassy_esp_now_duplex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ async fn main(spawner: Spawner) -> ! {
println!("esp-now version {}", esp_now.get_version().unwrap());

let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks);
embassy::init(&clocks, timer_group0.timer0);
embassy::init(&clocks, timer_group0);

let (manager, sender, receiver) = esp_now.split();
let manager = make_static!(manager);
Expand Down
2 changes: 1 addition & 1 deletion esp-wifi/src/wifi/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1269,7 +1269,7 @@ fn convert_ap_info(record: &include::wifi_ap_record_t) -> AccessPointInfo {
},
signal_strength: record.rssi,
protocols: EnumSet::empty(), // TODO
auth_method: AuthMethod::from_raw(record.authmode),
auth_method: Some(AuthMethod::from_raw(record.authmode)),
}
}

Expand Down

0 comments on commit bfff1c7

Please sign in to comment.