Compare commits
	
		
			17 Commits
		
	
	
		
			boot-nrf-s
			...
			noproto-cr
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | d6fda686bc | ||
|  | 76c600365d | ||
|  | 18dac099cb | ||
|  | 49005e955d | ||
|  | 70ea805af3 | ||
|  | 93bb34d8d1 | ||
|  | 51a67cb69a | ||
|  | b8777eaea2 | ||
|  | b0583b17cb | ||
|  | 246c49621c | ||
|  | c3b827d8cd | ||
|  | 4dfae9328e | ||
|  | 73f8cd7ade | ||
|  | 4a2dd7b944 | ||
|  | afb01e3fc5 | ||
|  | 89cfdcb9f5 | ||
|  | abea4dde3d | 
| @@ -6,8 +6,7 @@ keywords = ["embedded", "ADIN1110", "embassy-net", "embedded-hal-async", "ethern | |||||||
| categories = ["embedded", "hardware-support", "no-std", "network-programming", "async"] | categories = ["embedded", "hardware-support", "no-std", "network-programming", "async"] | ||||||
| license = "MIT OR Apache-2.0" | license = "MIT OR Apache-2.0" | ||||||
| edition = "2021" | edition = "2021" | ||||||
|  | repository = "https://github.com/embassy-rs/embassy" | ||||||
| # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html |  | ||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| heapless = "0.8" | heapless = "0.8" | ||||||
|   | |||||||
| @@ -1,3 +1,4 @@ | |||||||
|  | /// CRC32 lookup table. | ||||||
| pub const CRC32R_LOOKUP_TABLE: [u32; 256] = [ | pub const CRC32R_LOOKUP_TABLE: [u32; 256] = [ | ||||||
|     0x0000_0000, |     0x0000_0000, | ||||||
|     0x7707_3096, |     0x7707_3096, | ||||||
| @@ -263,8 +264,9 @@ pub const CRC32R_LOOKUP_TABLE: [u32; 256] = [ | |||||||
| pub struct ETH_FCS(pub u32); | pub struct ETH_FCS(pub u32); | ||||||
|  |  | ||||||
| impl ETH_FCS { | impl ETH_FCS { | ||||||
|     pub const CRC32_OK: u32 = 0x2144_df1c; |     const CRC32_OK: u32 = 0x2144_df1c; | ||||||
|  |  | ||||||
|  |     /// Create a new frame check sequence from `data`. | ||||||
|     #[must_use] |     #[must_use] | ||||||
|     pub fn new(data: &[u8]) -> Self { |     pub fn new(data: &[u8]) -> Self { | ||||||
|         let fcs = data.iter().fold(u32::MAX, |crc, byte| { |         let fcs = data.iter().fold(u32::MAX, |crc, byte| { | ||||||
| @@ -274,6 +276,7 @@ impl ETH_FCS { | |||||||
|         Self(fcs) |         Self(fcs) | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  |     /// Update the frame check sequence with `data`. | ||||||
|     #[must_use] |     #[must_use] | ||||||
|     pub fn update(self, data: &[u8]) -> Self { |     pub fn update(self, data: &[u8]) -> Self { | ||||||
|         let fcs = data.iter().fold(self.0 ^ u32::MAX, |crc, byte| { |         let fcs = data.iter().fold(self.0 ^ u32::MAX, |crc, byte| { | ||||||
| @@ -283,16 +286,19 @@ impl ETH_FCS { | |||||||
|         Self(fcs) |         Self(fcs) | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  |     /// Check if the frame check sequence is correct. | ||||||
|     #[must_use] |     #[must_use] | ||||||
|     pub fn crc_ok(&self) -> bool { |     pub fn crc_ok(&self) -> bool { | ||||||
|         self.0 == Self::CRC32_OK |         self.0 == Self::CRC32_OK | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  |     /// Switch byte order. | ||||||
|     #[must_use] |     #[must_use] | ||||||
|     pub fn hton_bytes(&self) -> [u8; 4] { |     pub fn hton_bytes(&self) -> [u8; 4] { | ||||||
|         self.0.to_le_bytes() |         self.0.to_le_bytes() | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  |     /// Switch byte order as a u32. | ||||||
|     #[must_use] |     #[must_use] | ||||||
|     pub fn hton(&self) -> u32 { |     pub fn hton(&self) -> u32 { | ||||||
|         self.0.to_le() |         self.0.to_le() | ||||||
|   | |||||||
| @@ -5,6 +5,7 @@ | |||||||
| #![allow(clippy::missing_errors_doc)] | #![allow(clippy::missing_errors_doc)] | ||||||
| #![allow(clippy::missing_panics_doc)] | #![allow(clippy::missing_panics_doc)] | ||||||
| #![doc = include_str!("../README.md")] | #![doc = include_str!("../README.md")] | ||||||
|  | #![warn(missing_docs)] | ||||||
|  |  | ||||||
| // must go first! | // must go first! | ||||||
| mod fmt; | mod fmt; | ||||||
| @@ -26,8 +27,9 @@ use embedded_hal_async::digital::Wait; | |||||||
| use embedded_hal_async::spi::{Error, Operation, SpiDevice}; | use embedded_hal_async::spi::{Error, Operation, SpiDevice}; | ||||||
| use heapless::Vec; | use heapless::Vec; | ||||||
| pub use mdio::MdioBus; | pub use mdio::MdioBus; | ||||||
| pub use phy::{Phy10BaseT1x, RegsC22, RegsC45}; | pub use phy::Phy10BaseT1x; | ||||||
| pub use regs::{Config0, Config2, SpiRegisters as sr, Status0, Status1}; | use phy::{RegsC22, RegsC45}; | ||||||
|  | use regs::{Config0, Config2, SpiRegisters as sr, Status0, Status1}; | ||||||
|  |  | ||||||
| use crate::fmt::Bytes; | use crate::fmt::Bytes; | ||||||
| use crate::regs::{LedCntrl, LedFunc, LedPol, LedPolarity, SpiHeader}; | use crate::regs::{LedCntrl, LedFunc, LedPol, LedPolarity, SpiHeader}; | ||||||
| @@ -446,6 +448,7 @@ pub struct Runner<'d, SPI, INT, RST> { | |||||||
| } | } | ||||||
|  |  | ||||||
| impl<'d, SPI: SpiDevice, INT: Wait, RST: OutputPin> Runner<'d, SPI, INT, RST> { | impl<'d, SPI: SpiDevice, INT: Wait, RST: OutputPin> Runner<'d, SPI, INT, RST> { | ||||||
|  |     /// Run the driver. | ||||||
|     #[allow(clippy::too_many_lines)] |     #[allow(clippy::too_many_lines)] | ||||||
|     pub async fn run(mut self) -> ! { |     pub async fn run(mut self) -> ! { | ||||||
|         loop { |         loop { | ||||||
|   | |||||||
| @@ -39,6 +39,7 @@ enum Reg13Op { | |||||||
| /// | /// | ||||||
| /// Clause 45 methodes are bases on <https://www.ieee802.org/3/efm/public/nov02/oam/pannell_oam_1_1102.pdf> | /// Clause 45 methodes are bases on <https://www.ieee802.org/3/efm/public/nov02/oam/pannell_oam_1_1102.pdf> | ||||||
| pub trait MdioBus { | pub trait MdioBus { | ||||||
|  |     /// Error type. | ||||||
|     type Error; |     type Error; | ||||||
|  |  | ||||||
|     /// Read, Clause 22 |     /// Read, Clause 22 | ||||||
|   | |||||||
| @@ -2,6 +2,7 @@ use core::fmt::{Debug, Display}; | |||||||
|  |  | ||||||
| use bitfield::{bitfield, bitfield_bitrange, bitfield_fields}; | use bitfield::{bitfield, bitfield_bitrange, bitfield_fields}; | ||||||
|  |  | ||||||
|  | #[allow(missing_docs)] | ||||||
| #[allow(non_camel_case_types)] | #[allow(non_camel_case_types)] | ||||||
| #[derive(Debug, Copy, Clone)] | #[derive(Debug, Copy, Clone)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
|   | |||||||
| @@ -2,6 +2,10 @@ | |||||||
| name = "embassy-net-esp-hosted" | name = "embassy-net-esp-hosted" | ||||||
| version = "0.1.0" | version = "0.1.0" | ||||||
| edition = "2021" | edition = "2021" | ||||||
|  | description = "embassy-net driver for ESP-Hosted" | ||||||
|  | keywords = ["embedded", "esp-hosted", "embassy-net", "embedded-hal-async", "wifi", "async"] | ||||||
|  | categories = ["embedded", "hardware-support", "no-std", "network-programming", "async"] | ||||||
|  | license = "MIT OR Apache-2.0" | ||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| defmt = { version = "0.3", optional = true } | defmt = { version = "0.3", optional = true } | ||||||
| @@ -15,8 +19,7 @@ embassy-net-driver-channel = { version = "0.2.0", path = "../embassy-net-driver- | |||||||
| embedded-hal = { version = "1.0.0-rc.3" } | embedded-hal = { version = "1.0.0-rc.3" } | ||||||
| embedded-hal-async = { version = "=1.0.0-rc.3" } | embedded-hal-async = { version = "=1.0.0-rc.3" } | ||||||
|  |  | ||||||
| noproto = { git="https://github.com/embassy-rs/noproto", rev = "f5e6d1f325b6ad4e344f60452b09576e24671f62", default-features = false, features = ["derive"] } | noproto = "0.1.0" | ||||||
| #noproto = { version = "0.1", path = "/home/dirbaio/noproto", default-features = false, features = ["derive"] } |  | ||||||
| heapless = "0.8" | heapless = "0.8" | ||||||
|  |  | ||||||
| [package.metadata.embassy_docs] | [package.metadata.embassy_docs] | ||||||
|   | |||||||
							
								
								
									
										27
									
								
								embassy-net-esp-hosted/README.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										27
									
								
								embassy-net-esp-hosted/README.md
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,27 @@ | |||||||
|  | # ESP-Hosted `embassy-net` integration | ||||||
|  |  | ||||||
|  | [`embassy-net`](https://crates.io/crates/embassy-net) integration for Espressif SoCs running the the ESP-Hosted stack. | ||||||
|  |  | ||||||
|  | See [`examples`](https://github.com/embassy-rs/embassy/tree/main/examples/nrf52840) directory for usage examples with the nRF52840. | ||||||
|  |  | ||||||
|  | ## Supported chips | ||||||
|  |  | ||||||
|  | - W5500 | ||||||
|  | - W5100S | ||||||
|  |  | ||||||
|  | ## Interoperability | ||||||
|  |  | ||||||
|  | This crate can run on any executor. | ||||||
|  |  | ||||||
|  | It supports any SPI driver implementing [`embedded-hal-async`](https://crates.io/crates/embedded-hal-async). | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## License | ||||||
|  |  | ||||||
|  | This work is licensed under either of | ||||||
|  |  | ||||||
|  | - Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or | ||||||
|  |   http://www.apache.org/licenses/LICENSE-2.0) | ||||||
|  | - MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) | ||||||
|  |  | ||||||
|  | at your option. | ||||||
| @@ -5,38 +5,54 @@ use heapless::String; | |||||||
| use crate::ioctl::Shared; | use crate::ioctl::Shared; | ||||||
| use crate::proto::{self, CtrlMsg}; | use crate::proto::{self, CtrlMsg}; | ||||||
|  |  | ||||||
|  | /// Errors reported by control. | ||||||
| #[derive(Copy, Clone, PartialEq, Eq, Debug)] | #[derive(Copy, Clone, PartialEq, Eq, Debug)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub enum Error { | pub enum Error { | ||||||
|  |     /// The operation failed with the given error code. | ||||||
|     Failed(u32), |     Failed(u32), | ||||||
|  |     /// The operation timed out. | ||||||
|     Timeout, |     Timeout, | ||||||
|  |     /// Internal error. | ||||||
|     Internal, |     Internal, | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /// Handle for managing the network and WiFI state. | ||||||
| pub struct Control<'a> { | pub struct Control<'a> { | ||||||
|     state_ch: ch::StateRunner<'a>, |     state_ch: ch::StateRunner<'a>, | ||||||
|     shared: &'a Shared, |     shared: &'a Shared, | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /// WiFi mode. | ||||||
| #[allow(unused)] | #[allow(unused)] | ||||||
| #[derive(Copy, Clone, PartialEq, Eq, Debug)] | #[derive(Copy, Clone, PartialEq, Eq, Debug)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| enum WifiMode { | enum WifiMode { | ||||||
|  |     /// No mode. | ||||||
|     None = 0, |     None = 0, | ||||||
|  |     /// Client station. | ||||||
|     Sta = 1, |     Sta = 1, | ||||||
|  |     /// Access point mode. | ||||||
|     Ap = 2, |     Ap = 2, | ||||||
|  |     /// Repeater mode. | ||||||
|     ApSta = 3, |     ApSta = 3, | ||||||
| } | } | ||||||
|  |  | ||||||
| pub use proto::CtrlWifiSecProt as Security; | pub use proto::CtrlWifiSecProt as Security; | ||||||
|  |  | ||||||
|  | /// WiFi status. | ||||||
| #[derive(Clone, Debug)] | #[derive(Clone, Debug)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct Status { | pub struct Status { | ||||||
|  |     /// Service Set Identifier. | ||||||
|     pub ssid: String<32>, |     pub ssid: String<32>, | ||||||
|  |     /// Basic Service Set Identifier. | ||||||
|     pub bssid: [u8; 6], |     pub bssid: [u8; 6], | ||||||
|  |     /// Received Signal Strength Indicator. | ||||||
|     pub rssi: i32, |     pub rssi: i32, | ||||||
|  |     /// WiFi channel. | ||||||
|     pub channel: u32, |     pub channel: u32, | ||||||
|  |     /// Security mode. | ||||||
|     pub security: Security, |     pub security: Security, | ||||||
| } | } | ||||||
|  |  | ||||||
| @@ -65,6 +81,7 @@ impl<'a> Control<'a> { | |||||||
|         Self { state_ch, shared } |         Self { state_ch, shared } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  |     /// Initialize device. | ||||||
|     pub async fn init(&mut self) -> Result<(), Error> { |     pub async fn init(&mut self) -> Result<(), Error> { | ||||||
|         debug!("wait for init event..."); |         debug!("wait for init event..."); | ||||||
|         self.shared.init_wait().await; |         self.shared.init_wait().await; | ||||||
| @@ -82,6 +99,7 @@ impl<'a> Control<'a> { | |||||||
|         Ok(()) |         Ok(()) | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  |     /// Get the current status. | ||||||
|     pub async fn get_status(&mut self) -> Result<Status, Error> { |     pub async fn get_status(&mut self) -> Result<Status, Error> { | ||||||
|         let req = proto::CtrlMsgReqGetApConfig {}; |         let req = proto::CtrlMsgReqGetApConfig {}; | ||||||
|         ioctl!(self, ReqGetApConfig, RespGetApConfig, req, resp); |         ioctl!(self, ReqGetApConfig, RespGetApConfig, req, resp); | ||||||
| @@ -95,6 +113,7 @@ impl<'a> Control<'a> { | |||||||
|         }) |         }) | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  |     /// Connect to the network identified by ssid using the provided password. | ||||||
|     pub async fn connect(&mut self, ssid: &str, password: &str) -> Result<(), Error> { |     pub async fn connect(&mut self, ssid: &str, password: &str) -> Result<(), Error> { | ||||||
|         let req = proto::CtrlMsgReqConnectAp { |         let req = proto::CtrlMsgReqConnectAp { | ||||||
|             ssid: unwrap!(String::try_from(ssid)), |             ssid: unwrap!(String::try_from(ssid)), | ||||||
| @@ -108,6 +127,7 @@ impl<'a> Control<'a> { | |||||||
|         Ok(()) |         Ok(()) | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  |     /// Disconnect from any currently connected network. | ||||||
|     pub async fn disconnect(&mut self) -> Result<(), Error> { |     pub async fn disconnect(&mut self) -> Result<(), Error> { | ||||||
|         let req = proto::CtrlMsgReqGetStatus {}; |         let req = proto::CtrlMsgReqGetStatus {}; | ||||||
|         ioctl!(self, ReqDisconnectAp, RespDisconnectAp, req, resp); |         ioctl!(self, ReqDisconnectAp, RespDisconnectAp, req, resp); | ||||||
|   | |||||||
| @@ -1,4 +1,6 @@ | |||||||
| #![no_std] | #![no_std] | ||||||
|  | #![doc = include_str!("../README.md")] | ||||||
|  | #![warn(missing_docs)] | ||||||
|  |  | ||||||
| use embassy_futures::select::{select4, Either4}; | use embassy_futures::select::{select4, Either4}; | ||||||
| use embassy_net_driver_channel as ch; | use embassy_net_driver_channel as ch; | ||||||
| @@ -97,12 +99,14 @@ enum InterfaceType { | |||||||
| const MAX_SPI_BUFFER_SIZE: usize = 1600; | const MAX_SPI_BUFFER_SIZE: usize = 1600; | ||||||
| const HEARTBEAT_MAX_GAP: Duration = Duration::from_secs(20); | const HEARTBEAT_MAX_GAP: Duration = Duration::from_secs(20); | ||||||
|  |  | ||||||
|  | /// State for the esp-hosted driver. | ||||||
| pub struct State { | pub struct State { | ||||||
|     shared: Shared, |     shared: Shared, | ||||||
|     ch: ch::State<MTU, 4, 4>, |     ch: ch::State<MTU, 4, 4>, | ||||||
| } | } | ||||||
|  |  | ||||||
| impl State { | impl State { | ||||||
|  |     /// Create a new state. | ||||||
|     pub fn new() -> Self { |     pub fn new() -> Self { | ||||||
|         Self { |         Self { | ||||||
|             shared: Shared::new(), |             shared: Shared::new(), | ||||||
| @@ -111,8 +115,13 @@ impl State { | |||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /// Type alias for network driver. | ||||||
| pub type NetDriver<'a> = ch::Device<'a, MTU>; | pub type NetDriver<'a> = ch::Device<'a, MTU>; | ||||||
|  |  | ||||||
|  | /// Create a new esp-hosted driver using the provided state, SPI peripheral and pins. | ||||||
|  | /// | ||||||
|  | /// Returns a device handle for interfacing with embassy-net, a control handle for | ||||||
|  | /// interacting with the driver, and a runner for communicating with the WiFi device. | ||||||
| pub async fn new<'a, SPI, IN, OUT>( | pub async fn new<'a, SPI, IN, OUT>( | ||||||
|     state: &'a mut State, |     state: &'a mut State, | ||||||
|     spi: SPI, |     spi: SPI, | ||||||
| @@ -144,6 +153,7 @@ where | |||||||
|     (device, Control::new(state_ch, &state.shared), runner) |     (device, Control::new(state_ch, &state.shared), runner) | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /// Runner for communicating with the WiFi device. | ||||||
| pub struct Runner<'a, SPI, IN, OUT> { | pub struct Runner<'a, SPI, IN, OUT> { | ||||||
|     ch: ch::Runner<'a, MTU>, |     ch: ch::Runner<'a, MTU>, | ||||||
|     state_ch: ch::StateRunner<'a>, |     state_ch: ch::StateRunner<'a>, | ||||||
| @@ -166,6 +176,7 @@ where | |||||||
| { | { | ||||||
|     async fn init(&mut self) {} |     async fn init(&mut self) {} | ||||||
|  |  | ||||||
|  |     /// Run the packet processing. | ||||||
|     pub async fn run(mut self) -> ! { |     pub async fn run(mut self) -> ! { | ||||||
|         debug!("resetting..."); |         debug!("resetting..."); | ||||||
|         self.reset.set_low().unwrap(); |         self.reset.set_low().unwrap(); | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ use heapless::{String, Vec}; | |||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct ScanResult { | pub(crate) struct ScanResult { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub ssid: String<32>, |     pub ssid: String<32>, | ||||||
|     #[noproto(tag = "2")] |     #[noproto(tag = "2")] | ||||||
| @@ -19,7 +19,7 @@ pub struct ScanResult { | |||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct ConnectedStaList { | pub(crate) struct ConnectedStaList { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub mac: String<32>, |     pub mac: String<32>, | ||||||
|     #[noproto(tag = "2")] |     #[noproto(tag = "2")] | ||||||
| @@ -29,14 +29,14 @@ pub struct ConnectedStaList { | |||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgReqGetMacAddress { | pub(crate) struct CtrlMsgReqGetMacAddress { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub mode: u32, |     pub mode: u32, | ||||||
| } | } | ||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgRespGetMacAddress { | pub(crate) struct CtrlMsgRespGetMacAddress { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub mac: String<32>, |     pub mac: String<32>, | ||||||
|     #[noproto(tag = "2")] |     #[noproto(tag = "2")] | ||||||
| @@ -45,11 +45,11 @@ pub struct CtrlMsgRespGetMacAddress { | |||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgReqGetMode {} | pub(crate) struct CtrlMsgReqGetMode {} | ||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgRespGetMode { | pub(crate) struct CtrlMsgRespGetMode { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub mode: u32, |     pub mode: u32, | ||||||
|     #[noproto(tag = "2")] |     #[noproto(tag = "2")] | ||||||
| @@ -58,32 +58,32 @@ pub struct CtrlMsgRespGetMode { | |||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgReqSetMode { | pub(crate) struct CtrlMsgReqSetMode { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub mode: u32, |     pub mode: u32, | ||||||
| } | } | ||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgRespSetMode { | pub(crate) struct CtrlMsgRespSetMode { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub resp: u32, |     pub resp: u32, | ||||||
| } | } | ||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgReqGetStatus {} | pub(crate) struct CtrlMsgReqGetStatus {} | ||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgRespGetStatus { | pub(crate) struct CtrlMsgRespGetStatus { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub resp: u32, |     pub resp: u32, | ||||||
| } | } | ||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgReqSetMacAddress { | pub(crate) struct CtrlMsgReqSetMacAddress { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub mac: String<32>, |     pub mac: String<32>, | ||||||
|     #[noproto(tag = "2")] |     #[noproto(tag = "2")] | ||||||
| @@ -92,18 +92,18 @@ pub struct CtrlMsgReqSetMacAddress { | |||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgRespSetMacAddress { | pub(crate) struct CtrlMsgRespSetMacAddress { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub resp: u32, |     pub resp: u32, | ||||||
| } | } | ||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgReqGetApConfig {} | pub(crate) struct CtrlMsgReqGetApConfig {} | ||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgRespGetApConfig { | pub(crate) struct CtrlMsgRespGetApConfig { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub ssid: String<32>, |     pub ssid: String<32>, | ||||||
|     #[noproto(tag = "2")] |     #[noproto(tag = "2")] | ||||||
| @@ -120,7 +120,7 @@ pub struct CtrlMsgRespGetApConfig { | |||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgReqConnectAp { | pub(crate) struct CtrlMsgReqConnectAp { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub ssid: String<32>, |     pub ssid: String<32>, | ||||||
|     #[noproto(tag = "2")] |     #[noproto(tag = "2")] | ||||||
| @@ -135,7 +135,7 @@ pub struct CtrlMsgReqConnectAp { | |||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgRespConnectAp { | pub(crate) struct CtrlMsgRespConnectAp { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub resp: u32, |     pub resp: u32, | ||||||
|     #[noproto(tag = "2")] |     #[noproto(tag = "2")] | ||||||
| @@ -144,11 +144,11 @@ pub struct CtrlMsgRespConnectAp { | |||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgReqGetSoftApConfig {} | pub(crate) struct CtrlMsgReqGetSoftApConfig {} | ||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgRespGetSoftApConfig { | pub(crate) struct CtrlMsgRespGetSoftApConfig { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub ssid: String<32>, |     pub ssid: String<32>, | ||||||
|     #[noproto(tag = "2")] |     #[noproto(tag = "2")] | ||||||
| @@ -169,7 +169,7 @@ pub struct CtrlMsgRespGetSoftApConfig { | |||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgReqStartSoftAp { | pub(crate) struct CtrlMsgReqStartSoftAp { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub ssid: String<32>, |     pub ssid: String<32>, | ||||||
|     #[noproto(tag = "2")] |     #[noproto(tag = "2")] | ||||||
| @@ -188,7 +188,7 @@ pub struct CtrlMsgReqStartSoftAp { | |||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgRespStartSoftAp { | pub(crate) struct CtrlMsgRespStartSoftAp { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub resp: u32, |     pub resp: u32, | ||||||
|     #[noproto(tag = "2")] |     #[noproto(tag = "2")] | ||||||
| @@ -197,11 +197,11 @@ pub struct CtrlMsgRespStartSoftAp { | |||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgReqScanResult {} | pub(crate) struct CtrlMsgReqScanResult {} | ||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgRespScanResult { | pub(crate) struct CtrlMsgRespScanResult { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub count: u32, |     pub count: u32, | ||||||
|     #[noproto(repeated, tag = "2")] |     #[noproto(repeated, tag = "2")] | ||||||
| @@ -212,11 +212,11 @@ pub struct CtrlMsgRespScanResult { | |||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgReqSoftApConnectedSta {} | pub(crate) struct CtrlMsgReqSoftApConnectedSta {} | ||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgRespSoftApConnectedSta { | pub(crate) struct CtrlMsgRespSoftApConnectedSta { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub num: u32, |     pub num: u32, | ||||||
|     #[noproto(repeated, tag = "2")] |     #[noproto(repeated, tag = "2")] | ||||||
| @@ -227,43 +227,43 @@ pub struct CtrlMsgRespSoftApConnectedSta { | |||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgReqOtaBegin {} | pub(crate) struct CtrlMsgReqOtaBegin {} | ||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgRespOtaBegin { | pub(crate) struct CtrlMsgRespOtaBegin { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub resp: u32, |     pub resp: u32, | ||||||
| } | } | ||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgReqOtaWrite { | pub(crate) struct CtrlMsgReqOtaWrite { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub ota_data: Vec<u8, 1024>, |     pub ota_data: Vec<u8, 1024>, | ||||||
| } | } | ||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgRespOtaWrite { | pub(crate) struct CtrlMsgRespOtaWrite { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub resp: u32, |     pub resp: u32, | ||||||
| } | } | ||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgReqOtaEnd {} | pub(crate) struct CtrlMsgReqOtaEnd {} | ||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgRespOtaEnd { | pub(crate) struct CtrlMsgRespOtaEnd { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub resp: u32, |     pub resp: u32, | ||||||
| } | } | ||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgReqVendorIeData { | pub(crate) struct CtrlMsgReqVendorIeData { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub element_id: u32, |     pub element_id: u32, | ||||||
|     #[noproto(tag = "2")] |     #[noproto(tag = "2")] | ||||||
| @@ -278,7 +278,7 @@ pub struct CtrlMsgReqVendorIeData { | |||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgReqSetSoftApVendorSpecificIe { | pub(crate) struct CtrlMsgReqSetSoftApVendorSpecificIe { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub enable: bool, |     pub enable: bool, | ||||||
|     #[noproto(tag = "2")] |     #[noproto(tag = "2")] | ||||||
| @@ -291,32 +291,32 @@ pub struct CtrlMsgReqSetSoftApVendorSpecificIe { | |||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgRespSetSoftApVendorSpecificIe { | pub(crate) struct CtrlMsgRespSetSoftApVendorSpecificIe { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub resp: u32, |     pub resp: u32, | ||||||
| } | } | ||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgReqSetWifiMaxTxPower { | pub(crate) struct CtrlMsgReqSetWifiMaxTxPower { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub wifi_max_tx_power: u32, |     pub wifi_max_tx_power: u32, | ||||||
| } | } | ||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgRespSetWifiMaxTxPower { | pub(crate) struct CtrlMsgRespSetWifiMaxTxPower { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub resp: u32, |     pub resp: u32, | ||||||
| } | } | ||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgReqGetWifiCurrTxPower {} | pub(crate) struct CtrlMsgReqGetWifiCurrTxPower {} | ||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgRespGetWifiCurrTxPower { | pub(crate) struct CtrlMsgRespGetWifiCurrTxPower { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub wifi_curr_tx_power: u32, |     pub wifi_curr_tx_power: u32, | ||||||
|     #[noproto(tag = "2")] |     #[noproto(tag = "2")] | ||||||
| @@ -325,7 +325,7 @@ pub struct CtrlMsgRespGetWifiCurrTxPower { | |||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgReqConfigHeartbeat { | pub(crate) struct CtrlMsgReqConfigHeartbeat { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub enable: bool, |     pub enable: bool, | ||||||
|     #[noproto(tag = "2")] |     #[noproto(tag = "2")] | ||||||
| @@ -334,7 +334,7 @@ pub struct CtrlMsgReqConfigHeartbeat { | |||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgRespConfigHeartbeat { | pub(crate) struct CtrlMsgRespConfigHeartbeat { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub resp: u32, |     pub resp: u32, | ||||||
| } | } | ||||||
| @@ -342,28 +342,28 @@ pub struct CtrlMsgRespConfigHeartbeat { | |||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgEventEspInit { | pub(crate) struct CtrlMsgEventEspInit { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub init_data: Vec<u8, 64>, |     pub init_data: Vec<u8, 64>, | ||||||
| } | } | ||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgEventHeartbeat { | pub(crate) struct CtrlMsgEventHeartbeat { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub hb_num: u32, |     pub hb_num: u32, | ||||||
| } | } | ||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgEventStationDisconnectFromAp { | pub(crate) struct CtrlMsgEventStationDisconnectFromAp { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub resp: u32, |     pub resp: u32, | ||||||
| } | } | ||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsgEventStationDisconnectFromEspSoftAp { | pub(crate) struct CtrlMsgEventStationDisconnectFromEspSoftAp { | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub resp: u32, |     pub resp: u32, | ||||||
|     #[noproto(tag = "2")] |     #[noproto(tag = "2")] | ||||||
| @@ -372,7 +372,7 @@ pub struct CtrlMsgEventStationDisconnectFromEspSoftAp { | |||||||
|  |  | ||||||
| #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | #[derive(Debug, Default, Clone, Eq, PartialEq, noproto::Message)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub struct CtrlMsg { | pub(crate) struct CtrlMsg { | ||||||
|     /// msg_type could be req, resp or Event |     /// msg_type could be req, resp or Event | ||||||
|     #[noproto(tag = "1")] |     #[noproto(tag = "1")] | ||||||
|     pub msg_type: CtrlMsgType, |     pub msg_type: CtrlMsgType, | ||||||
| @@ -390,7 +390,7 @@ pub struct CtrlMsg { | |||||||
| /// union of all msg ids | /// union of all msg ids | ||||||
| #[derive(Debug, Clone, Eq, PartialEq, noproto::Oneof)] | #[derive(Debug, Clone, Eq, PartialEq, noproto::Oneof)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub enum CtrlMsgPayload { | pub(crate) enum CtrlMsgPayload { | ||||||
|     /// * Requests * |     /// * Requests * | ||||||
|     #[noproto(tag = "101")] |     #[noproto(tag = "101")] | ||||||
|     ReqGetMacAddress(CtrlMsgReqGetMacAddress), |     ReqGetMacAddress(CtrlMsgReqGetMacAddress), | ||||||
| @@ -492,7 +492,7 @@ pub enum CtrlMsgPayload { | |||||||
| #[derive(Debug, Default, Clone, Copy, Eq, PartialEq, Hash, PartialOrd, Ord, noproto::Enumeration)] | #[derive(Debug, Default, Clone, Copy, Eq, PartialEq, Hash, PartialOrd, Ord, noproto::Enumeration)] | ||||||
| #[repr(u32)] | #[repr(u32)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub enum CtrlVendorIeType { | pub(crate) enum CtrlVendorIeType { | ||||||
|     #[default] |     #[default] | ||||||
|     Beacon = 0, |     Beacon = 0, | ||||||
|     ProbeReq = 1, |     ProbeReq = 1, | ||||||
| @@ -504,7 +504,7 @@ pub enum CtrlVendorIeType { | |||||||
| #[derive(Debug, Default, Clone, Copy, Eq, PartialEq, Hash, PartialOrd, Ord, noproto::Enumeration)] | #[derive(Debug, Default, Clone, Copy, Eq, PartialEq, Hash, PartialOrd, Ord, noproto::Enumeration)] | ||||||
| #[repr(u32)] | #[repr(u32)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub enum CtrlVendorIeid { | pub(crate) enum CtrlVendorIeid { | ||||||
|     #[default] |     #[default] | ||||||
|     Id0 = 0, |     Id0 = 0, | ||||||
|     Id1 = 1, |     Id1 = 1, | ||||||
| @@ -513,7 +513,7 @@ pub enum CtrlVendorIeid { | |||||||
| #[derive(Debug, Default, Clone, Copy, Eq, PartialEq, Hash, PartialOrd, Ord, noproto::Enumeration)] | #[derive(Debug, Default, Clone, Copy, Eq, PartialEq, Hash, PartialOrd, Ord, noproto::Enumeration)] | ||||||
| #[repr(u32)] | #[repr(u32)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub enum CtrlWifiMode { | pub(crate) enum CtrlWifiMode { | ||||||
|     #[default] |     #[default] | ||||||
|     None = 0, |     None = 0, | ||||||
|     Sta = 1, |     Sta = 1, | ||||||
| @@ -524,7 +524,7 @@ pub enum CtrlWifiMode { | |||||||
| #[derive(Debug, Default, Clone, Copy, Eq, PartialEq, Hash, PartialOrd, Ord, noproto::Enumeration)] | #[derive(Debug, Default, Clone, Copy, Eq, PartialEq, Hash, PartialOrd, Ord, noproto::Enumeration)] | ||||||
| #[repr(u32)] | #[repr(u32)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub enum CtrlWifiBw { | pub(crate) enum CtrlWifiBw { | ||||||
|     #[default] |     #[default] | ||||||
|     BwInvalid = 0, |     BwInvalid = 0, | ||||||
|     Ht20 = 1, |     Ht20 = 1, | ||||||
| @@ -534,13 +534,15 @@ pub enum CtrlWifiBw { | |||||||
| #[derive(Debug, Default, Clone, Copy, Eq, PartialEq, Hash, PartialOrd, Ord, noproto::Enumeration)] | #[derive(Debug, Default, Clone, Copy, Eq, PartialEq, Hash, PartialOrd, Ord, noproto::Enumeration)] | ||||||
| #[repr(u32)] | #[repr(u32)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub enum CtrlWifiPowerSave { | pub(crate) enum CtrlWifiPowerSave { | ||||||
|     #[default] |     #[default] | ||||||
|     PsInvalid = 0, |     PsInvalid = 0, | ||||||
|     MinModem = 1, |     MinModem = 1, | ||||||
|     MaxModem = 2, |     MaxModem = 2, | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /// Wifi Security Settings | ||||||
|  | #[allow(missing_docs)] | ||||||
| #[derive(Debug, Default, Clone, Copy, Eq, PartialEq, Hash, PartialOrd, Ord, noproto::Enumeration)] | #[derive(Debug, Default, Clone, Copy, Eq, PartialEq, Hash, PartialOrd, Ord, noproto::Enumeration)] | ||||||
| #[repr(u32)] | #[repr(u32)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| @@ -560,7 +562,7 @@ pub enum CtrlWifiSecProt { | |||||||
| #[derive(Debug, Default, Clone, Copy, Eq, PartialEq, Hash, PartialOrd, Ord, noproto::Enumeration)] | #[derive(Debug, Default, Clone, Copy, Eq, PartialEq, Hash, PartialOrd, Ord, noproto::Enumeration)] | ||||||
| #[repr(u32)] | #[repr(u32)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub enum CtrlStatus { | pub(crate) enum CtrlStatus { | ||||||
|     #[default] |     #[default] | ||||||
|     Connected = 0, |     Connected = 0, | ||||||
|     NotConnected = 1, |     NotConnected = 1, | ||||||
| @@ -573,7 +575,7 @@ pub enum CtrlStatus { | |||||||
| #[derive(Debug, Default, Clone, Copy, Eq, PartialEq, Hash, PartialOrd, Ord, noproto::Enumeration)] | #[derive(Debug, Default, Clone, Copy, Eq, PartialEq, Hash, PartialOrd, Ord, noproto::Enumeration)] | ||||||
| #[repr(u32)] | #[repr(u32)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub enum CtrlMsgType { | pub(crate) enum CtrlMsgType { | ||||||
|     #[default] |     #[default] | ||||||
|     MsgTypeInvalid = 0, |     MsgTypeInvalid = 0, | ||||||
|     Req = 1, |     Req = 1, | ||||||
| @@ -585,7 +587,7 @@ pub enum CtrlMsgType { | |||||||
| #[derive(Debug, Default, Clone, Copy, Eq, PartialEq, Hash, PartialOrd, Ord, noproto::Enumeration)] | #[derive(Debug, Default, Clone, Copy, Eq, PartialEq, Hash, PartialOrd, Ord, noproto::Enumeration)] | ||||||
| #[repr(u32)] | #[repr(u32)] | ||||||
| #[cfg_attr(feature = "defmt", derive(defmt::Format))] | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||||||
| pub enum CtrlMsgId { | pub(crate) enum CtrlMsgId { | ||||||
|     #[default] |     #[default] | ||||||
|     MsgIdInvalid = 0, |     MsgIdInvalid = 0, | ||||||
|     /// * Request Msgs * |     /// * Request Msgs * | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ keywords = ["embedded", "tuntap", "embassy-net", "embedded-hal-async", "ethernet | |||||||
| categories = ["embedded", "hardware-support", "no-std", "network-programming", "async"] | categories = ["embedded", "hardware-support", "no-std", "network-programming", "async"] | ||||||
| license = "MIT OR Apache-2.0" | license = "MIT OR Apache-2.0" | ||||||
| edition = "2021" | edition = "2021" | ||||||
|  | repository = "https://github.com/embassy-rs/embassy" | ||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embassy-net-driver = { version = "0.2.0", path = "../embassy-net-driver" } | embassy-net-driver = { version = "0.2.0", path = "../embassy-net-driver" } | ||||||
|   | |||||||
| @@ -1,3 +1,5 @@ | |||||||
|  | #![warn(missing_docs)] | ||||||
|  | #![doc = include_str!("../README.md")] | ||||||
| use std::io; | use std::io; | ||||||
| use std::io::{Read, Write}; | use std::io::{Read, Write}; | ||||||
| use std::os::unix::io::{AsRawFd, RawFd}; | use std::os::unix::io::{AsRawFd, RawFd}; | ||||||
| @@ -7,12 +9,19 @@ use async_io::Async; | |||||||
| use embassy_net_driver::{self, Capabilities, Driver, HardwareAddress, LinkState}; | use embassy_net_driver::{self, Capabilities, Driver, HardwareAddress, LinkState}; | ||||||
| use log::*; | use log::*; | ||||||
|  |  | ||||||
|  | /// Get the MTU of the given interface. | ||||||
| pub const SIOCGIFMTU: libc::c_ulong = 0x8921; | pub const SIOCGIFMTU: libc::c_ulong = 0x8921; | ||||||
|  | /// Get the index of the given interface. | ||||||
| pub const _SIOCGIFINDEX: libc::c_ulong = 0x8933; | pub const _SIOCGIFINDEX: libc::c_ulong = 0x8933; | ||||||
|  | /// Capture all packages. | ||||||
| pub const _ETH_P_ALL: libc::c_short = 0x0003; | pub const _ETH_P_ALL: libc::c_short = 0x0003; | ||||||
|  | /// Set the interface flags. | ||||||
| pub const TUNSETIFF: libc::c_ulong = 0x400454CA; | pub const TUNSETIFF: libc::c_ulong = 0x400454CA; | ||||||
|  | /// TUN device. | ||||||
| pub const _IFF_TUN: libc::c_int = 0x0001; | pub const _IFF_TUN: libc::c_int = 0x0001; | ||||||
|  | /// TAP device. | ||||||
| pub const IFF_TAP: libc::c_int = 0x0002; | pub const IFF_TAP: libc::c_int = 0x0002; | ||||||
|  | /// No packet information. | ||||||
| pub const IFF_NO_PI: libc::c_int = 0x1000; | pub const IFF_NO_PI: libc::c_int = 0x1000; | ||||||
|  |  | ||||||
| const ETHERNET_HEADER_LEN: usize = 14; | const ETHERNET_HEADER_LEN: usize = 14; | ||||||
| @@ -47,6 +56,7 @@ fn ifreq_ioctl(lower: libc::c_int, ifreq: &mut ifreq, cmd: libc::c_ulong) -> io: | |||||||
|     Ok(ifreq.ifr_data) |     Ok(ifreq.ifr_data) | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /// A TUN/TAP device. | ||||||
| #[derive(Debug)] | #[derive(Debug)] | ||||||
| pub struct TunTap { | pub struct TunTap { | ||||||
|     fd: libc::c_int, |     fd: libc::c_int, | ||||||
| @@ -60,6 +70,7 @@ impl AsRawFd for TunTap { | |||||||
| } | } | ||||||
|  |  | ||||||
| impl TunTap { | impl TunTap { | ||||||
|  |     /// Create a new TUN/TAP device. | ||||||
|     pub fn new(name: &str) -> io::Result<TunTap> { |     pub fn new(name: &str) -> io::Result<TunTap> { | ||||||
|         unsafe { |         unsafe { | ||||||
|             let fd = libc::open( |             let fd = libc::open( | ||||||
| @@ -126,11 +137,13 @@ impl io::Write for TunTap { | |||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /// A TUN/TAP device, wrapped in an async interface. | ||||||
| pub struct TunTapDevice { | pub struct TunTapDevice { | ||||||
|     device: Async<TunTap>, |     device: Async<TunTap>, | ||||||
| } | } | ||||||
|  |  | ||||||
| impl TunTapDevice { | impl TunTapDevice { | ||||||
|  |     /// Create a new TUN/TAP device. | ||||||
|     pub fn new(name: &str) -> io::Result<TunTapDevice> { |     pub fn new(name: &str) -> io::Result<TunTapDevice> { | ||||||
|         Ok(Self { |         Ok(Self { | ||||||
|             device: Async::new(TunTap::new(name)?)?, |             device: Async::new(TunTap::new(name)?)?, | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ keywords = ["embedded", "wiznet", "embassy-net", "embedded-hal-async", "ethernet | |||||||
| categories = ["embedded", "hardware-support", "no-std", "network-programming", "async"] | categories = ["embedded", "hardware-support", "no-std", "network-programming", "async"] | ||||||
| license = "MIT OR Apache-2.0" | license = "MIT OR Apache-2.0" | ||||||
| edition = "2021" | edition = "2021" | ||||||
|  | repository = "https://github.com/embassy-rs/embassy" | ||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embedded-hal = { version = "1.0.0-rc.3" } | embedded-hal = { version = "1.0.0-rc.3" } | ||||||
|   | |||||||
| @@ -1,3 +1,4 @@ | |||||||
|  | //! Wiznet W5100s and W5500 family driver. | ||||||
| mod w5500; | mod w5500; | ||||||
| pub use w5500::W5500; | pub use w5500::W5500; | ||||||
| mod w5100s; | mod w5100s; | ||||||
| @@ -45,4 +46,5 @@ pub(crate) mod sealed { | |||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /// Trait for Wiznet chips. | ||||||
| pub trait Chip: sealed::Chip {} | pub trait Chip: sealed::Chip {} | ||||||
|   | |||||||
| @@ -4,6 +4,7 @@ const SOCKET_BASE: u16 = 0x400; | |||||||
| const TX_BASE: u16 = 0x4000; | const TX_BASE: u16 = 0x4000; | ||||||
| const RX_BASE: u16 = 0x6000; | const RX_BASE: u16 = 0x6000; | ||||||
|  |  | ||||||
|  | /// Wizard W5100S chip. | ||||||
| pub enum W5100S {} | pub enum W5100S {} | ||||||
|  |  | ||||||
| impl super::Chip for W5100S {} | impl super::Chip for W5100S {} | ||||||
|   | |||||||
| @@ -8,6 +8,7 @@ pub enum RegisterBlock { | |||||||
|     RxBuf = 0x03, |     RxBuf = 0x03, | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /// Wiznet W5500 chip. | ||||||
| pub enum W5500 {} | pub enum W5500 {} | ||||||
|  |  | ||||||
| impl super::Chip for W5500 {} | impl super::Chip for W5500 {} | ||||||
|   | |||||||
| @@ -1,6 +1,7 @@ | |||||||
| #![no_std] | #![no_std] | ||||||
| #![allow(async_fn_in_trait)] | #![allow(async_fn_in_trait)] | ||||||
| #![doc = include_str!("../README.md")] | #![doc = include_str!("../README.md")] | ||||||
|  | #![warn(missing_docs)] | ||||||
|  |  | ||||||
| pub mod chip; | pub mod chip; | ||||||
| mod device; | mod device; | ||||||
| @@ -47,6 +48,7 @@ pub struct Runner<'d, C: Chip, SPI: SpiDevice, INT: Wait, RST: OutputPin> { | |||||||
|  |  | ||||||
| /// You must call this in a background task for the driver to operate. | /// You must call this in a background task for the driver to operate. | ||||||
| impl<'d, C: Chip, SPI: SpiDevice, INT: Wait, RST: OutputPin> Runner<'d, C, SPI, INT, RST> { | impl<'d, C: Chip, SPI: SpiDevice, INT: Wait, RST: OutputPin> Runner<'d, C, SPI, INT, RST> { | ||||||
|  |     /// Run the driver. | ||||||
|     pub async fn run(mut self) -> ! { |     pub async fn run(mut self) -> ! { | ||||||
|         let (state_chan, mut rx_chan, mut tx_chan) = self.ch.split(); |         let (state_chan, mut rx_chan, mut tx_chan) = self.ch.split(); | ||||||
|         let mut tick = Ticker::every(Duration::from_millis(500)); |         let mut tick = Ticker::every(Duration::from_millis(500)); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user