fix: fix clippy warnings

This commit is contained in:
2026-10-10 18:28:34 -05:00
parent bb79ae188c
commit 1f435dd43f
4 changed files with 37 additions and 33 deletions
+2 -2
View File
@@ -112,7 +112,7 @@ impl Key for ConfigKey {
let val = buffer let val = buffer
.get_mut(0) .get_mut(0)
.ok_or(sequential_storage::map::SerializationError::BufferTooSmall)?; .ok_or(sequential_storage::map::SerializationError::BufferTooSmall)?;
*val = self.clone().into(); *val = (*self).into();
Ok(1) Ok(1)
} }
@@ -120,7 +120,7 @@ impl Key for ConfigKey {
buffer: &[u8], buffer: &[u8],
) -> Result<(Self, usize), sequential_storage::map::SerializationError> { ) -> Result<(Self, usize), sequential_storage::map::SerializationError> {
let val = *buffer let val = *buffer
.get(0) .first()
.ok_or(sequential_storage::map::SerializationError::BufferTooSmall)?; .ok_or(sequential_storage::map::SerializationError::BufferTooSmall)?;
Ok(( Ok((
val.try_into() val.try_into()
+18 -20
View File
@@ -14,19 +14,30 @@ impl AppBuilder for HttpApiProps {
} }
} }
#[allow(
clippy::large_stack_frames,
reason = "it's not unusual to allocate larger objects in service's start functions"
)]
pub fn start_http_api(spawner: Spawner, net_stack: Stack<'static>) { pub fn start_http_api(spawner: Spawner, net_stack: Stack<'static>) {
spawner.spawn( let service = crate::mk_static!(
handler(HttpApiApp::new( HttpApiApp<'static, HttpApiProps>,
HttpApiApp {
config: Default::default(),
net_stack, net_stack,
Default::default(), app: HttpApiProps.build_app(),
Default::default(),
)) tcp_rx_buffer: [0; 1024],
.unwrap(), tcp_tx_buffer: [0; 1024],
http_buffer: [0; 2048],
}
); );
spawner.spawn(handler(service).unwrap());
} }
#[embassy_executor::task] #[embassy_executor::task]
async fn handler(mut service: HttpApiApp<'static, HttpApiProps>) { async fn handler(service: &'static mut HttpApiApp<'static, HttpApiProps>) {
service.run().await; service.run().await;
} }
@@ -56,19 +67,6 @@ pub struct HttpApiApp<'a, AB: AppBuilder> {
} }
impl<'a, AB: AppBuilder> HttpApiApp<'a, AB> { impl<'a, AB: AppBuilder> HttpApiApp<'a, AB> {
pub fn new(net_stack: Stack<'a>, config: HttpApiConfig, app: AB) -> Self {
Self {
config: config,
net_stack: net_stack,
app: app.build_app(),
tcp_rx_buffer: [0; 1024],
tcp_tx_buffer: [0; 1024],
http_buffer: [0; 2048],
}
}
pub async fn run(&mut self) { pub async fn run(&mut self) {
picoserve::Server::new( picoserve::Server::new(
&self.app, &self.app,
+2
View File
@@ -7,6 +7,8 @@
#![deny(clippy::large_stack_frames)] #![deny(clippy::large_stack_frames)]
#![feature(impl_trait_in_assoc_type)] #![feature(impl_trait_in_assoc_type)]
extern crate alloc;
pub mod http_api; pub mod http_api;
pub mod clock; pub mod clock;
+14 -10
View File
@@ -1,3 +1,4 @@
use alloc::boxed::Box;
use defmt::{error, info}; use defmt::{error, info};
use embassy_executor::Spawner; use embassy_executor::Spawner;
use embassy_futures::select::{Either, select}; use embassy_futures::select::{Either, select};
@@ -11,6 +12,10 @@ use esp_radio::wifi::sta::StationConfig;
use esp_radio::wifi::{ControllerConfig, Interface, WifiController}; use esp_radio::wifi::{ControllerConfig, Interface, WifiController};
use oneshot::{RecvError, Sender}; use oneshot::{RecvError, Sender};
#[allow(
clippy::large_stack_frames,
reason = "it's not unusual to allocate larger objects in service's start functions"
)]
pub fn start_wifi(spawner: Spawner, wifi: WIFI<'static>) -> Stack<'static> { pub fn start_wifi(spawner: Spawner, wifi: WIFI<'static>) -> Stack<'static> {
let wifi_config = esp_radio::wifi::Config::Station(StationConfig::default()); let wifi_config = esp_radio::wifi::Config::Station(StationConfig::default());
@@ -45,7 +50,7 @@ pub fn start_wifi(spawner: Spawner, wifi: WIFI<'static>) -> Stack<'static> {
net_stack net_stack
} }
pub async fn set_station_config(config: esp_radio::wifi::Config) -> Result<(), RecvError> { pub async fn set_station_config(config: Box<esp_radio::wifi::Config>) -> Result<(), RecvError> {
let (send, recv) = oneshot::channel(); let (send, recv) = oneshot::channel();
WIFI_CHANNEL WIFI_CHANNEL
.send(WifiOperationMessage::SetStationConfig(config, send)) .send(WifiOperationMessage::SetStationConfig(config, send))
@@ -53,7 +58,7 @@ pub async fn set_station_config(config: esp_radio::wifi::Config) -> Result<(), R
recv.await recv.await
} }
pub async fn set_dhcp_config(config: embassy_net::DhcpConfig) -> Result<(), RecvError> { pub async fn set_dhcp_config(config: Box<embassy_net::DhcpConfig>) -> Result<(), RecvError> {
let (send, recv) = oneshot::channel(); let (send, recv) = oneshot::channel();
WIFI_CHANNEL WIFI_CHANNEL
.send(WifiOperationMessage::SetDhcpConfig(config, send)) .send(WifiOperationMessage::SetDhcpConfig(config, send))
@@ -64,8 +69,8 @@ pub async fn set_dhcp_config(config: embassy_net::DhcpConfig) -> Result<(), Recv
static WIFI_CHANNEL: Channel<CriticalSectionRawMutex, WifiOperationMessage, 1> = Channel::new(); static WIFI_CHANNEL: Channel<CriticalSectionRawMutex, WifiOperationMessage, 1> = Channel::new();
enum WifiOperationMessage { enum WifiOperationMessage {
SetStationConfig(esp_radio::wifi::Config, Sender<()>), SetStationConfig(Box<esp_radio::wifi::Config>, Sender<()>),
SetDhcpConfig(embassy_net::DhcpConfig, Sender<()>), SetDhcpConfig(Box<embassy_net::DhcpConfig>, Sender<()>),
} }
#[embassy_executor::task] #[embassy_executor::task]
@@ -73,15 +78,15 @@ async fn handler(net_stack: Stack<'static>) -> ! {
loop { loop {
match WIFI_CHANNEL.receive().await { match WIFI_CHANNEL.receive().await {
WifiOperationMessage::SetStationConfig(config, resp) => { WifiOperationMessage::SetStationConfig(config, resp) => {
WIFI_HANDLER_RPC.signal(config); WIFI_HANDLER_RPC.signal(*config);
if let Err(_) = resp.send(()) { if resp.send(()).is_err() {
// TODO: find a way to not hard-code symbols in a string // TODO: find a way to not hard-code symbols in a string
error!("WifiOperationMessage::SetStationConfig failed to respond") error!("WifiOperationMessage::SetStationConfig failed to respond")
}; };
} }
WifiOperationMessage::SetDhcpConfig(config, resp) => { WifiOperationMessage::SetDhcpConfig(config, resp) => {
net_stack.set_config_v4(embassy_net::ConfigV4::Dhcp(config)); net_stack.set_config_v4(embassy_net::ConfigV4::Dhcp(*config));
if let Err(_) = resp.send(()) { if resp.send(()).is_err() {
// TODO: find a way to not hard-code symbols in a string // TODO: find a way to not hard-code symbols in a string
error!("WifiOperationMessage::SetDhcpConfig failed to respond") error!("WifiOperationMessage::SetDhcpConfig failed to respond")
}; };
@@ -114,12 +119,11 @@ async fn connection_handler(mut controller: WifiController<'static>) -> ! {
loop { loop {
if let Either::First(req) = if let Either::First(req) =
select(WIFI_HANDLER_RPC.wait(), connection(&mut controller)).await select(WIFI_HANDLER_RPC.wait(), connection(&mut controller)).await
&& let Some(err) = controller.set_config(&req).err()
{ {
if let Some(err) = controller.set_config(&req).err() {
error!("Wifi controller failed to set a new config: {:?}", err) error!("Wifi controller failed to set a new config: {:?}", err)
} }
} }
}
} }
#[embassy_executor::task] #[embassy_executor::task]