Use macaddr rather than eui48 and bump dependencies

Cargo.toml

@@ -28,7 +28,7 @@ bytes = "1.0"
 chacha20poly1305 = "0.8"
 ed25519-dalek = { version = "1.0", features = ["std", "serde"] }
 erased-serde = "0.3"
-eui48 = { version = "1.0", features = ["serde"] }
+macaddr = { version = "1.0.1", features = ["serde"] }
 futures = "0.3"
 get_if_addrs = "0.5"
 hkdf = "0.11"

codegen/src/main.rs

@@ -1274,7 +1274,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: \"Acme {{service.DefaultDescription}}\".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: {{category service.DefaultDescription}},
                 ..Default::default()
             };

examples/adding_accessories_dynamically.rs

@@ -33,7 +33,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Bridge".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Bridge,
                 ..Default::default()
             };

examples/air_purifier.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Air Purifier".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::AirPurifier,
                 ..Default::default()
             };

examples/air_quality_sensor.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Air Quality Sensor".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Sensor,
                 ..Default::default()
             };

examples/async_callbacks.rs

@@ -49,7 +49,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Lightbulb".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Lightbulb,
                 ..Default::default()
             };

examples/bridged_accessories.rs

@@ -73,7 +73,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Bridge".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Bridge,
                 ..Default::default()
             };

examples/callbacks.rs

@@ -42,7 +42,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Lightbulb".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Lightbulb,
                 ..Default::default()
             };

examples/carbon_dioxide_sensor.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Carbon dioxide Sensor".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Sensor,
                 ..Default::default()
             };

examples/carbon_monoxide_sensor.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Carbon monoxide Sensor".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Sensor,
                 ..Default::default()
             };

examples/contact_sensor.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Contact Sensor".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Sensor,
                 ..Default::default()
             };

examples/cooler.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Cooler".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::AirConditioner,
                 ..Default::default()
             };

examples/custom_characteristics_services_accessories.rs

@@ -240,7 +240,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Foo".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Other,
                 ..Default::default()
             };

examples/custom_multi_sensor.rs

@@ -111,7 +111,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Temperature & Humidity Sensor".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Sensor,
                 ..Default::default()
             };

examples/dehumidifier.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Dehumidifier".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::AirDehumidifier,
                 ..Default::default()
             };

examples/door.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Door".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Door,
                 ..Default::default()
             };

examples/fan.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Fan".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Fan,
                 ..Default::default()
             };

examples/fan_v2.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Fan v2".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Fan,
                 ..Default::default()
             };

examples/faucet.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Faucet".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Faucet,
                 ..Default::default()
             };

examples/garage_door_opener.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Garage Door Opener".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::GarageDoorOpener,
                 ..Default::default()
             };

examples/heater.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Heater".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::AirHeater,
                 ..Default::default()
             };

examples/humidifier.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Humidifier-Dehumidifier".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::AirDehumidifier,
                 ..Default::default()
             };

examples/humidity_sensor.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Humidity Sensor".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Sensor,
                 ..Default::default()
             };

examples/irrigation_system.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Irrigation-System".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Sprinkler,
                 ..Default::default()
             };

examples/leak_sensor.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Leak Sensor".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Sensor,
                 ..Default::default()
             };

examples/light_sensor.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Light Sensor".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Sensor,
                 ..Default::default()
             };

examples/lightbulb.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Lightbulb".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Lightbulb,
                 ..Default::default()
             };

examples/lock.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Lock".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::DoorLock,
                 ..Default::default()
             };

examples/motion_sensor.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Motion Sensor".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Sensor,
                 ..Default::default()
             };

examples/occupancy_sensor.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Occupancy Sensor".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Sensor,
                 ..Default::default()
             };

examples/outlet.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Outlet".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Outlet,
                 ..Default::default()
             };

examples/security_system.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Security System".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::SecuritySystem,
                 ..Default::default()
             };

examples/setting_values_after_server_start.rs

@@ -31,7 +31,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Sensor".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 63]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 63]),
                 category: AccessoryCategory::Sensor,
                 ..Default::default()
             };

examples/shower_head.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Shower Head".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::ShowerHead,
                 ..Default::default()
             };

examples/smart_speaker.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Smart Speaker".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Speaker,
                 ..Default::default()
             };

examples/smoke_sensor.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Smoke Sensor".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Sensor,
                 ..Default::default()
             };

examples/stateful_programmable_switch.rs

@@ -33,7 +33,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Stateful Programmable Switch".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::ProgrammableSwitch,
                 ..Default::default()
             };

examples/stateless_programmable_switch.rs

@@ -33,7 +33,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Stateless Programmable Switch".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::ProgrammableSwitch,
                 ..Default::default()
             };

examples/storing_arbitrary_bytes.rs

@@ -38,7 +38,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Stateful Lightbulb".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Lightbulb,
                 ..Default::default()
             };

examples/switch.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Switch".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Switch,
                 ..Default::default()
             };

examples/television.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Television".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Television,
                 ..Default::default()
             };

examples/temperature_sensor.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Temperature Sensor".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Sensor,
                 ..Default::default()
             };

examples/thermostat.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Thermostat".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Thermostat,
                 ..Default::default()
             };

examples/wi_fi_router.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Wi-Fi Router".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::WiFiRouter,
                 ..Default::default()
             };