Skip to content
This repository was archived by the owner on Aug 1, 2024. It is now read-only.

Commit 4fb7914

Browse files
committed
Switch to the new crates
1 parent 9ff11de commit 4fb7914

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "rust-esp32-std-demo"
3-
version = "0.27.1"
3+
version = "0.28.0"
44
authors = ["ivmarkov"]
55
edition = "2018"
66
categories = ["embedded", "hardware-support"]
@@ -66,9 +66,9 @@ experimental = ["esp-idf-svc/experimental", "embedded-svc/experimental"]
6666
anyhow = {version = "1", features = ["backtrace"]}
6767
log = "0.4"
6868
url = "2"
69-
esp-idf-sys = { version = "0.31.11", features = ["binstart"] }
70-
esp-idf-svc = "0.43.4"
71-
esp-idf-hal = "0.39.3"
69+
esp-idf-sys = { version = "0.32", features = ["binstart"] }
70+
esp-idf-svc = "0.44"
71+
esp-idf-hal = "0.40"
7272
embedded-svc = "0.23"
7373
embedded-hal = "0.2"
7474
embedded-graphics = "0.7"
@@ -80,7 +80,7 @@ epd-waveshare = "0.5.0"
8080
smol = "1.2"
8181

8282
[build-dependencies]
83-
embuild = { version = "0.30.4", features = ["elf"] }
83+
embuild = { version = "0.31", features = ["elf"] }
8484
anyhow = "1"
8585

8686
# Future; might be possible once https://github.com/rust-lang/cargo/issues/9096 hits Cargo nightly:

src/main.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ compile_error!(
2222
"The `esp32s3_usb_otg` feature can only be built for the `xtensa-esp32s3-espidf` target."
2323
);
2424

25+
use core::ffi;
26+
2527
use std::fs;
2628
use std::io::{Read, Write};
2729
use std::net::{TcpListener, TcpStream};
@@ -74,7 +76,7 @@ use esp_idf_hal::peripheral;
7476
use esp_idf_hal::prelude::*;
7577
use esp_idf_hal::spi;
7678

77-
use esp_idf_sys::{self, c_types};
79+
use esp_idf_sys;
7880
use esp_idf_sys::{esp, EspError};
7981

8082
use display_interface_spi::SPIInterfaceNoCS;
@@ -619,7 +621,7 @@ impl EventLoopMessage {
619621
}
620622

621623
impl EspTypedEventSource for EventLoopMessage {
622-
fn source() -> *const c_types::c_char {
624+
fn source() -> *const ffi::c_char {
623625
b"DEMO-SERVICE\0".as_ptr() as *const _
624626
}
625627
}
@@ -709,11 +711,11 @@ fn test_mqtt_client() -> Result<EspMqttClient<ConnState<MessageImpl, EspError>>>
709711

710712
#[cfg(feature = "experimental")]
711713
mod experimental {
714+
use core::ffi;
715+
712716
use log::info;
713717
use std::{net::TcpListener, net::TcpStream, thread};
714718

715-
use esp_idf_sys::c_types;
716-
717719
pub fn test() -> anyhow::Result<()> {
718720
#[cfg(not(esp_idf_version = "4.3"))]
719721
test_tcp_bind_async()?;

0 commit comments

Comments
 (0)