boneIO 0.11.0__tar.gz → 0.11.0.dev2__tar.gz

{boneio-0.11.0 → boneio-0.11.0.dev2}/PKG-INFO

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

{boneio-0.11.0 → boneio-0.11.0.dev2}/boneio/const.py

@@ -32,8 +32,6 @@ PCA = "pca"
 GPIO_MODE = "gpio_mode"
 ACTIONS = "actions"
 ACTION = "action"
-OUTPUT_OVER_MQTT = "output_over_mqtt"
-COVER_OVER_MQTT = "cover_over_mqtt"
 SWITCH = "switch"
 LIGHT = "light"
 BUTTON = "button"
@@ -165,9 +163,6 @@ cover_actions = {
     "STOP": "stop",
     "TOGGLE_OPEN": "toggle_open",
     "TOGGLE_CLOSE": "toggle_close",
-    "TILT": "set_tilt",
-    'TILT_OPEN': 'tilt_open',
-    'TILT_CLOSE': 'tilt_close',
 }
 
 INA219 = "ina219"

boneio-0.11.0/boneio/cover/previous.py → boneio-0.11.0.dev2/boneio/cover.py

@@ -24,7 +24,7 @@ from boneio.models import CoverState
 from boneio.relay import MCPRelay
 
 _LOGGER = logging.getLogger(__name__)
-DEFAULT_RESTORED_STATE = {"position": 100}
+
 COVER_COMMANDS = {
     OPEN: "open_cover",
     CLOSE: "close_cover",
@@ -53,7 +53,7 @@ class RelayHelper:
         return self._steps
 
 
-class PreviousCover(BasicMqtt):
+class Cover(BasicMqtt):
     """Cover class of boneIO"""
 
     def __init__(
@@ -65,7 +65,7 @@ class PreviousCover(BasicMqtt):
         open_time: TimePeriod,
         close_time: TimePeriod,
         event_bus: EventBus,
-        restored_state: dict = DEFAULT_RESTORED_STATE,
+        restored_state: int = 100,
         **kwargs,
     ) -> None:
         """Initialize cover class."""
@@ -78,7 +78,7 @@ class PreviousCover(BasicMqtt):
         self._close = RelayHelper(relay=close_relay, time=close_time)
         self._set_position = None
         self._current_operation = IDLE
-        self._position = float(restored_state.get("position", DEFAULT_RESTORED_STATE["position"]))
+        self._position = restored_state
         self._requested_closing = True
         self._event_bus = event_bus
         self._timer_handle = None
@@ -142,7 +142,6 @@ class PreviousCover(BasicMqtt):
             name=self.name,
             state=self.state,
             position=round(self._position, 0),
-            kind=self.kind,
             timestamp=self.last_timestamp,
             current_operation=self._current_operation,
         )
@@ -150,12 +149,12 @@ class PreviousCover(BasicMqtt):
 
     def send_state(self) -> None:
         """Send state of cover to mqtt."""
-        self._message_bus.send_message(
+        self._send_message(
             topic=f"{self._send_topic}/state", payload=self.state
         )
         pos = round(self._position, 0)
-        self._message_bus.send_message(topic=f"{self._send_topic}/pos", payload={ "position": str(pos) })
-        self._state_save(value={"position": pos})
+        self._send_message(topic=f"{self._send_topic}/pos", payload=str(pos))
+        self._state_save(position=pos)
 
     def _stop_cover(self, on_exit=False) -> None:
         """Stop cover."""
@@ -201,7 +200,7 @@ class PreviousCover(BasicMqtt):
                 rounded_pos = 100
             elif rounded_pos < 0:
                 rounded_pos = 0
-        self._message_bus.send_message(topic=f"{self._send_topic}/pos", payload={"position": str(rounded_pos)})
+        self._send_message(topic=f"{self._send_topic}/pos", payload=rounded_pos)
         asyncio.create_task(self.async_send_state())
         if rounded_pos == self._set_position or (
             self._set_position is None
@@ -224,7 +223,7 @@ class PreviousCover(BasicMqtt):
         _LOGGER.info("Closing cover %s.", self._id)
 
         self._requested_closing = True
-        self._message_bus.send_message(topic=f"{self._send_topic}/state", payload=CLOSING)
+        self._send_message(topic=f"{self._send_topic}/state", payload=CLOSING)
         await self.run_cover(
             current_operation=CLOSING,
         )
@@ -239,7 +238,7 @@ class PreviousCover(BasicMqtt):
         _LOGGER.info("Opening cover %s.", self._id)
 
         self._requested_closing = False
-        self._message_bus.send_message(topic=f"{self._send_topic}/state", payload=OPENING)
+        self._send_message(topic=f"{self._send_topic}/state", payload=OPENING)
         await self.run_cover(
             current_operation=OPENING,
         )
@@ -261,7 +260,7 @@ class PreviousCover(BasicMqtt):
             set_position,
             current_operation,
         )
-        self._message_bus.send_message(
+        self._send_message(
             topic=f"{self._send_topic}/state", payload=current_operation
         )
         await self.run_cover(
@@ -308,11 +307,3 @@ class PreviousCover(BasicMqtt):
     @property
     def current_operation(self) -> str:
         return self._current_operation
-
-    @property
-    def kind(self) -> str:
-        return "previous"
-    
-    def update_config_times(self, config: dict) -> None:
-        self._open_duration = config.get("open_duration", self._open_duration)
-        self._close_duration = config.get("close_duration", self._close_duration)

{boneio-0.11.0 → boneio-0.11.0.dev2}/boneio/group/output.py

@@ -78,6 +78,6 @@ class OutputGroup(BasicRelay):
 
     async def async_send_state(self) -> None:
         """Send state to Mqtt on action."""
-        self._message_bus.send_message(
+        self._send_message(
             topic=self._send_topic, payload=self.payload(), retain=True
         )

{boneio-0.11.0 → boneio-0.11.0.dev2}/boneio/helper/__init__.py

@@ -1,13 +1,7 @@
 """Helper dir for BoneIO."""
 
-from boneio.helper.async_updater import AsyncUpdater
+from boneio.helper.exceptions import GPIOInputException, GPIOOutputException, I2CError
 from boneio.helper.click_timer import ClickTimer
-from boneio.helper.exceptions import (
-    CoverConfigurationException,
-    GPIOInputException,
-    GPIOOutputException,
-    I2CError,
-)
 from boneio.helper.gpio import (
     GpioBaseClass,
     configure_pin,
@@ -22,14 +16,15 @@ from boneio.helper.ha_discovery import (
     ha_binary_sensor_availabilty_message,
     ha_button_availabilty_message,
     ha_event_availabilty_message,
-    ha_led_availabilty_message,
     ha_light_availabilty_message,
     ha_sensor_availabilty_message,
-    ha_sensor_ina_availabilty_message,
     ha_sensor_temp_availabilty_message,
     ha_switch_availabilty_message,
+    ha_led_availabilty_message,
+    ha_sensor_ina_availabilty_message
 )
 from boneio.helper.mqtt import BasicMqtt
+from boneio.helper.async_updater import AsyncUpdater
 from boneio.helper.oled import make_font
 from boneio.helper.queue import UniqueQueue
 from boneio.helper.state_manager import StateManager
@@ -63,7 +58,6 @@ __all__ = [
     "ha_sensor_ina_availabilty_message",
     "ha_event_availabilty_message",
     "ha_led_availabilty_message",
-    "CoverConfigurationException",
     "GPIOInputException",
     "GPIOOutputException",
     "I2CError",

{boneio-0.11.0 → boneio-0.11.0.dev2}/boneio/helper/config.py

@@ -3,7 +3,6 @@ Module to provide basic config options.
 """
 from __future__ import annotations
 
-import logging
 from _collections_abc import dict_values
 from typing import Union
 
@@ -19,9 +18,6 @@ from boneio.const import (
     SWITCH,
     VALVE,
 )
-from boneio.helper.util import sanitize_mqtt_topic
-
-_LOGGER = logging.getLogger(__name__)
 
 
 class ConfigHelper:
@@ -32,12 +28,9 @@ class ConfigHelper:
         device_type: str = "boneIO Black",
         ha_discovery: bool = True,
         ha_discovery_prefix: str = HOMEASSISTANT,
-        network_info: dict = None,
-        is_web_active: bool = False,
     ):
         self._name = name
-        sanitized_topic_prefix = sanitize_mqtt_topic(topic_prefix) if topic_prefix else sanitize_mqtt_topic(name)
-        self._topic_prefix = sanitized_topic_prefix
+        self._topic_prefix = topic_prefix if topic_prefix else name
         self._ha_discovery = ha_discovery
         self._ha_discovery_prefix = ha_discovery_prefix
         self._device_type = device_type
@@ -53,16 +46,6 @@ class ConfigHelper:
             VALVE: {},
         }
         self.manager_ready: bool = False
-        self._network_info = network_info
-        self._is_web_active = is_web_active
-
-    @property
-    def network_info(self) -> dict:
-        return self._network_info
-
-    @property
-    def is_web_active(self) -> bool:
-        return self._is_web_active
 
     @property
     def topic_prefix(self) -> str:

{boneio-0.11.0 → boneio-0.11.0.dev2}/boneio/helper/exceptions.py

@@ -24,8 +24,6 @@ class OneWireError(BoneIOException):
 class ConfigurationException(BoneIOException):
     """Configuration yaml exception."""
 
-class CoverConfigurationException(BoneIOException):
-    """Cover configuration exception."""
 
 class CoverRelayException(BoneIOException):
     """Cover configuration exception."""

{boneio-0.11.0 → boneio-0.11.0.dev2}/boneio/helper/filter.py

@@ -1,9 +1,8 @@
 """Filter class to adjust sensor values."""
 
 from __future__ import annotations
-
-import logging
 from typing import Optional
+import logging
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -14,7 +13,7 @@ FILTERS = {
     "multiply": lambda x, y: x * y if x else x,
     "filter_out": lambda x, y: None if x == y else x,
     "filter_out_greater": lambda x, y: None if x > y else x,
-    "filter_out_lower": lambda x, y: None if x < y else x
+    "filter_out_lower": lambda x, y: None if x < y else x,
 }
 
 

{boneio-0.11.0 → boneio-0.11.0.dev2}/boneio/helper/ha_discovery.py

@@ -26,7 +26,6 @@ def ha_availabilty_message(
     id: str,
     name: str,
     topic: str = "boneIO",
-    device_name: str = "boneIO",
     device_type: str = INPUT,
     model: str = "boneIO Relay Board",
     web_url: str | None = None,
@@ -43,36 +42,16 @@ def ha_availabilty_message(
             "identifiers": [topic],
             "manufacturer": "boneIO",
             "model": model,
-            "name": device_name,
+            "name": f"boneIO {topic}",
             "sw_version": __version__,
             **web_url
         },
         "name": name,
         "state_topic": f"{topic}/{device_type}/{id}",
         "unique_id": f"{topic}{device_type}{id}",
-        # "object_id": f"{topic}{device_type}{id}",
         **kwargs,
     }
 
-def ha_virtual_energy_sensor_discovery_message(
-    topic: str,
-    relay_id: str,
-    **kwargs
-) -> dict[str, str]:
-    """
-    Generate MQTT autodiscovery messages for Home Assistant for virtual power and energy sensors.
-    Returns two dicts:
-     - sensor.<id>_power: current power in W
-     - sensor.<id>_energy: total energy in Wh
-    """
-    # Power sensor discovery
-    msg = ha_availabilty_message(
-        state_topic=f"{topic}/energy/{relay_id}",
-        topic=topic,
-        **kwargs,
-    )
-    return msg
-
 
 def ha_light_availabilty_message(id: str, topic: str = "boneIO", device_type: str = RELAY, **kwargs):
     """Create LIGHT availability topic for HA."""
@@ -145,9 +124,10 @@ def ha_adc_sensor_availabilty_message(**kwargs):
     return msg
 
 
-def ha_sensor_availabilty_message(device_type: str = SENSOR, **kwargs):
-    msg = ha_availabilty_message(device_type=device_type, **kwargs)
-    return msg
+def ha_sensor_availabilty_message(unit_of_measurement: str = None, **kwargs):
+    msg = ha_availabilty_message(device_type=SENSOR, **kwargs)
+    if not unit_of_measurement:
+        return msg
 
 
 def ha_binary_sensor_availabilty_message(id: str, name: str, device_class: str, topic: str = "boneIO", model: str = "boneIO Relay Board", **kwargs):
@@ -228,12 +208,12 @@ def modbus_sensor_availabilty_message(
 ):
     """Create Modbus Sensor availability topic for HA."""
     return {
-        "availability": [{"topic": f"{topic}/{id}/{STATE}"}],
+        "availability": [{"topic": f"{topic}/{id}{STATE}"}],
         "device": {
             "identifiers": [id],
             "manufacturer": "boneIO",
             "model": model,
-            "name": name,
+            "name": f"boneIO {name.upper()}",
             "sw_version": __version__,
         },
         "name": sensor_id,
@@ -264,36 +244,5 @@ def ha_cover_availabilty_message(
         "state_closed": CLOSED,
         "state_closing": CLOSING,
         "state_topic": f"{topic}/{COVER}/{id}/state",
-        "position_template": '{{ value_json.position }}',
-        "position_topic": f"{topic}/{COVER}/{id}/pos",
-    }
-
-
-def ha_cover_with_tilt_availabilty_message(
-    id: str, name: str, device_class: str, topic: str = "boneIO", model: str = "boneIO Relay Board", **kwargs
-):
-    """Create Cover with tilt availability topic for HA."""
-    kwargs = {"device_class": device_class, **kwargs} if device_class else { **kwargs }
-    msg = ha_availabilty_message(
-        device_type=COVER, topic=topic, id=id, name=name, model=model, **kwargs
-    )
-
-    return {
-        **msg,
-        "command_topic": f"{topic}/cmd/cover/{id}/set",
-        "set_position_topic": f"{topic}/cmd/cover/{id}/pos",
-        "tilt_command_topic": f"{topic}/cmd/cover/{id}/tilt",
-        "payload_open": OPEN,
-        "payload_close": CLOSE,
-        "payload_stop": STOP,
-        "payload_stop_tilt": STOP,
-        "state_open": OPEN,
-        "state_opening": OPENING,
-        "state_closed": CLOSED,
-        "state_closing": CLOSING,
-        "state_topic": f"{topic}/{COVER}/{id}/state",
         "position_topic": f"{topic}/{COVER}/{id}/pos",
-        "tilt_status_topic": f"{topic}/{COVER}/{id}/pos",
-        "position_template": '{{ value_json.position }}',
-        "tilt_status_template": '{{ value_json.tilt }}',
     }