code style change

5 files changed, 21 insertions, 16 deletions

diff --git a/examples/binary_sensor.rs b/examples/binary_sensor.rs
index 27cfdb5..a52a5fb 100644
--- a/examples/binary_sensor.rs
+++ b/examples/binary_sensor.rs
@@ -11,7 +11,7 @@ static RESOURCES: StaticCell<embassy_ha::DeviceResources> = StaticCell::new();
 async fn main_task(spawner: Spawner) {
     let mut stream = AsyncTcp::connect(std::env!("MQTT_ADDRESS"));
 
-    let mut device = embassy_ha::Device::new(
+    let mut device = embassy_ha::new(
         RESOURCES.init(Default::default()),
         embassy_ha::DeviceConfig {
             device_id: "example-device-id",
@@ -21,7 +21,8 @@ async fn main_task(spawner: Spawner) {
         },
     );
 
-    let sensor = device.create_binary_sensor(
+    let sensor = embassy_ha::create_binary_sensor(
+        &device,
         "binary-sensor-id",
         embassy_ha::BinarySensorConfig {
             common: embassy_ha::EntityCommonConfig {
@@ -34,7 +35,7 @@ async fn main_task(spawner: Spawner) {
 
     spawner.must_spawn(binary_sensor_class(sensor));
 
-    device.run(&mut stream).await.unwrap();
+    embassy_ha::run(&mut device, &mut stream).await.unwrap();
 }
 
 #[embassy_executor::task]
diff --git a/examples/button.rs b/examples/button.rs
index e3d7086..4a2a228 100644
--- a/examples/button.rs
+++ b/examples/button.rs
@@ -10,7 +10,7 @@ static RESOURCES: StaticCell<embassy_ha::DeviceResources> = StaticCell::new();
 async fn main_task(spawner: Spawner) {
     let mut stream = AsyncTcp::connect(std::env!("MQTT_ADDRESS"));
 
-    let mut device = embassy_ha::Device::new(
+    let mut device = embassy_ha::new(
         RESOURCES.init(Default::default()),
         embassy_ha::DeviceConfig {
             device_id: "example-device-id",
@@ -20,11 +20,11 @@ async fn main_task(spawner: Spawner) {
         },
     );
 
-    let button = device.create_button("button-sensor-id", embassy_ha::ButtonConfig::default());
+    let button = embassy_ha::create_button(&device, "button-sensor-id", embassy_ha::ButtonConfig::default());
 
     spawner.must_spawn(button_task(button));
 
-    device.run(&mut stream).await.unwrap();
+    embassy_ha::run(&mut device, &mut stream).await.unwrap();
 }
 
 #[embassy_executor::task]
diff --git a/examples/number.rs b/examples/number.rs
index 2231be1..8ef6656 100644
--- a/examples/number.rs
+++ b/examples/number.rs
@@ -11,7 +11,7 @@ static RESOURCES: StaticCell<embassy_ha::DeviceResources> = StaticCell::new();
 async fn main_task(spawner: Spawner) {
     let mut stream = AsyncTcp::connect(std::env!("MQTT_ADDRESS"));
 
-    let mut device = embassy_ha::Device::new(
+    let mut device = embassy_ha::new(
         RESOURCES.init(Default::default()),
         embassy_ha::DeviceConfig {
             device_id: "example-device-id",
@@ -21,7 +21,8 @@ async fn main_task(spawner: Spawner) {
         },
     );
 
-    let number = device.create_number(
+    let number = embassy_ha::create_number(
+        &device,
         "number-id",
         embassy_ha::NumberConfig {
             common: embassy_ha::EntityCommonConfig {
@@ -40,7 +41,7 @@ async fn main_task(spawner: Spawner) {
 
     spawner.must_spawn(number_task(number));
 
-    device.run(&mut stream).await.unwrap();
+    embassy_ha::run(&mut device, &mut stream).await.unwrap();
 }
 
 #[embassy_executor::task]
diff --git a/examples/sensor.rs b/examples/sensor.rs
index 69bd87a..2fd2d1f 100644
--- a/examples/sensor.rs
+++ b/examples/sensor.rs
@@ -11,7 +11,7 @@ static RESOURCES: StaticCell<embassy_ha::DeviceResources> = StaticCell::new();
 async fn main_task(spawner: Spawner) {
     let mut stream = AsyncTcp::connect(std::env!("MQTT_ADDRESS"));
 
-    let mut device = embassy_ha::Device::new(
+    let mut device = embassy_ha::new(
         RESOURCES.init(Default::default()),
         embassy_ha::DeviceConfig {
             device_id: "example-device-id",
@@ -21,7 +21,8 @@ async fn main_task(spawner: Spawner) {
         },
     );
 
-    let temperature_sensor = device.create_sensor(
+    let temperature_sensor = embassy_ha::create_sensor(
+        &device,
         "random-temperature-sensor-id",
         embassy_ha::SensorConfig {
             common: embassy_ha::EntityCommonConfig {
@@ -35,7 +36,8 @@ async fn main_task(spawner: Spawner) {
         },
     );
 
-    let humidity_sensor = device.create_sensor(
+    let humidity_sensor = embassy_ha::create_sensor(
+        &device,
         "random-humidity-sensor-id",
         embassy_ha::SensorConfig {
             common: embassy_ha::EntityCommonConfig {
@@ -52,7 +54,7 @@ async fn main_task(spawner: Spawner) {
     spawner.must_spawn(random_temperature_task(temperature_sensor));
     spawner.must_spawn(random_humidity_task(humidity_sensor));
 
-    device.run(&mut stream).await.unwrap();
+    embassy_ha::run(&mut device, &mut stream).await.unwrap();
 }
 
 #[embassy_executor::task]
diff --git a/examples/switch.rs b/examples/switch.rs
index 67767d7..0158ede 100644
--- a/examples/switch.rs
+++ b/examples/switch.rs
@@ -11,7 +11,7 @@ static RESOURCES: StaticCell<embassy_ha::DeviceResources> = StaticCell::new();
 async fn main_task(spawner: Spawner) {
     let mut stream = AsyncTcp::connect(std::env!("MQTT_ADDRESS"));
 
-    let mut device = embassy_ha::Device::new(
+    let mut device = embassy_ha::new(
         RESOURCES.init(Default::default()),
         embassy_ha::DeviceConfig {
             device_id: "example-device-id",
@@ -21,7 +21,8 @@ async fn main_task(spawner: Spawner) {
         },
     );
 
-    let switch = device.create_switch(
+    let switch = embassy_ha::create_switch(
+        &device,
         "switch-id",
         embassy_ha::SwitchConfig {
             common: embassy_ha::EntityCommonConfig {
@@ -34,7 +35,7 @@ async fn main_task(spawner: Spawner) {
 
     spawner.must_spawn(switch_task(switch));
 
-    device.run(&mut stream).await.unwrap();
+    embassy_ha::run(&mut device, &mut stream).await.unwrap();
 }
 
 #[embassy_executor::task]