homekit names

apps/homekit/device_registry.py

@@ -87,7 +87,7 @@ class DeviceRegistry:
                 device_id=device_id,
                 type=device_type,
                 name=dev_data.get('name', device_id),
-                friendly_name=title or dev_data.get('name', device_id),
+                friendly_name=dev_data.get('name', device_id),
                 room=room_name,
                 features=dev_data.get('features', {}),
                 read_only=read_only

apps/homekit/main.py

@@ -101,10 +101,10 @@ def get_accessory_name(device) -> str:
     Returns:
         Name string like "Device Name (Room)" or just "Device Name" if no room
     """
-    base_name = device.friendly_name or device.name
+    #base_name = device.friendly_name or device.name
-    if device.room:
+    #if device.room:
-        return f"{base_name} ({device.room})"
+    #    return f"{base_name} - {device.room}"
-    return base_name
+    return device.name
 
 
 def create_accessory_for_device(device, api_client: ApiClient, driver: AccessoryDriver):

config/devices.yaml

@@ -241,22 +241,6 @@ devices:
     ieee_address: "0x0017880108a03e45"
     model: "929002241201"
     vendor: "Philips"
-- device_id: haustuer
-  name: Haustür-Lampe
-  type: light
-  cap_version: "light@1.2.0"
-  technology: zigbee2mqtt
-  features:
-    power: true
-    brightness: true
-  topics:
-    state: "zigbee2mqtt/0xec1bbdfffea6a3da"
-    set: "zigbee2mqtt/0xec1bbdfffea6a3da/set"
-  metadata:
-    friendly_name: "Haustür"
-    ieee_address: "0xec1bbdfffea6a3da"
-    model: "LED1842G3"
-    vendor: "IKEA"
 - device_id: deckenlampe_flur_oben
   name: Deckenlampe oben
   type: light
@@ -794,6 +778,17 @@ devices:
   topics:
     state: "zigbee2mqtt/0xbc33acfffe21f547"
     set: "zigbee2mqtt/0xbc33acfffe21f547/set"
+- device_id: kueche_fensterbank_licht
+  name: Fensterbank Küche
+  type: light
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+  topics:
+    state: "zigbee2mqtt/0xf0d1b8000017515d"
+    set: "zigbee2mqtt/0xf0d1b8000017515d/set"
 - device_id: licht_kommode_schlafzimmer
   name: Kommode Schlafzimmer
   type: relay
@@ -804,6 +799,56 @@ devices:
   topics:
     set: "cmnd/tasmota/04/POWER"
     state: "stat/tasmota/04/POWER"
+- device_id: licht_fensterbank_esszimmer
+  name: Fensterbank Esszimmer
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: tasmota
+  features:
+    power: true
+  topics:
+    set: "cmnd/tasmota/02/POWER"
+    state: "stat/tasmota/02/POWER"
+- device_id: licht_schreibtisch_patty
+  name: Schreibtisch Patty
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: tasmota
+  features:
+    power: true
+  topics:
+    set: "cmnd/tasmota/03/POWER"
+    state: "stat/tasmota/03/POWER"
+- device_id: kugeln_regal_flur
+  name: Kugeln Regal Flur
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: tasmota
+  features:
+    power: true
+  topics:
+    set: "cmnd/tasmota/01/POWER"
+    state: "stat/tasmota/01/POWER"
+- device_id: schrank_flur_haustür
+  name: Schrank Flur Haustür
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: tasmota
+  features:
+    power: true
+  topics:
+    set: "cmnd/tasmota/05/POWER"
+    state: "stat/tasmota/05/POWER"
+- device_id: gartenlicht_vorne
+  name: Gartenlicht vorne
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: tasmota
+  features:
+    power: true
+  topics:
+    set: "cmnd/tasmota/06/POWER"
+    state: "stat/tasmota/06/POWER"
 
 - device_id: power_relay_caroutlet
   name: Car Outlet
@@ -824,4 +869,16 @@ devices:
   topics:
     state: "IoT/Car/Values"
 
+- device_id: schranklicht_flur_vor_kueche
+  name: Schranklicht Flur vor Küche
+  type: light
+  cap_version: "relay@1.0.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+  topics:
+    state: "zigbee2mqtt/0xf0d1b80000155a1f"
+    set: "zigbee2mqtt/0xf0d1b80000155a1f/set"
+
+
 

config/layout.yaml

@@ -43,10 +43,10 @@ rooms:
     title: Leselampe Esszimmer
     icon: 💡
     rank: 60
-#  - device_id: standlampe_esszimmer
+  - device_id: licht_fensterbank_esszimmer
-#    title: Standlampe Esszimmer
+    title: Fensterbank Esszimmer
-#    icon: 💡
+    icon: 💡
-#    rank: 70
+    rank: 70
   - device_id: kleine_lampe_links_esszimmer
     title: kleine Lampe links Esszimmer
     icon: 💡
@@ -131,6 +131,10 @@ rooms:
     title: Küche Putzlicht
     icon: 💡
     rank: 143
+  - device_id: kueche_fensterbank_licht
+    title: Küche Fensterbank
+    icon: 💡
+    rank: 144
   - device_id: thermostat_kueche
     title: Kueche
     icon: 🌡️
@@ -173,6 +177,10 @@ rooms:
     title: Kugellampe Patty
     icon: 💡
     rank: 181
+  - device_id: licht_schreibtisch_patty
+    title: Licht Schreibtisch Patty
+    icon: 💡
+    rank: 182
   - device_id: thermostat_patty
     title: Thermostat Patty
     icon: 🌡️
@@ -217,18 +225,22 @@ rooms:
     title: Deckenlampe Flur oben
     icon: 💡
     rank: 210
-  - device_id: haustuer
+  - device_id: kugeln_regal_flur
-    title: Haustür
+    title: Kugeln Regal
-    icon: 💡
-    rank: 220
-  - device_id: licht_flur_schrank
-    title: Schranklicht Flur
     icon: 💡
     rank: 222
   - device_id: licht_flur_oben_am_spiegel
-    title: Licht Flur oben am Spiegel
+    title: Licht oben am Spiegel
     icon: 💡
     rank: 230
+  - device_id: schrank_flur_haustür
+    title: Schranklicht an der Haustür
+    icon: 💡
+    rank: 231
+  - device_id: schranklicht_flur_vor_kueche
+    title: Schranklicht vor Küche
+    icon: 💡
+    rank: 232  
   - device_id: sensor_flur
     title: Temperatur & Luftfeuchte
     icon: 🌡️
@@ -291,6 +303,10 @@ rooms:
     title: Licht Terasse
     icon: 💡
     rank: 290
+  - device_id: gartenlicht_vorne
+    title: Gartenlicht vorne
+    icon: 💡
+    rank: 291
 - name: Garage
   devices:
   - device_id: power_relay_caroutlet