fix errors

custom_components/mega/binary_sensor.py

@@ -78,14 +78,15 @@ class MegaBinarySensor(BinarySensorEntity, MegaPushEntity):
 
     @property
     def is_on(self) -> bool:
-        val = self.mega.values.get(self.port, {}).get("value") \
-              or self.mega.values.get(self.port, {}).get('m')
+        val = self.mega.values.get(self.port, {})
+        if isinstance(val, dict):
+            val = val.get("value", val.get('m'))
         if val is None and self._state is not None:
             return self._state == 'ON'
         elif val is not None:
-            if val in ['ON', 'OFF']:
-                return val == 'ON' if not self.invert else val == 'OFF'
-            else:
+            if val in ['ON', 'OFF', '1', '0']:
+                return val in ['ON', '1'] if not self.invert else val in ['OFF', '0']
+            elif isinstance(val, int):
                 return val != 1 if not self.invert else val == 1
 
     def _update(self, payload: dict):

custom_components/mega/config_flow.py

@@ -63,7 +63,7 @@ async def validate_input(hass: core.HomeAssistant, data):
 class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a config flow for mega."""
 
-    VERSION = 12
+    VERSION = 14
     CONNECTION_CLASS = config_entries.CONN_CLASS_ASSUMED
 
     async def async_step_user(self, user_input=None):

custom_components/mega/entities.py

@@ -247,8 +247,8 @@ class MegaOutPort(MegaPushEntity):
                 val = 0
             if val == 0:
                 return self._brightness
-            else:
-                return val
+            elif isinstance(val, (int, float)):
+                return int(val / self.dimmer_scale)
         elif val is not None:
             val = val.get("value")
             if val is None:
@@ -269,6 +269,7 @@ class MegaOutPort(MegaPushEntity):
                 return
             if self.dimmer:
                 val = safe_int(val)
+                if val is not None:
                     return val > 0 if not self.invert else val == 0
             else:
                 return val == 'ON' if not self.invert else val == 'OFF'
@@ -358,8 +359,10 @@ class MegaOutPort(MegaPushEntity):
 
 
 def safe_int(v):
-    if v in ['ON', 'OFF']:
-        return None
+    if v == 'ON':
+        return 1
+    elif v == 'OFF':
+        return 0
     try:
         return int(v)
     except (ValueError, TypeError):

custom_components/mega/http.py

@@ -15,7 +15,11 @@ from .tools import make_ints
 from . import hub as h
 _LOGGER = logging.getLogger(__name__).getChild('http')
 
-ext = {f'ext{x}' for x in range(16)}
+
+def is_ext(data: typing.Dict[str, typing.Any]):
+    for x in data:
+        if x.startswith('ext'):
+            return True
 
 
 class MegaView(HomeAssistantView):
@@ -95,13 +99,21 @@ class MegaView(HomeAssistantView):
         data['mega_id'] = hub.id
         ret = 'd' if hub.force_d else ''
         if port is not None:
-            if set(data).issubset(ext):
+            if is_ext(data):
                 ret = ''  # пока ответ всегда пустой, неясно какая будет реакция на непустой ответ
-                for e in ext:
-                    if e in data:
+                if port in hub.extenders:
+                    pt_orig = port
+                else:
+                    pt_orig = hub.ext_in.get(port)
+                if pt_orig is None:
+                    hub.lg.warning(f'can not find extender for int port {port}')
+                    return Response(status=200)
+                for e, v in data.items():
+                    if e.startswith('ext') in data:
                         idx = e[-1]
-                        pt = f'{port}e{idx}'
-                        data['value'] = 'ON' if data[e] == '1' else 'OFF'
+                        pt = f'{pt_orig}e{idx}'
+                        data['pt_orig'] = pt_orig
+                        data['value'] = 'ON' if v == '1' else 'OFF'
                         data['m'] = 1 if data[e] == '0' else 0  # имитация поведения обычного входа, чтобы события обрабатывались аналогично
                         hub.values[pt] = data
                         for cb in self.callbacks[hub.id][pt]:

custom_components/mega/hub.py

@@ -81,6 +81,7 @@ class MegaD:
             protected=True,
             restore_on_restart=False,
             extenders=None,
+            ext_in=None,
             **kwargs,
     ):
         """Initialize."""
@@ -96,6 +97,7 @@ class MegaD:
         else:
             self.http = None
         self.extenders = extenders or []
+        self.ext_in = ext_in or {}
         self.poll_outs = poll_outs
         self.update_all = update_all if update_all is not None else True
         self.nports = nports
@@ -514,6 +516,7 @@ class MegaD:
         ret = defaultdict(lambda: defaultdict(list))
         ret['mqtt_id'] = await self.get_mqtt_id()
         ret['extenders'] = extenders = []
+        ret['ext_in'] = ext_int = {}
         async for port, cfg in self.scan_ports(nports):
             if cfg.pty == "0":
                 ret['binary_sensor'][port].append({})
@@ -533,6 +536,7 @@ class MegaD:
                     ])
             elif cfg == MCP230:
                 extenders.append(port)
+                ext_int[int(cfg.inta)] = port
                 values = await self.request(pt=port, cmd='get')
                 values = values.split(';')
                 for n in range(len(values)):