From 9f9e4b4b39f9673854eeb28c0c29cd5ff0ced025 Mon Sep 17 00:00:00 2001 From: ivmarkov Date: Sat, 30 Dec 2023 20:38:15 +0000 Subject: [PATCH] Fix examples for the new heapless --- examples/http_request.rs | 6 ++++-- examples/json_post_handler.rs | 6 ++++-- examples/tls.rs | 7 ++++--- examples/wifi.rs | 6 ++++-- examples/ws_guessing_game.rs | 5 +++-- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/examples/http_request.rs b/examples/http_request.rs index 7d13ac39a01..ac4ebeca733 100644 --- a/examples/http_request.rs +++ b/examples/http_request.rs @@ -1,5 +1,7 @@ //! Simple HTTP client example. +use core::convert::TryInto; + use embedded_svc::{ http::{client::Client as HttpClient, Method}, io::Write, @@ -166,10 +168,10 @@ fn post_chunked_request(client: &mut HttpClient) -> anyhow::R fn connect_wifi(wifi: &mut BlockingWifi>) -> anyhow::Result<()> { let wifi_configuration: Configuration = Configuration::Client(ClientConfiguration { - ssid: SSID.into(), + ssid: SSID.try_into().unwrap(), bssid: None, auth_method: AuthMethod::WPA2Personal, - password: PASSWORD.into(), + password: PASSWORD.try_into().unwrap(), channel: None, }); diff --git a/examples/json_post_handler.rs b/examples/json_post_handler.rs index 0a5c43fa0ad..c0adcb7ee1e 100644 --- a/examples/json_post_handler.rs +++ b/examples/json_post_handler.rs @@ -2,6 +2,8 @@ //! //! Go to 192.168.71.1 to test +use core::convert::TryInto; + use embedded_svc::{ http::{Headers, Method}, io::{Read, Write}, @@ -98,10 +100,10 @@ fn create_server() -> anyhow::Result> { )?; let wifi_configuration = wifi::Configuration::AccessPoint(AccessPointConfiguration { - ssid: SSID.into(), + ssid: SSID.try_into().unwrap(), ssid_hidden: true, auth_method: AuthMethod::WPA2Personal, - password: PASSWORD.into(), + password: PASSWORD.try_into().unwrap(), channel: CHANNEL, ..Default::default() }); diff --git a/examples/tls.rs b/examples/tls.rs index a9710f9a76f..f2ad8e51547 100644 --- a/examples/tls.rs +++ b/examples/tls.rs @@ -2,7 +2,8 @@ //! //! Add your own ssid and password -use std::ffi::CStr; +use core::convert::TryInto; +use core::ffi::CStr; use embedded_svc::wifi::{AuthMethod, ClientConfiguration, Configuration}; @@ -98,10 +99,10 @@ fn main() -> anyhow::Result<()> { fn connect_wifi(wifi: &mut BlockingWifi>) -> anyhow::Result<()> { let wifi_configuration: Configuration = Configuration::Client(ClientConfiguration { - ssid: SSID.into(), + ssid: SSID.try_into().unwrap(), bssid: None, auth_method: AuthMethod::WPA2Personal, - password: PASSWORD.into(), + password: PASSWORD.try_into().unwrap(), channel: None, }); diff --git a/examples/wifi.rs b/examples/wifi.rs index 870ddbf2fd9..8ac6646c9a3 100644 --- a/examples/wifi.rs +++ b/examples/wifi.rs @@ -2,6 +2,8 @@ //! //! Add your own ssid and password +use core::convert::TryInto; + use embedded_svc::wifi::{AuthMethod, ClientConfiguration, Configuration}; use esp_idf_svc::hal::prelude::Peripherals; @@ -42,10 +44,10 @@ fn main() -> anyhow::Result<()> { fn connect_wifi(wifi: &mut BlockingWifi>) -> anyhow::Result<()> { let wifi_configuration: Configuration = Configuration::Client(ClientConfiguration { - ssid: SSID.into(), + ssid: SSID.try_into().unwrap(), bssid: None, auth_method: AuthMethod::WPA2Personal, - password: PASSWORD.into(), + password: PASSWORD.try_into().unwrap(), channel: None, }); diff --git a/examples/ws_guessing_game.rs b/examples/ws_guessing_game.rs index 3668622512e..48a5f3bc590 100644 --- a/examples/ws_guessing_game.rs +++ b/examples/ws_guessing_game.rs @@ -3,6 +3,7 @@ //! Go to http://192.168.71.1 to play use core::cmp::Ordering; +use core::convert::TryInto; use embedded_svc::{ http::Method, @@ -223,10 +224,10 @@ fn create_server() -> anyhow::Result> { )?; let wifi_configuration = wifi::Configuration::AccessPoint(AccessPointConfiguration { - ssid: SSID.into(), + ssid: SSID.try_into().unwrap(), ssid_hidden: true, auth_method: AuthMethod::WPA2Personal, - password: PASSWORD.into(), + password: PASSWORD.try_into().unwrap(), channel: CHANNEL, ..Default::default() });