Merge pull request #53 from sayurin:improve

Refactor lighting system for improved clarity

Author: sayurin

README.ja.md

@@ -63,8 +63,6 @@
 | 0x0263 | 電動シャッター | Cover + 汎用エンティティ |
 | 0x0290 | 一般照明 | Light + 汎用エンティティ |
 | 0x0291 | 単機能照明 | Light + 汎用エンティティ |
-| 0x02A3 | 照明システム | Light + 汎用エンティティ |
-| 0x02A4 | 拡張照明システム | Light + 汎用エンティティ |
 
 **汎用エンティティのみ**（センサー、電力メーター、EV 充電器、調理機器など 50 以上のクラス — インテグレーションオプション UI で一覧を確認できます）。
 

README.md

@@ -63,8 +63,6 @@ The following classes require **Enable experimental device classes** to be turne
 | 0x0263 | Electrically Operated Shutter | Cover + generic entities |
 | 0x0290 | General Lighting | Light + generic entities |
 | 0x0291 | Mono-Functional Lighting | Light + generic entities |
-| 0x02A3 | Lighting System | Light + generic entities |
-| 0x02A4 | Extended Lighting System | Light + generic entities |
 
 **Via generic entities only** (50+ additional classes including sensors, meters, EV chargers, cookware, and more — see the full list in the integration options UI).
 

custom_components/echonet_lite/const.py

@@ -62,8 +62,6 @@
 CLASS_CODE_STORAGE_BATTERY = 0x027D
 CLASS_CODE_GENERAL_LIGHTING = 0x0290
 CLASS_CODE_MONO_FUNCTIONAL_LIGHTING = 0x0291
-CLASS_CODE_LIGHTING_SYSTEM = 0x02A3
-CLASS_CODE_EXTENDED_LIGHTING_SYSTEM = 0x02A4
 CLASS_CODE_SWITCH = 0x05FD  # Switch (supporting JEM-A/HA terminals)
 CLASS_CODE_CONTROLLER = 0x05FF
 
@@ -212,18 +210,6 @@
             EPC_LIGHTING_MODE,
         }
     ),
-    CLASS_CODE_LIGHTING_SYSTEM: frozenset(
-        {
-            EPC_OPERATION_STATUS,
-            EPC_LIGHT_LEVEL,
-        }
-    ),
-    CLASS_CODE_EXTENDED_LIGHTING_SYSTEM: frozenset(
-        {
-            EPC_OPERATION_STATUS,
-            EPC_LIGHT_LEVEL,
-        }
-    ),
 }
 
 

custom_components/echonet_lite/cover.py

@@ -102,9 +102,13 @@ def __init__(
         # Build supported_features dynamically from the device's advertised
         # property map so devices that omit optional EPCs (position, tilt)
         # don't expose unsupported controls in the UI.
-        features = (
-            CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE | CoverEntityFeature.STOP
-        )
+        features = CoverEntityFeature(0)
+        if EPC_COVER_OPEN_CLOSE in node.set_epcs:
+            features |= (
+                CoverEntityFeature.OPEN
+                | CoverEntityFeature.CLOSE
+                | CoverEntityFeature.STOP
+            )
         if EPC_COVER_POSITION in node.set_epcs:
             features |= CoverEntityFeature.SET_POSITION
         if EPC_COVER_ANGLE in node.set_epcs:

custom_components/echonet_lite/icons.json

@@ -50,20 +50,6 @@
         }
       }
     },
-    "light": {
-      "extended_lighting_system": {
-        "default": "mdi:lightbulb-multiple-off",
-        "state": {
-          "on": "mdi:lightbulb-multiple"
-        }
-      },
-      "lighting_system": {
-        "default": "mdi:lightbulb-multiple-off",
-        "state": {
-          "on": "mdi:lightbulb-multiple"
-        }
-      }
-    },
     "select": {
       "installation_location_code": {
         "default": "mdi:map-marker",

custom_components/echonet_lite/light.py

@@ -18,10 +18,8 @@
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
-    CLASS_CODE_EXTENDED_LIGHTING_SYSTEM as CC_EXTENDED_LIGHTING_SYSTEM,
-    CLASS_CODE_GENERAL_LIGHTING as CC_GENERAL_LIGHTING,
-    CLASS_CODE_LIGHTING_SYSTEM as CC_LIGHTING_SYSTEM,
-    CLASS_CODE_MONO_FUNCTIONAL_LIGHTING as CC_MONO_FUNCTIONAL_LIGHTING,
+    CLASS_CODE_GENERAL_LIGHTING as CC_GENERAL,
+    CLASS_CODE_MONO_FUNCTIONAL_LIGHTING as CC_MONO,
     EPC_LIGHT_COLOR,
     EPC_LIGHT_LEVEL,
     EPC_LIGHTING_MODE,
@@ -113,18 +111,10 @@ def _create_light_description(
 
 
 _DESCRIPTIONS: dict[int, EchonetLiteLightEntityDescription] = {
-    CC_GENERAL_LIGHTING: _create_light_description(
-        CC_GENERAL_LIGHTING, "general_lighting", build_color=True, build_mode=True
-    ),
-    CC_MONO_FUNCTIONAL_LIGHTING: _create_light_description(
-        CC_MONO_FUNCTIONAL_LIGHTING, "mono_functional_lighting"
-    ),
-    CC_LIGHTING_SYSTEM: _create_light_description(
-        CC_LIGHTING_SYSTEM, "lighting_system"
-    ),
-    CC_EXTENDED_LIGHTING_SYSTEM: _create_light_description(
-        CC_EXTENDED_LIGHTING_SYSTEM, "extended_lighting_system"
+    CC_GENERAL: _create_light_description(
+        CC_GENERAL, "general_lighting", build_color=True, build_mode=True
     ),
+    CC_MONO: _create_light_description(CC_MONO, "mono_functional_lighting"),
 }