boneIO 0.8.0.dev6__tar.gz → 0.8.0.dev8__tar.gz

{boneIO-0.8.0.dev6 → boneIO-0.8.0.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: boneIO
-Version: 0.8.0.dev6
+Version: 0.8.0.dev8
 Summary: Python App for BoneIO
 License: GNU General Public License v3.0
 Author-email: Paweł Szafer <pszafer@gmail.com>

boneIO-0.8.0.dev8/boneio/example_config/binary_sensor_v_0_7.yaml

@@ -0,0 +1,11 @@
+#- id: IN_02
+#  pin: P8_38
+#  gpio_mode: gpio_pu
+#  detection_type: new
+- id: IN_26
+  detection_type: new
+  pin: P8_7
+  actions:
+    pressed:
+      - action: output
+        pin: OUT_26

boneIO-0.8.0.dev8/boneio/example_config/event_v_0_7.yaml

@@ -0,0 +1,292 @@
+- id: IN_01
+  pin: P8_37
+  gpio_mode: gpio_pu
+  detection_type: new
+  actions:
+    single:
+      - action: output
+        pin: OUT_01
+- id: IN_02
+  pin: P8_38
+  gpio_mode: gpio_pu
+  actions:
+    single:
+      - action: output
+        pin: OUT_02
+- id: IN_03
+  pin: P8_39
+  detection_type: new
+  actions:
+    single:
+      - action: output
+        pin: OUT_03
+- id: IN_04
+  pin: P8_40
+  detection_type: new
+  actions:
+    single:
+      - action: output
+        pin: OUT_04
+- id: IN_05
+  pin: P8_41
+  detection_type: new
+  actions:
+    single:
+      - action: output
+        pin: OUT_05
+- id: IN_06
+  pin: P8_42
+  detection_type: new
+  actions:
+    single:
+      - action: output
+        pin: OUT_06
+- id: IN_07
+  detection_type: new
+  pin: P8_43
+  actions:
+    single:
+      - action: output
+        pin: OUT_07
+- id: IN_08
+  pin: P8_44
+  detection_type: new
+  actions:
+    single:
+      - action: output
+        pin: OUT_08
+- id: IN_09
+  pin: P8_45
+  detection_type: new
+  gpio_mode: gpio_pu
+  actions:
+    single:
+      - action: output
+        pin: OUT_09
+- id: IN_10
+  pin: P8_46
+  gpio_mode: gpio_pu
+  detection_type: new
+  actions:
+    single:
+      - action: output
+        pin: OUT_10
+- id: IN_11
+  pin: P9_42
+  detection_type: new
+  actions:
+    single:
+      - action: output
+        pin: OUT_11
+- id: IN_12
+  detection_type: new
+  pin: P9_31
+  actions:
+    single:
+      - action: output
+        pin: OUT_12
+    # double:
+    #   - action: mqtt
+    #     topic: beagle2/cmd/relay/OUT_12/set
+    #     action_mqtt_msg: 'toggle'
+- id: IN_13
+  detection_type: new
+  pin: P9_30
+  actions:
+    single:
+      - action: output
+        pin: OUT_13
+    # long:
+    #   - action: mqtt
+    #     topic: beagle2/cmd/relay/OUT_13/set
+    #     action_mqtt_msg: 'toggle'
+- id: IN_14
+  detection_type: new
+  pin: P9_29
+  actions:
+    single:
+      - action: output
+        pin: OUT_14
+
+- id: IN_15
+  detection_type: new
+  pin: P9_28
+  actions:
+    single:
+      - action: output
+        pin: OUT_15
+- id: IN_16
+  detection_type: new
+  pin: P9_27
+  actions:
+    single:
+      - action: output
+        pin: OUT_16
+- id: IN_17
+  detection_type: new
+  pin: P9_25
+  actions:
+    single:
+      - action: output
+        pin: OUT_17
+- id: IN_18
+  detection_type: new
+  pin: P9_23
+  actions:
+    single:
+      - action: output
+        pin: OUT_18
+- id: IN_19
+  detection_type: new
+  pin: P9_22
+  gpio_mode: gpio_pu
+  actions:
+    single:
+      - action: output
+        pin: OUT_19
+- id: IN_20
+  detection_type: new
+  pin: P9_21
+  gpio_mode: gpio_pu
+  actions:
+    single:
+      - action: output
+        pin: OUT_20
+- id: IN_21
+  detection_type: new
+  pin: P9_18
+  actions:
+    single:
+      - action: output
+        pin: OUT_21
+- id: IN_22
+  detection_type: new
+  pin: P9_17
+  actions:
+    single:
+      - action: output
+        pin: OUT_22
+- id: IN_23
+  detection_type: new
+  pin: P9_16
+  actions:
+    single:
+      - action: output
+        pin: OUT_23
+- id: IN_24
+  detection_type: new
+  pin: P9_15
+  actions:
+    single:
+      - action: output
+        pin: OUT_24
+- id: IN_25
+  detection_type: new
+  pin: P9_14
+  actions:
+    single:
+      - action: output
+        pin: OUT_25
+
+  #- id: IN_26_binary_sensor!
+  #  detection_type: new
+  #  pin: P8_07
+
+- id: IN_27
+  detection_type: new
+  pin: P8_8
+  actions:
+    single:
+      - action: output
+        pin: OUT_27
+- id: IN_28
+  detection_type: new
+  pin: P8_9
+  actions:
+    single:
+      - action: output
+        pin: OUT_28
+- id: IN_29
+  detection_type: new
+  pin: P8_36
+  gpio_mode: gpio_pu
+  actions:
+    single:
+      - action: output
+        pin: OUT_29
+- id: IN_30
+  detection_type: new
+  pin: P8_35
+  gpio_mode: gpio_pu
+  actions:
+    single:
+      - action: output
+        pin: OUT_30
+- id: IN_31
+  detection_type: new
+  pin: P8_34
+  gpio_mode: gpio_pu
+  actions:
+    single:
+      - action: output
+        pin: OUT_31
+- id: IN_32
+  detection_type: new
+  pin: P8_33
+  gpio_mode: gpio_pu
+  actions:
+    single:
+      - action: output
+        pin: OUT_32
+- id: IN_33
+  detection_type: new
+  pin: P8_32
+  gpio_mode: gpio_pu
+- id: IN_34
+  detection_type: new
+  pin: P8_31
+- id: IN_35
+  detection_type: new
+  pin: P8_30
+- id: IN_36
+  detection_type: new
+  pin: P8_29
+- id: IN_37
+  detection_type: new
+  pin: P8_28
+- id: IN_38
+  detection_type: new
+  pin: P8_27
+- id: IN_39
+  detection_type: new
+  pin: P8_26
+- id: IN_40
+  detection_type: new
+  pin: P8_19
+- id: IN_41
+  detection_type: new
+  pin: P8_18
+- id: IN_42
+  detection_type: new
+  pin: P8_17
+- id: IN_43
+  detection_type: new
+  pin: P8_16
+- id: IN_44
+  detection_type: new
+  pin: P8_15
+- id: IN_45
+  detection_type: new
+  pin: P8_14
+- id: IN_46
+  detection_type: new
+  pin: P8_13
+- id: IN_47
+  detection_type: new
+  pin: P8_12
+- id: IN_48
+  detection_type: new
+  pin: P8_11
+- id: IN_49
+  detection_type: new
+  pin: P8_10

boneIO-0.8.0.dev8/boneio/example_config/output32x10A.yaml

@@ -0,0 +1,192 @@
+# config to Relay board 32x10 v0.4
+- id: OUT_01
+  kind: mcp
+  mcp_id: mcp2
+  pin: 7
+  output_type: light
+
+- id: OUT_02
+  kind: mcp
+  mcp_id: mcp2
+  pin: 6
+  output_type: light
+
+- id: OUT_03
+  kind: mcp
+  mcp_id: mcp2
+  pin: 5
+  output_type: light
+
+- id: OUT_04
+  kind: mcp
+  mcp_id: mcp2
+  pin: 4
+  output_type: light
+
+- id: OUT_05
+  kind: mcp
+  mcp_id: mcp2
+  pin: 3
+  output_type: light
+
+- id: OUT_06
+  kind: mcp
+  mcp_id: mcp2
+  pin: 2
+  output_type: light
+
+- id: OUT_07
+  kind: mcp
+  mcp_id: mcp2
+  pin: 1
+  output_type: light
+
+- id: OUT_08
+  kind: mcp
+  mcp_id: mcp2
+  pin: 0
+  output_type: light
+
+- id: OUT_09
+  kind: mcp
+  mcp_id: mcp1
+  pin: 7
+  output_type: light
+
+- id: OUT_10
+  kind: mcp
+  mcp_id: mcp1
+  pin: 6
+  output_type: light
+
+- id: OUT_11
+  kind: mcp
+  mcp_id: mcp1
+  pin: 5
+  output_type: light
+
+- id: OUT_12
+  kind: mcp
+  mcp_id: mcp1
+  pin: 4
+  output_type: light
+
+- id: OUT_13
+  kind: mcp
+  mcp_id: mcp1
+  pin: 3
+  output_type: light
+
+- id: OUT_14
+  kind: mcp
+  mcp_id: mcp1
+  pin: 2
+  output_type: light
+
+- id: OUT_15
+  kind: mcp
+  mcp_id: mcp1
+  pin: 1
+  output_type: light
+
+- id: OUT_16
+  kind: mcp
+  mcp_id: mcp1
+  pin: 0
+  output_type: light
+
+- id: OUT_17
+  kind: mcp
+  mcp_id: mcp2
+  pin: 8
+  output_type: light
+
+- id: OUT_18
+  kind: mcp
+  mcp_id: mcp2
+  pin: 9
+  output_type: light
+
+- id: OUT_19
+  kind: mcp
+  mcp_id: mcp2
+  pin: 10
+  output_type: light
+
+- id: OUT_20
+  kind: mcp
+  mcp_id: mcp2
+  pin: 11
+  output_type: light
+
+- id: OUT_21
+  kind: mcp
+  mcp_id: mcp2
+  pin: 12
+  output_type: light
+
+- id: OUT_22
+  kind: mcp
+  mcp_id: mcp2
+  pin: 13
+  output_type: light
+
+- id: OUT_23
+  kind: mcp
+  mcp_id: mcp2
+  pin: 14
+  output_type: light
+
+- id: OUT_24
+  kind: mcp
+  mcp_id: mcp2
+  pin: 15
+  output_type: light
+
+- id: OUT_25
+  kind: mcp
+  mcp_id: mcp1
+  pin: 8
+  output_type: light
+
+- id: OUT_26
+  kind: mcp
+  mcp_id: mcp1
+  pin: 9
+  output_type: light
+
+- id: OUT_27
+  kind: mcp
+  mcp_id: mcp1
+  pin: 10
+  output_type: light
+
+- id: OUT_28
+  kind: mcp
+  mcp_id: mcp1
+  pin: 11
+  output_type: light
+
+- id: OUT_29
+  kind: mcp
+  mcp_id: mcp1
+  pin: 12
+  output_type: light
+
+- id: OUT_30
+  kind: mcp
+  mcp_id: mcp1
+  pin: 13
+  output_type: light
+
+- id: OUT_31
+  kind: mcp
+  mcp_id: mcp1
+  pin: 14
+  output_type: light
+
+- id: OUT_32
+  kind: mcp
+  mcp_id: mcp1
+  pin: 15
+  output_type: light

{boneIO-0.8.0.dev6 → boneIO-0.8.0.dev8}/boneio/group/output.py

@@ -1,4 +1,5 @@
 """Group output module."""
+
 from __future__ import annotations
 import asyncio
 from typing import List
@@ -13,26 +14,46 @@ class OutputGroup(BasicRelay):
         self,
         members: List[BasicRelay],
         output_type: str = SWITCH,
-        restored_state: bool = True,
+        restored_state: bool = False,
+        all_on_behaviour: bool = False,
         **kwargs,
     ) -> None:
         """Initialize cover class."""
         self._loop = asyncio.get_event_loop()
         super().__init__(
-            **kwargs, output_type=output_type, restored_state=restored_state, topic_type="group"
+            **kwargs,
+            output_type=output_type,
+            restored_state=False,
+            topic_type="group",
         )
+        self._all_on_behaviour = all_on_behaviour
         self._group_members = [x for x in members if x.output_type != COVER]
         self._timer_handle = None
+        self.check_state()
+
         for member in self._group_members:
-            self._event_bus.add_output_listener(member.id, self.event_listener)
+            self._event_bus.add_output_listener(
+                output_id=member.id,
+                group_id=self.id,
+                target=self.event_listener,
+            )
 
-    async def event_listener(self, relay_id=None) -> None:
-        """Listen for events called by children relays."""
-        state = OFF
+    def check_state(self) -> None:
         for x in self._group_members:
             if x.state == ON:
-                state = ON
-                break
+                self._state = ON
+                return
+
+    async def event_listener(self, relay_id=None) -> None:
+        """Listen for events called by children relays."""
+        if self._all_on_behaviour:
+            state = (
+                ON if all(x.state == ON for x in self._group_members) else OFF
+            )
+        else:
+            state = (
+                ON if any(x.state == ON for x in self._group_members) else OFF
+            )
         if state != self._state or not relay_id:
             self._state = state
             self._loop.call_soon_threadsafe(self.send_state)
@@ -40,13 +61,19 @@ class OutputGroup(BasicRelay):
     async def async_turn_on(self) -> None:
         """Call turn on action."""
         await asyncio.gather(
-            *[self._loop.run_in_executor(self.executor, x.turn_on) for x in self._group_members]
+            *[
+                self._loop.run_in_executor(self.executor, x.turn_on)
+                for x in self._group_members
+            ]
         )
 
     async def async_turn_off(self) -> None:
         """Call turn off action."""
         await asyncio.gather(
-            *[self._loop.run_in_executor(self.executor, x.turn_off) for x in self._group_members]
+            *[
+                self._loop.run_in_executor(self.executor, x.turn_off)
+                for x in self._group_members
+            ]
         )
 
     @property
@@ -56,4 +83,6 @@ class OutputGroup(BasicRelay):
 
     def send_state(self) -> None:
         """Send state to Mqtt on action."""
-        self._send_message(topic=self._send_topic, payload=self.payload(), retain=True)
+        self._send_message(
+            topic=self._send_topic, payload=self.payload(), retain=True
+        )

{boneIO-0.8.0.dev6 → boneIO-0.8.0.dev8}/boneio/helper/events.py

@@ -4,7 +4,7 @@ import logging
 import signal
 import time
 from datetime import datetime
-from typing import Any, Coroutine, List, Optional, Callable, Optional
+from typing import Any, Coroutine, List, Optional, Callable
 
 
 from boneio.helper.util import callback
@@ -85,7 +85,9 @@ class EventBus:
         self._output_listeners = {}
         self._sigterm_listeners = []
         self._haonline_listeners = []
-        self._timer_handle = _async_create_timer(self._loop, self._run_second_event)
+        self._timer_handle = _async_create_timer(
+            self._loop, self._run_second_event
+        )
         for signame in {"SIGINT", "SIGTERM"}:
             self._loop.add_signal_handler(
                 getattr(signal, signame),
@@ -121,17 +123,19 @@ class EventBus:
         """Add sigterm listener."""
         self._sigterm_listeners.append(target)
 
-    def add_output_listener(self, name, target):
+    def add_output_listener(self, output_id, group_id, target):
         """Add output listener."""
-        self._output_listeners[name] = ListenerJob(target=target)
-        return self._output_listeners[name]
-    
+        if output_id not in self._output_listeners:
+            self._output_listeners[output_id] = {}
+        self._output_listeners[output_id][group_id] = ListenerJob(target=target)
+        return self._output_listeners[output_id]
+
     def trigger_output_event(self, event):
         asyncio.create_task(self.async_trigger_output_event(event=event))
-    
+
     async def async_trigger_output_event(self, event):
-        listener = self._output_listeners.get(event)
-        if listener:
+        listeners = self._output_listeners.get(event, {})
+        for listener in listeners.values():
             await listener.target(event)
 
     def add_haonline_listener(self, target):

{boneIO-0.8.0.dev6 → boneIO-0.8.0.dev8}/boneio/helper/loader.py

@@ -15,7 +15,6 @@ from boneio.const import (
     DEVICE_CLASS,
     FILTERS,
     GPIO,
-    PCA,
     ID,
     INIT_SLEEP,
     INPUT,
@@ -135,6 +134,8 @@ def create_temp_sensor(
     else:
         return
     name = config.get(ID)
+    if not name:
+        return
     id = name.replace(" ", "")
     try:
         temp_sensor = TempSensor(