diff --git a/fan-controller/src/fan.rs b/fan-controller/src/fan.rs index 374928f..e555de0 100644 --- a/fan-controller/src/fan.rs +++ b/fan-controller/src/fan.rs @@ -8,8 +8,7 @@ use embassy_rp::dma::Channel; use embassy_rp::gpio::{Level, Output, Pin}; use embassy_rp::interrupt::typelevel::Binding; use embassy_rp::uart::{ - BufferedInterruptHandler, BufferedUart, DataBits, Parity, RxPin, - StopBits, TxPin, + BufferedInterruptHandler, BufferedUart, DataBits, Parity, RxPin, StopBits, TxPin, }; use embassy_rp::{uart, Peripheral}; use embassy_time::{block_for, with_timeout, Duration, TimeoutError, Timer}; diff --git a/fan-controller/src/main.rs b/fan-controller/src/main.rs index 9f5045a..c2ce4b2 100644 --- a/fan-controller/src/main.rs +++ b/fan-controller/src/main.rs @@ -21,8 +21,7 @@ use embassy_net::{tcp, Config, IpEndpoint, Ipv4Address, Stack, StackResources}; use embassy_rp::clocks::RoscRng; use embassy_rp::gpio::{Input, Level, Output, Pull}; use embassy_rp::peripherals::{ - DMA_CH0, PIN_18, PIN_20, PIN_21, PIN_23, PIN_25, PIN_4, - PIO0, UART0, + DMA_CH0, PIN_18, PIN_20, PIN_21, PIN_23, PIN_25, PIN_4, PIO0, UART0, }; use embassy_rp::pio::{InterruptHandler as PioInterruptHandler, Pio, PioPin}; use embassy_rp::uart::BufferedInterruptHandler; @@ -48,13 +47,13 @@ use {defmt_rtt as _, panic_probe as _}; use self::mqtt::packet; use crate::mqtt::non_zero_u16; use crate::mqtt::packet::connect::Connect; +use crate::mqtt::packet::get_parts; use crate::mqtt::packet::ping_request::PingRequest; use crate::mqtt::packet::ping_response::PingResponse; use crate::mqtt::packet::publish::Publish; use crate::mqtt::packet::subscribe::{Subscribe, Subscription}; use crate::mqtt::packet::subscribe_acknowledgement::SubscribeAcknowledgement; use crate::mqtt::packet::{connect, publish, subscribe}; -use crate::mqtt::packet::get_parts; use crate::mqtt::task::send; use crate::mqtt::QualityOfService; diff --git a/fan-controller/src/mqtt/mod.rs b/fan-controller/src/mqtt/mod.rs index dda7b7e..691625b 100644 --- a/fan-controller/src/mqtt/mod.rs +++ b/fan-controller/src/mqtt/mod.rs @@ -1,7 +1,6 @@ //! Module containing all the MQTT things to enable the fan controller to be integrated with Home //! Assistant - use defmt::Format; use crate::mqtt::variable_byte_integer::DecodeError; diff --git a/fan-controller/src/mqtt/packet/connect.rs b/fan-controller/src/mqtt/packet/connect.rs index 5ebd842..d049f4b 100644 --- a/fan-controller/src/mqtt/packet/connect.rs +++ b/fan-controller/src/mqtt/packet/connect.rs @@ -1,6 +1,6 @@ +use crate::encoding::TryEncode; use crate::mqtt::variable_byte_integer; use crate::mqtt::variable_byte_integer::VariableByteIntegerEncodeError; -use crate::encoding::TryEncode; use defmt::Format; pub(crate) struct Connect<'a> { diff --git a/fan-controller/src/mqtt/packet/connect_acknowledgement.rs b/fan-controller/src/mqtt/packet/connect_acknowledgement.rs index b1d1747..643ee2c 100644 --- a/fan-controller/src/mqtt/packet/connect_acknowledgement.rs +++ b/fan-controller/src/mqtt/packet/connect_acknowledgement.rs @@ -1,6 +1,4 @@ -use crate::mqtt::{ - variable_byte_integer, ConnectErrorReasonCode, UnknownConnectErrorReasonCode, -}; +use crate::mqtt::{variable_byte_integer, ConnectErrorReasonCode, UnknownConnectErrorReasonCode}; use crate::TryDecode; use defmt::{info, Format}; @@ -114,11 +112,12 @@ impl TryDecode<'_> for ConnectAcknowledgement { 0x26 => { info!("Skipping User Property"); // What is the length of a UTF-8 string pair? - let length_1 = variable_byte_integer::decode(buffer, &mut offset) - .map_err(|error| DecodeError::InvalidPropertyStringLength { + let length_1 = variable_byte_integer::decode(buffer, &mut offset).map_err( + |error| DecodeError::InvalidPropertyStringLength { property_identifier: 0x26, error, - })?; + }, + )?; // This is a bit weird as this is the only match branch that advances the offset offset += length_1; diff --git a/fan-controller/src/mqtt/packet/ping_response.rs b/fan-controller/src/mqtt/packet/ping_response.rs index 9512a45..ba305c8 100644 --- a/fan-controller/src/mqtt/packet/ping_response.rs +++ b/fan-controller/src/mqtt/packet/ping_response.rs @@ -1,4 +1,3 @@ - use crate::encoding::Decode; pub(crate) struct PingResponse;