Correct naming and injection

Author: CoMPaTech

custom_components/stromer/__init__.py

@@ -76,14 +76,16 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         config_entry_id=entry.entry_id,
         identifiers={(DOMAIN, str(stromer.bike_id))},
         manufacturer="Stromer",
-        name=f"{stromer.bike_name}",
-        model=f"{stromer.bike_model}",
+        name=stromer.bike_name,
+        model=stromer.bike_model,
     )
 
     # Remove non-existing via device
     device_registry.async_update_device(
         device.id,
-        via_device_id=None
+        name=stromer.bike_name,
+        model=stromer.bike_model,
+        via_device_id=None,
     )
 
     # Set up platforms (i.e. sensors, binary_sensors)

custom_components/stromer/coordinator.py

@@ -35,6 +35,7 @@ async def _async_update_data(self) -> StromerData:
                 self.stromer.position["rcvts_pos"] = self.stromer.position.pop("rcvts")
 
             bike_data = self.stromer.bike
+            bike_data.update({"bike_model": self.stromer.bike_model, "bike_name": self.stromer.bike_name})
             bike_data.update(self.stromer.status)
             bike_data.update(self.stromer.position)
 

custom_components/stromer/entity.py

@@ -31,15 +31,15 @@ def __init__(
             configuration_url=configuration_url,
             identifiers={(DOMAIN, str(coordinator.data.bike_id))},
             manufacturer="Stromer",
-            model=data.get("bikemodel"),
-            name=data.get("nickname"),
+            model=data.get("bike_model"),
+            name=data.get("bike_name"),
             sw_version=data.get("suiversion"),
             hw_version=data.get("tntversion"),
         )
 
         self._attr_device_info.update(
             {
-                ATTR_NAME: data.get("nickname"),
+                ATTR_NAME: data.get("bike_name"),
                 ATTR_VIA_DEVICE: None,
             }
         )