boneIO 1.3.1__tar.gz → 1.3.1.dev1__tar.gz

{boneio-1.3.1/boneio.egg-info → boneio-1.3.1.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boneio
-Version: 1.3.1
+Version: 1.3.1.dev1
 Summary: Python App for BoneIO
 Author-email: Paweł Szafer <pszafer@gmail.com>
 License: GNU General Public License v3.0

{boneio-1.3.1 → boneio-1.3.1.dev1}/boneio/boards/0.2/input.yaml

@@ -1,8 +1,10 @@
 input_mapping:
   in_01:
     pin: P8_37
+    gpio_mode: gpio_pu
   in_02:
     pin: P8_38
+    gpio_mode: gpio_pu
   in_03:
     pin: P8_39
   in_04:
@@ -17,8 +19,10 @@ input_mapping:
     pin: P8_44
   in_09:
     pin: P8_45
+    gpio_mode: gpio_pu
   in_10:
     pin: P8_46
+    gpio_mode: gpio_pu
   in_11:
     pin: P9_42
   in_12:
@@ -37,8 +41,10 @@ input_mapping:
     pin: P9_23
   in_19:
     pin: P9_22
+    gpio_mode: gpio_pu
   in_20:
     pin: P9_21
+    gpio_mode: gpio_pu
   in_21:
     pin: P9_18
   in_22:
@@ -53,20 +59,28 @@ input_mapping:
     pin: P9_13
   in_27:
     pin: P9_12
+    gpio_mode: gpio_pu
   in_28:
     pin: P9_11
+    gpio_mode: gpio_pu
   in_29:
     pin: P8_36
+    gpio_mode: gpio_pu
   in_30:
     pin: P8_35
+    gpio_mode: gpio_pu
   in_31:
     pin: P8_34
+    gpio_mode: gpio_pu
   in_32:
     pin: P8_33
+    gpio_mode: gpio_pu
   in_33:
     pin: P8_32
+    gpio_mode: gpio_pu
   in_34:
     pin: P8_31
+    gpio_mode: gpio_pu
   in_35:
     pin: P8_30
   in_36:

{boneio-1.3.1 → boneio-1.3.1.dev1}/boneio/boards/0.3/input.yaml

@@ -1,8 +1,10 @@
 input_mapping:
   in_01:
     pin: P8_37
+    gpio_mode: gpio_pu
   in_02:
     pin: P8_38
+    gpio_mode: gpio_pu
   in_03:
     pin: P8_39
   in_04:
@@ -17,8 +19,10 @@ input_mapping:
     pin: P8_44
   in_09:
     pin: P8_45
+    gpio_mode: gpio_pu
   in_10:
     pin: P8_46
+    gpio_mode: gpio_pu
   in_11:
     pin: P9_42
   in_12:
@@ -37,8 +41,10 @@ input_mapping:
     pin: P9_23
   in_19:
     pin: P9_22
+    gpio_mode: gpio_pu
   in_20:
     pin: P9_21
+    gpio_mode: gpio_pu
   in_21:
     pin: P9_18
   in_22:
@@ -53,20 +59,28 @@ input_mapping:
     pin: P9_13
   in_27:
     pin: P9_12
+    gpio_mode: gpio_pu
   in_28:
     pin: P9_11
+    gpio_mode: gpio_pu
   in_29:
     pin: P8_36
+    gpio_mode: gpio_pu
   in_30:
     pin: P8_35
+    gpio_mode: gpio_pu
   in_31:
     pin: P8_34
+    gpio_mode: gpio_pu
   in_32:
     pin: P8_33
+    gpio_mode: gpio_pu
   in_33:
     pin: P8_32
+    gpio_mode: gpio_pu
   in_34:
     pin: P8_31
+    gpio_mode: gpio_pu
   in_35:
     pin: P8_30
   in_36:

{boneio-1.3.1 → boneio-1.3.1.dev1}/boneio/boards/0.4/input.yaml

@@ -1,8 +1,10 @@
 input_mapping:
   in_01:
     pin: P8_37
+    gpio_mode: gpio_pu
   in_02:
     pin: P8_38
+    gpio_mode: gpio_pu
   in_03:
     pin: P8_39
   in_04:
@@ -17,8 +19,10 @@ input_mapping:
     pin: P8_44
   in_09:
     pin: P8_45
+    gpio_mode: gpio_pu
   in_10:
     pin: P8_46
+    gpio_mode: gpio_pu
   in_11:
     pin: P9_42
   in_12:
@@ -37,8 +41,10 @@ input_mapping:
     pin: P9_23
   in_19:
     pin: P9_22
+    gpio_mode: gpio_pu
   in_20:
     pin: P9_21
+    gpio_mode: gpio_pu
   in_21:
     pin: P9_18
   in_22:
@@ -53,20 +59,28 @@ input_mapping:
     pin: P9_13
   in_27:
     pin: P9_12
+    gpio_mode: gpio_pu
   in_28:
     pin: P9_11
+    gpio_mode: gpio_pu
   in_29:
     pin: P8_36
+    gpio_mode: gpio_pu
   in_30:
     pin: P8_35
+    gpio_mode: gpio_pu
   in_31:
     pin: P8_34
+    gpio_mode: gpio_pu
   in_32:
     pin: P8_33
+    gpio_mode: gpio_pu
   in_33:
     pin: P8_32
+    gpio_mode: gpio_pu
   in_34:
     pin: P8_31
+    gpio_mode: gpio_pu
   in_35:
     pin: P8_30
   in_36:

{boneio-1.3.1/boneio/boards/0.6 → boneio-1.3.1.dev1/boneio/boards/0.5}/input.yaml

@@ -1,8 +1,10 @@
 input_mapping:
   in_01:
     pin: P8_37
+    gpio_mode: gpio_pu
   in_02:
     pin: P8_38
+    gpio_mode: gpio_pu
   in_03:
     pin: P8_39
   in_04:
@@ -17,8 +19,10 @@ input_mapping:
     pin: P8_44
   in_09:
     pin: P8_45
+    gpio_mode: gpio_pu
   in_10:
     pin: P8_46
+    gpio_mode: gpio_pu
   in_11:
     pin: P9_42
   in_12:
@@ -37,8 +41,10 @@ input_mapping:
     pin: P9_23
   in_19:
     pin: P9_22
+    gpio_mode: gpio_pu
   in_20:
     pin: P9_21
+    gpio_mode: gpio_pu
   in_21:
     pin: P9_18
   in_22:
@@ -57,16 +63,22 @@ input_mapping:
     pin: P8_9
   in_29:
     pin: P8_36
+    gpio_mode: gpio_pu
   in_30:
     pin: P8_35
+    gpio_mode: gpio_pu
   in_31:
     pin: P8_34
+    gpio_mode: gpio_pu
   in_32:
     pin: P8_33
+    gpio_mode: gpio_pu
   in_33:
     pin: P8_32
+    gpio_mode: gpio_pu
   in_34:
     pin: P8_31
+    gpio_mode: gpio_pu
   in_35:
     pin: P8_30
   in_36:

{boneio-1.3.1/boneio/boards/0.7 → boneio-1.3.1.dev1/boneio/boards/0.6}/input.yaml

@@ -1,8 +1,10 @@
 input_mapping:
   in_01:
     pin: P8_37
+    gpio_mode: gpio_pu
   in_02:
     pin: P8_38
+    gpio_mode: gpio_pu
   in_03:
     pin: P8_39
   in_04:
@@ -17,8 +19,10 @@ input_mapping:
     pin: P8_44
   in_09:
     pin: P8_45
+    gpio_mode: gpio_pu
   in_10:
     pin: P8_46
+    gpio_mode: gpio_pu
   in_11:
     pin: P9_42
   in_12:
@@ -37,8 +41,10 @@ input_mapping:
     pin: P9_23
   in_19:
     pin: P9_22
+    gpio_mode: gpio_pu
   in_20:
     pin: P9_21
+    gpio_mode: gpio_pu
   in_21:
     pin: P9_18
   in_22:
@@ -57,16 +63,22 @@ input_mapping:
     pin: P8_9
   in_29:
     pin: P8_36
+    gpio_mode: gpio_pu
   in_30:
     pin: P8_35
+    gpio_mode: gpio_pu
   in_31:
     pin: P8_34
+    gpio_mode: gpio_pu
   in_32:
     pin: P8_33
+    gpio_mode: gpio_pu
   in_33:
     pin: P8_32
+    gpio_mode: gpio_pu
   in_34:
     pin: P8_31
+    gpio_mode: gpio_pu
   in_35:
     pin: P8_30
   in_36:

{boneio-1.3.1/boneio/boards/0.5 → boneio-1.3.1.dev1/boneio/boards/0.7}/input.yaml

@@ -1,8 +1,10 @@
 input_mapping:
   in_01:
     pin: P8_37
+    gpio_mode: gpio_pu
   in_02:
     pin: P8_38
+    gpio_mode: gpio_pu
   in_03:
     pin: P8_39
   in_04:
@@ -17,8 +19,10 @@ input_mapping:
     pin: P8_44
   in_09:
     pin: P8_45
+    gpio_mode: gpio_pu
   in_10:
     pin: P8_46
+    gpio_mode: gpio_pu
   in_11:
     pin: P9_42
   in_12:
@@ -37,8 +41,10 @@ input_mapping:
     pin: P9_23
   in_19:
     pin: P9_22
+    gpio_mode: gpio_pu
   in_20:
     pin: P9_21
+    gpio_mode: gpio_pu
   in_21:
     pin: P9_18
   in_22:
@@ -57,16 +63,22 @@ input_mapping:
     pin: P8_9
   in_29:
     pin: P8_36
+    gpio_mode: gpio_pu
   in_30:
     pin: P8_35
+    gpio_mode: gpio_pu
   in_31:
     pin: P8_34
+    gpio_mode: gpio_pu
   in_32:
     pin: P8_33
+    gpio_mode: gpio_pu
   in_33:
     pin: P8_32
+    gpio_mode: gpio_pu
   in_34:
     pin: P8_31
+    gpio_mode: gpio_pu
   in_35:
     pin: P8_30
   in_36:

{boneio-1.3.1 → boneio-1.3.1.dev1}/boneio/boards/0.8/input.yaml

@@ -1,10 +1,12 @@
 input_mapping:
   in_01:
     pin: P8_37
+    gpio_mode: gpio_pu
     gpiochip: 1
     line: 14
   in_02:
     pin: P8_38
+    gpio_mode: gpio_pu
     gpiochip: 1
     line: 15
   in_03:
@@ -36,10 +38,12 @@ input_mapping:
     line: 9
   in_09:
     pin: P8_45
+    gpio_mode: gpio_pu
     gpiochip: 1
     line: 6
   in_10:
     pin: P8_46
+    gpio_mode: gpio_pu
     gpiochip: 1
     line: 7
   in_11:
@@ -76,10 +80,12 @@ input_mapping:
     line: 17
   in_19:
     pin: P9_22
+    gpio_mode: gpio_pu
     gpiochip: 3
     line: 2
   in_20:
     pin: P9_21
+    gpio_mode: gpio_pu
     gpiochip: 3
     line: 3
   in_21:
@@ -116,26 +122,32 @@ input_mapping:
     line: 5
   in_29:
     pin: P8_36
+    gpio_mode: gpio_pu
     gpiochip: 1
     line: 16
   in_30:
     pin: P8_35
+    gpio_mode: gpio_pu
     gpiochip: 3
     line: 8
   in_31:
     pin: P8_34
+    gpio_mode: gpio_pu
     gpiochip: 1
     line: 17
   in_32:
     pin: P8_33
+    gpio_mode: gpio_pu
     gpiochip: 3
     line: 9
   in_33:
     pin: P8_32
+    gpio_mode: gpio_pu
     gpiochip: 3
     line: 11
   in_34:
     pin: P8_31
+    gpio_mode: gpio_pu
     gpiochip: 3
     line: 10
   in_35:

{boneio-1.3.1 → boneio-1.3.1.dev1}/boneio/components/cover/cover.py

@@ -7,7 +7,6 @@ import threading
 import time
 from abc import ABC, abstractmethod
 from collections.abc import Callable
-from contextlib import suppress
 
 from boneio.components.output import BasicOutput
 from boneio.const import (
@@ -21,33 +20,31 @@ from boneio.const import (
 from boneio.core.events import EventBus
 from boneio.core.messaging import BasicMqtt
 from boneio.core.utils import TimePeriod
-from boneio.models import CoverState, PositionDict, SavedPositionDict
+from boneio.models import CoverState, PositionDict
 from boneio.models.events import CoverEvent
 
 _LOGGER = logging.getLogger(__name__)
 
-
 class BaseCoverABC(ABC):
     """Base cover class."""
 
     @abstractmethod
-    def __init__(
-        self,
-        id: str,
+    def __init__(self, id: str,
         open_relay: BasicOutput,
         close_relay: BasicOutput,
         state_save: Callable,
         open_time: TimePeriod,
         close_time: TimePeriod,
         event_bus: EventBus,
-        position: float = 100.0,
+        position: int = 100,
         **kwargs,
     ) -> None:
         pass
+        
 
     @abstractmethod
     async def stop(self) -> None:
-        """Stop cover."""
+        """Stop cover.""" 
         pass
 
     @abstractmethod
@@ -80,6 +77,7 @@ class BaseCoverABC(ABC):
         """Set cover position."""
         pass
 
+
     @property
     @abstractmethod
     def state(self) -> str:
@@ -105,16 +103,16 @@ class BaseCoverABC(ABC):
     def kind(self) -> str:
         pass
 
+
     @abstractmethod
-    async def run_cover(self, current_operation: str, target_position: int | None = None, **kwargs) -> None:
+    async def run_cover(self, current_operation: str, target_position: float | None = None,  target_tilt: float | None = None) -> None:
         """This function is called to run cover after calling open, close, toggle, toggle_open, toggle_close, set_cover_position"""
         pass
 
     @abstractmethod
-    def send_state(self, state: str, json_position: PositionDict) -> None:
+    async def send_state(self, state: str, position: float) -> None:
         pass
 
-
 class BaseVenetianCoverABC:
     @property
     @abstractmethod
@@ -148,16 +146,14 @@ class BaseVenetianCoverABC:
 
 
 class BaseCover(BaseCoverABC, BasicMqtt):
-    def __init__(
-        self,
-        id: str,
+    def __init__(self, id: str,
         open_relay: BasicOutput,
         close_relay: BasicOutput,
         state_save: Callable,
         open_time: TimePeriod,
         close_time: TimePeriod,
         event_bus: EventBus,
-        position: float = 100.0,
+        position: int = 100,
         name: str | None = None,
         **kwargs,
     ) -> None:
@@ -173,20 +169,17 @@ class BaseCover(BaseCoverABC, BasicMqtt):
         self._open_time = open_time.total_milliseconds
         self._close_time = close_time.total_milliseconds
         self._position = position
-        self._initial_position: float = position
+        self._initial_position = None
         self._current_operation = IDLE
         self._last_operation = CLOSING
         _LOGGER.debug(
             "BaseCover %s initialized: open_time=%dms, close_time=%dms, initial_position=%d%%",
-            id,
-            self._open_time,
-            self._close_time,
-            position,
+            id, self._open_time, self._close_time, position
         )
 
-        self._last_timestamp = time.time()
+        self._last_timestamp = time.monotonic()
 
-        self._last_update_time = 0.0
+        self._last_update_time = 0
         self._closed = position <= 0
 
         self._movement_thread = None
@@ -194,8 +187,17 @@ class BaseCover(BaseCoverABC, BasicMqtt):
 
         self._event_bus.add_sigterm_listener(self.on_exit)
 
-        with suppress(RuntimeError):
-            self._loop.call_soon_threadsafe(self._loop.call_later, 0.5, self.send_state, self.state, self.json_position)
+        try:
+            self._loop.call_soon_threadsafe(
+                self._loop.call_later,
+                0.5,
+                self.send_state,
+                self.state,
+                self.json_position
+            )
+        except RuntimeError:
+            # Event loop is closed (e.g. during tests)
+            pass
 
     async def on_exit(self) -> None:
         """Stop on exit."""
@@ -208,9 +210,12 @@ class BaseCover(BaseCoverABC, BasicMqtt):
             self._open_relay.turn_off()
             self._close_relay.turn_off()
             # Send relay states to WebSocket (not MQTT - that's handled by output_type check)
-            with suppress(RuntimeError):
+            try:
                 asyncio.create_task(self._open_relay.async_send_state())
                 asyncio.create_task(self._close_relay.async_send_state())
+            except RuntimeError:
+                # Event loop is closed (e.g. during tests or shutdown)
+                pass
             if self._current_operation in (OPENING, CLOSING):
                 self._last_operation = self._current_operation
             self._current_operation = IDLE
@@ -223,10 +228,7 @@ class BaseCover(BaseCoverABC, BasicMqtt):
         estimated_time_s = (100 - self._position) / 100 * self._open_time / 1000
         _LOGGER.info(
             "Opening cover %s from position %d%%. Estimated time: %.1fs (open_time=%dms)",
-            self._id,
-            self._position,
-            estimated_time_s,
-            self._open_time,
+            self._id, self._position, estimated_time_s, self._open_time
         )
         self._last_operation = OPENING
         await self.run_cover(current_operation=OPENING)
@@ -238,10 +240,7 @@ class BaseCover(BaseCoverABC, BasicMqtt):
         estimated_time_s = self._position / 100 * self._close_time / 1000
         _LOGGER.info(
             "Closing cover %s from position %d%%. Estimated time: %.1fs (close_time=%dms)",
-            self._id,
-            self._position,
-            estimated_time_s,
-            self._close_time,
+            self._id, self._position, estimated_time_s, self._close_time
         )
         self._last_operation = CLOSING
         await self.run_cover(current_operation=CLOSING)
@@ -259,22 +258,14 @@ class BaseCover(BaseCoverABC, BasicMqtt):
             estimated_time_s = position_diff / 100 * self._open_time / 1000
             _LOGGER.info(
                 "Setting cover %s position from %d%% to %d%% (OPENING). Estimated time: %.1fs (open_time=%dms)",
-                self._id,
-                self._position,
-                position,
-                estimated_time_s,
-                self._open_time,
+                self._id, self._position, position, estimated_time_s, self._open_time
             )
             await self.run_cover(current_operation=OPENING, target_position=position)
         elif position < self._position:
             estimated_time_s = position_diff / 100 * self._close_time / 1000
             _LOGGER.info(
                 "Setting cover %s position from %d%% to %d%% (CLOSING). Estimated time: %.1fs (close_time=%dms)",
-                self._id,
-                self._position,
-                position,
-                estimated_time_s,
-                self._close_time,
+                self._id, self._position, position, estimated_time_s, self._close_time
             )
             await self.run_cover(current_operation=CLOSING, target_position=position)
 
@@ -316,9 +307,7 @@ class BaseCover(BaseCoverABC, BasicMqtt):
         """
         _LOGGER.debug(
             "Smart toggle cover %s (position=%d%%, threshold=%d%%)",
-            self._id,
-            self._position,
-            always_open_till,
+            self._id, self._position, always_open_till,
         )
         if self._current_operation != IDLE:
             await self.stop()
@@ -343,10 +332,10 @@ class BaseCover(BaseCoverABC, BasicMqtt):
     @property
     def is_open(self) -> bool:
         """Whether the cover is currently open (position > 0).
-
+        
         Used by the action conditions system to evaluate ``is_open`` / ``is_closed``
         checks for covers.
-
+        
         Returns:
             True if the cover is not fully closed.
         """
@@ -354,8 +343,7 @@ class BaseCover(BaseCoverABC, BasicMqtt):
 
     @property
     def position(self) -> int:
-        """Return current cover position as integer (0-100)."""
-        return round(self._position)
+        return round(self._position, 0)
 
     @property
     def json_position(self) -> PositionDict:
@@ -377,18 +365,15 @@ class BaseCover(BaseCoverABC, BasicMqtt):
             kind=self.kind,
             timestamp=self._last_timestamp,
             current_operation=self._current_operation,
-            **json_position,
+            **json_position
         )
-        self._event_bus.trigger_event(CoverEvent(entity_id=self.id, state=event))
+        self._event_bus.trigger_event(CoverEvent(
+            entity_id=self.id,
+            state=event
+        ))
         self._message_bus.send_message(topic=f"{self._send_topic}/state", payload=state)
         self._message_bus.send_message(topic=f"{self._send_topic}/pos", payload=json.dumps(json_position))
 
-    @property
-    def saved_position(self) -> SavedPositionDict:
-        """Raw float position for disk persistence."""
-        return {"position": self._position}
-
     def send_state_and_save(self, json_position: PositionDict):
-        """Send state to MQTT/WebSocket and save raw float position to disk."""
         self.send_state(self.state, json_position)
-        self._state_save(self.saved_position)
+        self._state_save(json_position)