boneIO 0.10.0.dev2__tar.gz → 0.10.1__tar.gz

{boneio-0.10.0.dev2 → boneio-0.10.1}/PKG-INFO

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

{boneio-0.10.0.dev2 → boneio-0.10.1}/boneio/cover.py

@@ -127,13 +127,7 @@ class Cover(BasicMqtt):
         """Current state of cover."""
         return CLOSED if self._closed else OPEN
 
-    def stop(self) -> None:
-        """Public Stop cover graceful."""
-        _LOGGER.info("Stopping cover %s.", self._id)
-        if self._current_operation != IDLE:
-            self._stop_cover(on_exit=False)
-
-    async def async_stop(self) -> None:
+    async def stop(self) -> None:
         """Public Stop cover graceful."""
         _LOGGER.info("Stopping cover %s.", self._id)
         if self._current_operation != IDLE:
@@ -291,14 +285,14 @@ class Cover(BasicMqtt):
     async def toggle_open(self) -> None:
         _LOGGER.debug("Toggle open cover %s from input.", self._id)
         if self._current_operation != IDLE:
-            await self.async_stop()
+            await self.stop()
         else:
             await self.open()
 
     async def toggle_close(self) -> None:
         _LOGGER.debug("Toggle close cover %s from input.", self._id)
         if self._current_operation != IDLE:
-            await self.async_stop()
+            await self.stop()
         else:
             await self.close()
 

{boneio-0.10.0.dev2 → boneio-0.10.1}/boneio/example_config/24x16/config.yaml

@@ -14,8 +14,10 @@ oled:
     - web
 
 lm75:
-  - id: temp
+  - id: Board temperature
     address: 0x48
+ina219:
+  - address: 0x40
 
 event: !include event.yaml
 binary_sensor: !include binary_sensor.yaml

boneio-0.10.1/boneio/example_config/32x10/binary_sensor.yaml

@@ -0,0 +1,111 @@
+## Default config for binary sensor entities.
+# Binary sensor entities send on/off message to Home Assistant and run on pressed and released action.
+# PINs are shared between event.yaml and binary_sensor.yaml.
+# Don't duplicate PINs.
+
+- id: IN_01
+  boneio_input: IN_01
+  actions:
+    pressed:
+      - action: output
+        pin: OUT_01
+- id: IN_02
+  boneio_input: IN_02
+  actions:
+    pressed:
+      - action: output
+        pin: OUT_02
+# - id: IN_03
+#   boneio_input: IN_03
+# - id: IN_04
+#   boneio_input: IN_04
+# - id: IN_05
+#   boneio_input: IN_05
+# - id: IN_06
+#   boneio_input: IN_06
+# - id: IN_07
+#   boneio_input: IN_07
+# - id: IN_08
+#   boneio_input: IN_08
+# - id: IN_09
+#   boneio_input: IN_09
+# - id: IN_10
+#   boneio_input: IN_10
+# - id: IN_11
+#   boneio_input: IN_11
+# - id: IN_12
+#   boneio_input: IN_12
+# - id: IN_13
+#   boneio_input: IN_13
+# - id: IN_14
+#   boneio_input: IN_14
+# - id: IN_15
+#   boneio_input: IN_15
+# - id: IN_16
+#   boneio_input: IN_16
+# - id: IN_17
+#   boneio_input: IN_17
+# - id: IN_18
+#   boneio_input: IN_18
+# - id: IN_19
+#   boneio_input: IN_19
+# - id: IN_20
+#   boneio_input: IN_20
+# - id: IN_21
+#   boneio_input: IN_21
+# - id: IN_22
+#   boneio_input: IN_22
+# - id: IN_23
+#   boneio_input: IN_23
+# - id: IN_24
+#   boneio_input: IN_24
+# - id: IN_25
+#   boneio_input: IN_25
+# - id: IN_26
+#   boneio_input: IN_26
+# - id: IN_27
+#   boneio_input: IN_27
+# - id: IN_28
+#   boneio_input: IN_28
+# - id: IN_29
+#   boneio_input: IN_29
+# - id: IN_30
+#   boneio_input: IN_30
+# - id: IN_31
+#   boneio_input: IN_31
+# - id: IN_32
+#   boneio_input: IN_32
+# - id: IN_33
+#   boneio_input: IN_33
+# - id: IN_34
+#   boneio_input: IN_34
+# - id: IN_35
+#   boneio_input: IN_35
+# - id: IN_36
+#   boneio_input: IN_36
+# - id: IN_37
+#   boneio_input: IN_37
+# - id: IN_38
+#   boneio_input: IN_38
+# - id: IN_39
+#   boneio_input: IN_39
+# - id: IN_40
+#   boneio_input: IN_40
+# - id: IN_41
+#   boneio_input: IN_41
+# - id: IN_42
+#   boneio_input: IN_42
+# - id: IN_43
+#   boneio_input: IN_43
+# - id: IN_44
+#   boneio_input: IN_44
+# - id: IN_45
+#   boneio_input: IN_45
+# - id: IN_46
+#   boneio_input: IN_46
+# - id: IN_47
+#   boneio_input: IN_47
+# - id: IN_48
+#   boneio_input: IN_48
+# - id: IN_49
+#   boneio_input: IN_49

{boneio-0.10.0.dev2 → boneio-0.10.1}/boneio/example_config/32x10/config.yaml

@@ -14,8 +14,10 @@ oled:
     - web
 
 lm75:
-  - id: temp
+  - id: Board temperature
     address: 0x48
+ina219:
+  - address: 0x40
 
 event: !include event.yaml
 binary_sensor: !include binary_sensor.yaml

{boneio-0.10.0.dev2 → boneio-0.10.1}/boneio/example_config/cover/config.yaml

@@ -14,8 +14,10 @@ oled:
     - web
 
 lm75:
-  - id: temp
+  - id: Board temperature
     address: 0x48
+ina219:
+  - address: 0x40
 
 event: !include event.yaml
 binary_sensor: !include binary_sensor.yaml

boneio-0.10.1/boneio/example_config/cover_mix/binary_sensor.yaml

@@ -0,0 +1 @@
+../cover/binary_sensor.yaml

{boneio-0.10.0.dev2 → boneio-0.10.1}/boneio/example_config/cover_mix/config.yaml

@@ -14,8 +14,10 @@ oled:
     - web
 
 lm75:
-  - id: temp
+  - id: Board temperature
     address: 0x48
+ina219:
+  - address: 0x40
 
 event: !include event.yaml
 binary_sensor: !include binary_sensor.yaml

{boneio-0.10.0.dev2 → boneio-0.10.1}/boneio/helper/config.py

@@ -24,6 +24,7 @@ class ConfigHelper:
         self,
         topic_prefix: str,
         name: str = BONEIO,
+        device_type: str = "boneIO Black",
         ha_discovery: bool = True,
         ha_discovery_prefix: str = HOMEASSISTANT,
     ):
@@ -31,6 +32,7 @@ class ConfigHelper:
         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
         self._fetch_old_discovery = None
         self._autodiscovery_messages = {
             SWITCH: {},
@@ -59,6 +61,10 @@ class ConfigHelper:
     def ha_discovery_prefix(self) -> str:
         return self._ha_discovery_prefix
 
+    @property
+    def device_type(self) -> str:
+        return self._device_type
+
     @property
     def cmd_topic_prefix(self) -> str:
         return f"{self.topic_prefix}/cmd/"

{boneio-0.10.0.dev2 → boneio-0.10.1}/boneio/helper/ha_discovery.py

@@ -55,7 +55,7 @@ def ha_light_availabilty_message(id: str, topic: str = "boneIO", device_type: st
     return msg
 
 
-def ha_led_availabilty_message(id: str, topic: str = "boneIO", **kwargs):
+def ha_led_availabilty_message(id: str, topic: str = "boneIO",  **kwargs):
     """Create LED availability topic for HA."""
     msg = ha_availabilty_message(device_type=RELAY, topic=topic, id=id, **kwargs)
     msg["command_topic"] = f"{topic}/cmd/{RELAY}/{id}/set"
@@ -110,7 +110,7 @@ def ha_sensor_availabilty_message(unit_of_measurement: str = None, **kwargs):
         return msg
 
 
-def ha_binary_sensor_availabilty_message(id: str, name: str, device_class: str, topic: str = "boneIO"):
+def ha_binary_sensor_availabilty_message(id: str, name: str, device_class: str, topic: str = "boneIO", model: str = "boneIO Relay Board"):
     """Create availability topic for HA."""
     kwargs = {"device_class": device_class} if device_class else {}
     return {
@@ -119,7 +119,7 @@ def ha_binary_sensor_availabilty_message(id: str, name: str, device_class: str,
         "device": {
             "identifiers": [topic],
             "manufacturer": "boneIO",
-            "model": "boneIO Relay Board",
+            "model": model,
             "name": f"boneIO {topic}",
             "sw_version": __version__,
         },
@@ -132,7 +132,7 @@ def ha_binary_sensor_availabilty_message(id: str, name: str, device_class: str,
 
 
 def ha_sensor_ina_availabilty_message(
-    id: str, name: str, topic: str = "boneIO", **kwargs
+    id: str, name: str, topic: str = "boneIO", model: str = "boneIO Relay Board", **kwargs
 ):
     """Create availability topic for HA."""
     return {
@@ -140,7 +140,7 @@ def ha_sensor_ina_availabilty_message(
         "device": {
             "identifiers": [topic],
             "manufacturer": "boneIO",
-            "model": "boneIO Relay Board",
+            "model": model,
             "name": f"boneIO {topic}",
             "sw_version": __version__,
         },
@@ -154,7 +154,7 @@ def ha_sensor_ina_availabilty_message(
 
 
 def ha_sensor_temp_availabilty_message(
-    id: str, name: str, topic: str = "boneIO", **kwargs
+    id: str, name: str, topic: str = "boneIO", model: str = "boneIO Relay Board", **kwargs
 ):
     """Create availability topic for HA."""
     return {
@@ -162,7 +162,7 @@ def ha_sensor_temp_availabilty_message(
         "device": {
             "identifiers": [topic],
             "manufacturer": "boneIO",
-            "model": "boneIO Relay Board",
+            "model": model,
             "name": f"boneIO {topic}",
             "sw_version": __version__,
         },
@@ -204,12 +204,12 @@ def modbus_sensor_availabilty_message(
 
 
 def ha_cover_availabilty_message(
-    id: str, name: str, device_class: str, topic: str = "boneIO"
+    id: str, name: str, device_class: str, topic: str = "boneIO", model: str = "boneIO Relay Board"
 ):
     """Create Cover availability topic for HA."""
     kwargs = {"device_class": device_class} if device_class else {}
     msg = ha_availabilty_message(
-        device_type=COVER, topic=topic, id=id, name=name, **kwargs
+        device_type=COVER, topic=topic, id=id, name=name, model=model, **kwargs
     )
 
     return {

{boneio-0.10.0.dev2 → boneio-0.10.1}/boneio/helper/yaml_util.py

@@ -269,7 +269,6 @@ def merge_board_config(config: dict) -> dict:
             config["output"].append(output)
     if "output" in config:
         output_mapping = board_config.get("output_mapping", {})
-        print(output_mapping)
         for output in config["output"]:
             if "boneio_output" in output:
                 boneio_output = output["boneio_output"].lower()

{boneio-0.10.0.dev2 → boneio-0.10.1}/boneio/manager.py

@@ -49,6 +49,7 @@ from boneio.const import (
     cover_actions,
     relay_actions,
 )
+from boneio.cover import Cover
 from boneio.helper import (
     GPIOInputException,
     HostData,
@@ -120,7 +121,7 @@ class Manager:
 
         self._loop = asyncio.get_event_loop()
 
-        self._config_helper = config_helper
+        self._config_helper: ConfigHelper = config_helper
         self._host_data = None
         self._config_file_path = config_file_path
         self._state_manager = state_manager
@@ -141,7 +142,7 @@ class Manager:
         self._configured_output_groups = {}
         self._oled = None
         self._tasks: List[asyncio.Task] = []
-        self._covers = {}
+        self._covers: dict[str, Cover] = {}
         self._temp_sensors: List[TempSensor] = []
         self._ina219_sensors = []
         self._modbus_sensors = {}
@@ -938,7 +939,7 @@ class Manager:
             return
         topic_prefix = topic_prefix or self._config_helper.topic_prefix
         payload = availability_msg_func(
-            topic=topic_prefix, id=id, name=name, **kwargs
+            topic=topic_prefix, id=id, name=name, model=self._config_helper.device_type.title(), **kwargs
         )
         topic = f"{self._config_helper.ha_discovery_prefix}/{ha_type}/{topic_prefix}/{id}/config"
         _LOGGER.debug("Sending HA discovery for %s entity, %s.", ha_type, name)

{boneio-0.10.0.dev2 → boneio-0.10.1}/boneio/modbus/sdm120.json

@@ -64,6 +64,7 @@
                     "address": 70,
                     "unit_of_measurement": "Hz",
                     "state_class": "measurement",
+                    "device_class": "frequency",
                     "value_type": "FP32"
                 },
                 {

{boneio-0.10.0.dev2 → boneio-0.10.1}/boneio/modbus/sdm630.json

@@ -240,6 +240,7 @@
           "name": "Frequency",
           "address": 70,
           "unit_of_measurement": "Hz",
+          "device_class": "frequency",
           "state_class": "measurement",
           "value_type": "FP32"
         },

{boneio-0.10.0.dev2 → boneio-0.10.1}/boneio/modbus/socomec_e03.json

@@ -20,7 +20,7 @@
           "address": 50526,
           "unit_of_measurement": "Hz",
           "state_class": "measurement",
-          "device_class": "voltage",
+          "device_class": "frequency",
           "value_type": "U_DWORD",
           "filters": [{ "multiply": 0.01 }]
         },

{boneio-0.10.0.dev2 → boneio-0.10.1}/boneio/modbus/socomec_e23.json

@@ -38,7 +38,7 @@
           "address": 50526,
           "unit_of_measurement": "Hz",
           "state_class": "measurement",
-          "device_class": "voltage",
+          "device_class": "frequency",
           "value_type": "U_DWORD",
           "filters": [{ "multiply": 0.001 }]
         },

{boneio-0.10.0.dev2 → boneio-0.10.1}/boneio/runner.py

@@ -96,6 +96,7 @@ async def async_run(
     main_config = config.get(BONEIO, {})
     _config_helper = ConfigHelper(
         name=main_config.get(NAME, BONEIO),
+        device_type=main_config.get("device_type", "boneIO Black"),
         topic_prefix=config.get(MQTT, {}).get(TOPIC_PREFIX, None),
         ha_discovery=config.get(MQTT, {}).get(HA_DISCOVERY, {}).get(ENABLED, False),
         ha_discovery_prefix=config.get(MQTT, {}).get(HA_DISCOVERY, {}).get(TOPIC_PREFIX, "homeassistant"),

{boneio-0.10.0.dev2 → boneio-0.10.1}/boneio/schema/schema.yaml

@@ -558,7 +558,7 @@ binary_sensor:
           label: Id to use in HA if needed. Default to pin number.
       pin:
         type: string
-        required: True
+        required: False
         meta:
           label: PIN to use.
       gpio_mode:
@@ -673,7 +673,7 @@ event:
           label: Id to use in HA if needed. Default to pin number.
       pin:
         type: string
-        required: True
+        required: False
         meta:
           label: PIN to use.
       gpio_mode:

boneio-0.10.1/boneio/version.py

@@ -0,0 +1,2 @@
+# flake8: noqa
+__version__ = "0.10.1"

{boneio-0.10.0.dev2 → boneio-0.10.1}/boneio/webui/app.py

@@ -492,7 +492,7 @@ async def cover_action(cover_id: str, action_data: CoverAction, manager: Manager
     elif action == "close":
         await cover.close()
     elif action == "stop":
-        await cover.async_stop()
+        await cover.stop()
     
     return {"status": "success"}
 

{boneio-0.10.0.dev2 → boneio-0.10.1}/boneio/webui/schema/binary_sensor.schema.json

@@ -391,10 +391,7 @@
               }
             }
           }
-        },
-        "required": [
-          "pin"
-        ]
+        }
       },
       "description": "https://boneio.eu/docs/black/configuration/binary \n GPIO binary section of boneIO Black. It enables binary sensors in HA. It detects press and release states. It can run action based on states. It always send message to MQTT broker of invoked state.",
       "title": "Binary sensor"

{boneio-0.10.0.dev2 → boneio-0.10.1}/boneio/webui/schema/config.schema.json

@@ -1521,10 +1521,7 @@
               }
             }
           }
-        },
-        "required": [
-          "pin"
-        ]
+        }
       },
       "description": "https://boneio.eu/docs/black/configuration/binary \n GPIO binary section of boneIO Black. It enables binary sensors in HA. It detects press and release states. It can run action based on states. It always send message to MQTT broker of invoked state.",
       "title": "Binary sensor"
@@ -1960,10 +1957,7 @@
               }
             }
           }
-        },
-        "required": [
-          "pin"
-        ]
+        }
       },
       "description": "https://boneio.eu/docs/black/configuration/event \n GPIO event entity section of boneIO Black. It enables event entities in HA. It detects single, double and long click. It can run action based on states. It always send message to MQTT broker of invoked state.",
       "title": "Event"

{boneio-0.10.0.dev2 → boneio-0.10.1}/boneio/webui/schema/event.schema.json

@@ -433,10 +433,7 @@
               }
             }
           }
-        },
-        "required": [
-          "pin"
-        ]
+        }
       },
       "description": "https://boneio.eu/docs/black/configuration/event \n GPIO event entity section of boneIO Black. It enables event entities in HA. It detects single, double and long click. It can run action based on states. It always send message to MQTT broker of invoked state.",
       "title": "Event"

{boneio-0.10.0.dev2 → boneio-0.10.1}/pyproject.toml

@@ -36,7 +36,7 @@ dependencies = [
     "qrcode==7.4.2",
 ]
 requires-python = ">=3.7"
-version = "0.10.0.dev2"
+version = "0.10.1"
 
 [project.license]
 text = "GNU General Public License v3.0"

boneio-0.10.0.dev2/boneio/example_config/cover/binary_sensor.yaml

@@ -1 +0,0 @@
-../32x10/binary_sensor.yaml

boneio-0.10.0.dev2/boneio/example_config/cover_mix/binary_sensor.yaml

@@ -1 +0,0 @@
-../32x10/binary_sensor.yaml

boneio-0.10.0.dev2/boneio/version.py

@@ -1,2 +0,0 @@
-# flake8: noqa
-__version__ = "0.10.0dev2"