Skip to content

Use MacAddr6 type for BSSID. #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use MacAddr6 type for BSSID. #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ default = ["std", "use_serde", "use_strum", "use_numenum"]
#experimental = ["futures", "domain"]
experimental = ["futures"]

std = ["alloc", "anyhow/std", "serde/std", "serde_json/std", "strum/std", "num_enum/std", "http-auth-basic"]
std = ["alloc", "anyhow/std", "serde/std", "serde_json/std", "strum/std", "num_enum/std", "http-auth-basic", "macaddr/std"]
alloc = ["anyhow", "serde/alloc", "serde_json/alloc"]
use_serde = ["enumset/serde", "no-std-net/serde"]
use_serde = ["enumset/serde", "no-std-net/serde", "macaddr/serde"]
use_strum = ["strum", "strum_macros"]
use_numenum = ["num_enum"]

Expand All @@ -31,6 +31,7 @@ enumset = { version = "1", default-features = false }
anyhow = { version = "1", default-features = false, optional = true }
strum = { version = "0.23", default-features = false, optional = true, features = ["derive"] }
strum_macros = { version = "0.23", optional = true }
macaddr = { version = "1", default-features = false }
num_enum = { version = "0.5", default-features = false, optional = true }
serde = { version = "1", default-features = false, features = ["derive"] }
serde_json = { version = "1", default-features = false, optional = true }
Expand Down
5 changes: 3 additions & 2 deletions src/wifi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use core::mem;
extern crate alloc;

use enumset::*;
use macaddr::MacAddr6;

#[cfg(feature = "use_serde")]
use serde::{Deserialize, Serialize};
Expand Down Expand Up @@ -141,7 +142,7 @@ impl Default for SecondaryChannel {
#[cfg_attr(feature = "use_serde", derive(Serialize, Deserialize))]
pub struct AccessPointInfo {
pub ssid: alloc::string::String,
pub bssid: [u8; 6],
pub bssid: MacAddr6,
pub channel: u8,
pub secondary_channel: SecondaryChannel,
pub signal_strength: u8,
Expand Down Expand Up @@ -204,7 +205,7 @@ impl Default for AccessPointConfiguration {
#[cfg_attr(feature = "use_serde", derive(Serialize, Deserialize))]
pub struct ClientConfiguration {
pub ssid: alloc::string::String,
pub bssid: Option<[u8; 6]>,
pub bssid: Option<MacAddr6>,
//pub protocol: Protocol,
pub auth_method: AuthMethod,
pub password: alloc::string::String,
Expand Down