boneIO 0.5.0dev2__py3-none-any.whl → 0.5.0dev3__py3-none-any.whl

{boneIO-0.5.0.dev2.dist-info → boneIO-0.5.0.dev3.dist-info}/METADATA

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

{boneIO-0.5.0.dev2.dist-info → boneIO-0.5.0.dev3.dist-info}/RECORD

@@ -28,16 +28,16 @@ boneio/helper/onewire/ds2482.py,sha256=c2t_hdAMtFsHw4Vw41QzO_hEDDNMeb3J71mEwEMUB
 boneio/helper/onewire/onewire.py,sha256=tHofTu1l0qG7hH2XoSf-lj8gW7wVKe27j57qQWpVMPg,2497
 boneio/helper/queue.py,sha256=7fE7d344-BEW8sljN40wmqsbBr4kPLvz4ShBjkT04p8,1066
 boneio/helper/state_manager.py,sha256=LsMQRrD7WXu5jXFoltYXvzHDeiNDDEx6UWYebFw18gc,1994
-boneio/helper/stats.py,sha256=NROKLHyRLDqYe9a8rDnA4grcxpw14w78SmFhk57-Iic,5183
+boneio/helper/stats.py,sha256=eLz3-g6cyaClZ7N1YVEuKVg-P6MAhuKX8D-cm5Nj-k8,5693
 boneio/helper/timeperiod.py,sha256=xpg9oe30Z5WiLDQPq3EBKKScejOnN47NhcpeFvDd3bY,5806
 boneio/helper/util.py,sha256=QfSoT3H3WnOQAKO5bFRIBCy62HT5NMa9Ek-FmfTW_rw,508
 boneio/helper/yaml_util.py,sha256=LFT5abDVcC7DYmauIK52PV4icnHS9V5Io4LhGbcUPJU,10696
 boneio/input/__init__.py,sha256=u9wuehuC_TNizL4tyn7EygZW5LaTFjSnFaZeZr3zZ1U,99
 boneio/input/gpio.py,sha256=2WK3DR3kGAxHvmsNHZhN-oq8dF75oROxwm_mOZzYYh8,4391
-boneio/manager.py,sha256=s1KLsVE5lrhqO6iLNjaPaB3JrFtQyGQqHgZjY0-tThY,18284
+boneio/manager.py,sha256=U2IaEkfIo3dhj_lPOLzPFPxzngQiBWd4bPdduveCJ6c,18410
 boneio/modbus.py,sha256=5hambvcQ8XBRzw65OgcUlUV3xsVdq0Lx9jRj3bEF3SE,4156
 boneio/mqtt_client.py,sha256=ioOBEmnbjpZjYrD5u8W5CrVsrNFRHDJ93fyk6XcWkeE,6983
-boneio/oled.py,sha256=I4aH8v9MUFQ6vu2phpJpLa9ZLSFNUJZj-RjhGpfzILI,4836
+boneio/oled.py,sha256=STzzznpQ1cJEE2WuBSoEbE387wULNGaCzxf0AR689gY,5278
 boneio/relay/__init__.py,sha256=L_Peoep10-DdeMrEe-5YnnNCS-mxHtavCqtAesTPWFQ,135
 boneio/relay/basic.py,sha256=zOXf84yTGeArk3ghXt_WI2ul8L0RxyziOTD6U7-nCLM,2629
 boneio/relay/gpio.py,sha256=s64FBf6zlxciF57xJ6nrvy0t5Rie0uiXlwos0HL3RKM,1163
@@ -48,7 +48,7 @@ boneio/schema/actions_sensor.yaml,sha256=LhXEsYsg6qs7iHqgQE6n-2jj-o-ZZRusDW_9nWI
 boneio/schema/actions_switch.yaml,sha256=qyooX0izkgl4wBEh8xUsYFEKMrvhbIAQYxOGTB5AROY,124
 boneio/schema/filters.yaml,sha256=WopX1SmCZsSZXNiGccLoi7uMCsUpdbs0eVfsAjmbay4,286
 boneio/schema/filters_adc.yaml,sha256=3e0ts92MoFKOnfGOOn6WYIHxu0-tnZe9OjAjN9m7hiI,304
-boneio/schema/schema.yaml,sha256=WVFm3aYDhp1YvHokxb4GayLlbxgr60U9Xo6I_dWir0g,11148
+boneio/schema/schema.yaml,sha256=c8Zbj_OGgPXAPt5yeSJeuR0d_YBvk0kpARSl-bpYkWE,11409
 boneio/schema/update_interval.yaml,sha256=L_YLddAZdybcdO-T57Qhlv1GaWIVDwhvH-GadD1oOIo,133
 boneio/sensor/__init__.py,sha256=VjFBEQQv_U0T2ENkzefuBdzmqNvBTEv4M-gQKScc8o0,431
 boneio/sensor/adc.py,sha256=Yf5F8JcZJt0K4ijpPqI8do0BqDfLvfja_LE8_Zu3u7U,1281
@@ -61,9 +61,9 @@ boneio/sensor/temp/__init__.py,sha256=v4h9l00zmL63pTNW7HAAgQvoXXzXLn_EmmfWQ2zuQI
 boneio/sensor/temp/dallas.py,sha256=uw5gjYe6KSMEt6ayghdEvvHHoubQ-JgMmRMOPtnxGnA,2380
 boneio/sensor/temp/lm75.py,sha256=-mpOv78429plRPBp9s09Ljz1x2Bdxuagalqz40vlAKE,243
 boneio/sensor/temp/mcp9808.py,sha256=yAh5yJzZLGTqa39xV4fyqsruj7oy3niOZAUV2W6eyCM,271
-boneio/version.py,sha256=0DdqQskdOI0Z8iJzbdqeubsKX0cbAfzbV0mgsbOnOSU,41
-boneIO-0.5.0.dev2.dist-info/entry_points.txt,sha256=Igl1SMDEWwMg144bwRz28UOCb80hdxomC99QJ3u6qC0,46
-boneIO-0.5.0.dev2.dist-info/WHEEL,sha256=g_UdFZqm-k6b0W64OcndB0YT_D2mFFPAYBj7-_YsSPA,87
-boneIO-0.5.0.dev2.dist-info/METADATA,sha256=xJxHxy_gj0hUAWkji35bh3Zd7t8IRBIqQEoef7sX0-A,1620
-boneIO-0.5.0.dev2.dist-info/license_files/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-boneIO-0.5.0.dev2.dist-info/RECORD,,
+boneio/version.py,sha256=NU5JZlHRyXKcTkzrGMHNist7Q8X_LXYmCZfUKSOdPng,41
+boneIO-0.5.0.dev3.dist-info/entry_points.txt,sha256=Igl1SMDEWwMg144bwRz28UOCb80hdxomC99QJ3u6qC0,46
+boneIO-0.5.0.dev3.dist-info/WHEEL,sha256=g_UdFZqm-k6b0W64OcndB0YT_D2mFFPAYBj7-_YsSPA,87
+boneIO-0.5.0.dev3.dist-info/METADATA,sha256=ZqP-FTzXA-d2s1lJEtJGlOEan8EGi1FRBaJgzsgF0Fo,1620
+boneIO-0.5.0.dev3.dist-info/license_files/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+boneIO-0.5.0.dev3.dist-info/RECORD,,

boneio/helper/stats.py

@@ -4,7 +4,8 @@ from datetime import datetime
 import socket
 import time
 from math import floor
-from typing import Callable
+from typing import Callable, List
+from functools import partial
 
 import psutil
 
@@ -118,21 +119,31 @@ class HostSensor(AsyncUpdater):
     """Host sensor."""
 
     def __init__(
-        self, update_function: Callable, static_data: dict, id: str, **kwargs
+        self,
+        update_function: Callable,
+        manager_callback: Callable,
+        static_data: dict,
+        id: str,
+        type: str,
+        **kwargs,
     ) -> None:
         self._update_function = update_function
         self._static_data = static_data
         self._state = None
+        self._type = type
+        self._manager_callback = manager_callback
+        self._loop = asyncio.get_event_loop()
         self.id = id
         super().__init__(**kwargs)
 
     async def async_update(self, time: datetime) -> None:
         self._state = self._update_function()
+        self._loop.call_soon_threadsafe(partial(self._manager_callback, self._type))
 
     @property
     def state(self) -> dict:
         if self._static_data:
-            return {**self._static_data, **self._state}
+            return {**self._static_data, self._type: self._state}
         return self._state
 
 
@@ -147,6 +158,7 @@ class HostData:
         callback: Callable,
         temp_sensor: Callable[[LM75Sensor, MCP9808Sensor], None],
         manager: Manager,
+        enabled_screens: List[str],
     ) -> None:
         """Initialize HostData."""
         self._hostname = socket.gethostname()
@@ -163,11 +175,15 @@ class HostData:
             },
         }
         for k, _v in host_stats.items():
+            if k not in enabled_screens:
+                continue
             self.data[k] = HostSensor(
                 update_function=_v["f"],
                 static_data=_v.get("static"),
                 manager=manager,
+                manager_callback=callback,
                 id=f"{k}_hoststats",
+                type=k,
                 update_interval=_v["update_interval"],
             )
         self._temp_sensor = temp_sensor

boneio/manager.py

@@ -204,8 +204,11 @@ class Manager:
         if oled.get("enabled", False):
             from boneio.oled import Oled
 
+            screens = oled.get("screens")
+
             self._host_data = HostData(
                 manager=self,
+                enabled_screens=screens,
                 output=self.grouped_outputs,
                 temp_sensor=self._temp_sensors[0] if self._temp_sensors else None,
                 callback=self._host_data_callback,
@@ -213,6 +216,7 @@ class Manager:
             try:
                 self._oled = Oled(
                     host_data=self._host_data,
+                    screen_order=screens,
                     output_groups=list(self.grouped_outputs),
                     sleep_timeout=oled.get("screensaver_timeout", 60),
                 )

boneio/oled.py

@@ -28,7 +28,7 @@ fontSmall = make_font("DejaVuSans.ttf", 9)
 fontExtraSmall = make_font("DejaVuSans.ttf", 7)
 danube = make_font("danube__.ttf", 15, local=True)
 
-screen_order = [UPTIME, NETWORK, CPU, DISK, MEMORY, SWAP]
+# screen_order = [UPTIME, NETWORK, CPU, DISK, MEMORY, SWAP]
 
 STANDARD_ROWS = [17, 32, 47]
 UPTIME_ROWS = list(range(22, 60, 10))
@@ -40,19 +40,32 @@ class Oled:
     """Oled display class."""
 
     def __init__(
-        self, host_data: HostData, output_groups: List[str], sleep_timeout: TimePeriod
+        self,
+        host_data: HostData,
+        output_groups: List[str],
+        sleep_timeout: TimePeriod,
+        screen_order: List[str],
     ) -> None:
         """Initialize OLED screen."""
         self._loop = asyncio.get_running_loop()
-        self._screen_order = cycle(screen_order + output_groups)
-        self._output_groups = output_groups
+        self._output_groups = None
+        try:
+            _ind_screen = screen_order.index("outputs")
+            if not output_groups:
+                _LOGGER.debug("No outputs configured. Omitting in screen.")
+                screen_order.pop(_ind_screen)
+            screen_order[_ind_screen:_ind_screen] = output_groups
+            self._output_groups = output_groups
+        except ValueError:
+            pass
+        self._screen_order = cycle(screen_order)
         self._current_screen = next(self._screen_order)
         self._host_data = host_data
         self._sleep = False
         self._sleep_handle = None
         self._sleep_timeout = sleep_timeout
         setup_input(pin=OLED_PIN, pull_mode="gpio_pu")
-        edge_detect(pin=OLED_PIN, callback=self._handle_press, bounce=120)
+        edge_detect(pin=OLED_PIN, callback=self._handle_press, bounce=240)
         try:
             serial = i2c(port=2, address=0x3C)
             self._device = sh1106(serial)
@@ -112,7 +125,7 @@ class Oled:
         data = self._host_data.get(self._current_screen)
         if data:
             with canvas(self._device) as draw:
-                if self._current_screen in self._output_groups:
+                if self._output_groups and self._current_screen in self._output_groups:
                     self._draw_output(data, draw)
                 elif self._current_screen == UPTIME:
                     self._draw_uptime(data, draw)

boneio/schema/schema.yaml

@@ -75,6 +75,18 @@ oled:
       default: False
       meta:
         label: Disable builtin screen.
+    screens:
+      type: list
+      required: True
+      allowed: ["uptime", "network", "cpu", "disk", "memory", "swap", "outputs"]
+      default:
+        - uptime
+        - network
+        - cpu
+        - disk
+        - memory
+        - swap
+        - outputs
     screensaver_timeout:
       type:
         - string

boneio/version.py

@@ -1,2 +1,2 @@
 # flake8: noqa
-__version__ = "0.5.0dev2"
+__version__ = "0.5.0dev3"