boneIO 0.8.0.dev1__py3-none-any.whl → 0.8.0.dev3__py3-none-any.whl

{boneIO-0.8.0.dev1.dist-info → boneIO-0.8.0.dev3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: boneIO
-Version: 0.8.0dev1
+Version: 0.8.0dev3
 Summary: Python App for BoneIO
 License: GNU General Public License v3.0
 Author-email: Paweł Szafer <pszafer@gmail.com>
@@ -16,6 +16,7 @@ Requires-Dist: adafruit-circuitpython-onewire>=2.0.5
 Requires-Dist: adafruit-circuitpython-pca9685>=3.4.10
 Requires-Dist: adafruit-circuitpython-pcf8575>=1.0.2
 Requires-Dist: adafruit-circuitpython-pct2075>=1.1.19
+Requires-Dist: adafruit-circuitpython-typing==1.9.5
 Requires-Dist: aiomqtt>=1.1.0
 Requires-Dist: colorlog>=6.7.0
 Requires-Dist: gpio>=1.0.0

{boneIO-0.8.0.dev1.dist-info → boneIO-0.8.0.dev3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 boneio/__init__.py,sha256=hoLKnu6h1uEsiCHA9Ql2MMDC7VQS0E-s_2cxBS-CTOg,147
-boneio/bonecli.py,sha256=fKPcTEMjYG8zhWig3F6dqE2jDxBd17ydWHp0XVnq6sc,3491
-boneio/const.py,sha256=zV6kqBF1YnIQrfFpRj6CjEWm8MZGZHS6cQYjM6fpIYI,3293
+boneio/bonecli.py,sha256=nOXC7ZJ0t9wRMpkkNDKijmREmV26qvRSK4HOAybIbQ4,8005
+boneio/const.py,sha256=eIpq1EvFYh1p9I83xaDSOrF_JfdYr-1-yXO5vsAaqCg,5093
 boneio/cover.py,sha256=EfO1DAOGTPQykfgJHzg1WqPs0U8b1AnD2NMI-sLZccM,8444
 boneio/example_config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 boneio/example_config/adc.yaml,sha256=GKNpl2t7ebsH57UhJlJioXNuBflsL6eO4JMnyYwZrFs,168
@@ -22,12 +22,12 @@ boneio/helper/click_timer.py,sha256=Gu8sEi1S8GG42SYbfaMju7WXFhnnil9gYfirLZX7kJk,
 boneio/helper/config.py,sha256=5cDnJ7usJDlUvXv8K2rSWEx30OFcU2k1U1vUEjO69WY,2431
 boneio/helper/events.py,sha256=f4JDMMkyp0lWz9w8ABZ_hlKyAbJWtYHGnGTs2vv4vac,8648
 boneio/helper/exceptions.py,sha256=vyYSUojwB7OttOPUjbxeHFM7C_o5ZQmRUcZ_vYpxYYI,717
-boneio/helper/filter.py,sha256=UcjifjaC5wHDW2He7wmwCX2IjSSeLVhXyhrXHeT8RmA,885
+boneio/helper/filter.py,sha256=8jgSbHDaInEVlAPd7nrahnFYsi1y6C2fmI0yn55XzK0,935
 boneio/helper/gpio.py,sha256=q2r2uklPWePuuekPO63kVfoaQdkvNObUJ3ktwsHgOB0,4771
 boneio/helper/ha_discovery.py,sha256=B2t1cfOfKWys4EM1H7OxvOaYL8H_v18CTuHCEVP2w2c,7107
-boneio/helper/loader.py,sha256=zbg6WrKg7sfFRjny6qNQL7l-6ENbPq5AoEuW2T69PQE,17333
+boneio/helper/loader.py,sha256=mkvM6Fg_4xHI079iiWFcUQFW1w8819AXAkiBja0vKxo,17473
 boneio/helper/logger.py,sha256=zyF_Vk3o2eSHuXypJhNzK99eZgkWDWybuB5KcJgurDs,1801
-boneio/helper/mqtt.py,sha256=novgn5Xl--dmwJ3p6gYVnurVxF5uf-i_t9rj5EmmvP8,859
+boneio/helper/mqtt.py,sha256=1YgwO0RjkarN5qS5HS5rONf4H3_m3ak7tT_hHm-HeOQ,931
 boneio/helper/oled.py,sha256=f0XYbaFstUbJ6ISmFe1vQCnmNVMctQWtnStNdROrblc,351
 boneio/helper/onewire/W1ThermSensor.py,sha256=Pu5Fp29pKbxjJqDbFs05Mjg3Vy-9z_DTVoBpSWM_byA,2430
 boneio/helper/onewire/__init__.py,sha256=4djH-uxiq5XhAiFTOxyqjvWVoJe0c8U8iN0BfmH8nSU,448
@@ -36,16 +36,29 @@ boneio/helper/onewire/onewire.py,sha256=tHofTu1l0qG7hH2XoSf-lj8gW7wVKe27j57qQWpV
 boneio/helper/pcf8575.py,sha256=qeNYLqV5foDEQCyAz1WRQRi1CYYxtbPIha06Z5TyZVQ,311
 boneio/helper/queue.py,sha256=7fE7d344-BEW8sljN40wmqsbBr4kPLvz4ShBjkT04p8,1066
 boneio/helper/sensor/ina_219_smbus.py,sha256=eXp2epjUgsqaXamTSWSn3LMow5X_YxAxdREaWD7N3mk,6170
-boneio/helper/state_manager.py,sha256=W63oGPCKo1vZ8zr5Q_3SALM0mgjuab5b8Y397HAiO_o,2633
+boneio/helper/state_manager.py,sha256=6OeqJsLQPCyQhhmFlNxCd80cTYLnKb02L4AZ1ZFFVBE,2616
 boneio/helper/stats.py,sha256=Ard04Z0WpkV7U6hgv1Uf4KxkjIde5iIW8W2cqRGXZyg,6731
 boneio/helper/timeperiod.py,sha256=xpg9oe30Z5WiLDQPq3EBKKScejOnN47NhcpeFvDd3bY,5806
-boneio/helper/util.py,sha256=SwTxVnUFe-YCmzubRzfICJDgrr0xMAJaR0G1wBXCMR8,681
+boneio/helper/util.py,sha256=DyppBTE2zTWoxVpl83Kb4SpJLEqOOSEkxXEITCrwnfk,938
 boneio/helper/yaml_util.py,sha256=aaXMwXC2JoDYkBMcZkkB8nic3QOyGOhxPTRxWvMf3G4,11334
 boneio/input/__init__.py,sha256=8Hcps-wCCl6bCAMoEmDJecR-Q9giFL29AvG1ZGe0dZw,200
 boneio/input/gpio.py,sha256=mqmce4P_dNzmNHqNNiNAmKeeZKbbKtPUtQ6zd8-R-9I,2438
 boneio/input/gpio_new.py,sha256=gpPfDr39B8FVUyh9XHtLgVQr4glMGFBgQsyIMzXDPaw,2822
-boneio/manager.py,sha256=3Grw8fTWzsDfTXpk5arD5V_EY1wR6eTA8Oq-SCgPQaI,28589
-boneio/modbus.py,sha256=v0unQKtHnmNFpGC1lBcVmjlM6A8UFy6oXELPdAm7Hjo,3682
+boneio/manager.py,sha256=06smEmgB9UDWUjCvy2l_lEHFyONU6N6ppW_dOiRv-wM,29866
+boneio/modbus/__init__.py,sha256=yeHIxZ0_u7eCL7CqScvob5Utcru6Iza0LEtTagEtNtw,116
+boneio/modbus/client.py,sha256=tmArCt9ac6rxUymdmFMEn4xpZtGdU7Yby7r3RkGJVxM,6030
+boneio/modbus/cwt.json,sha256=4zJAHAV-h1JsV_Yp4VF6ecg_0eef-EHOdzRnhnMHRQs,814
+boneio/modbus/dts1964_3f.json,sha256=WABph_2X4OgMidSM28vw4dLd9ZByRoiUP-RqE0UMpR8,8810
+boneio/modbus/modbuscli.py,sha256=OjWVUPPHEOJ-Z2WMG9M-ycUx2Qu5EGImDG_RfFx8jcI,5832
+boneio/modbus/orno-or-we-517.json,sha256=PtaG0B_uNLCemN2vrIXFS4Kzt6JBVoGCYhNMG-1wZhg,505
+boneio/modbus/pt100.json,sha256=bzKNYDc3lMto94Ut8gutVIsHytQiMobwFCkonOiMegs,526
+boneio/modbus/r4dcb08.json,sha256=oj4eK3bD1bG8BTRE4STVHB5L92luWaJ3FYFHQvFg-ZA,2735
+boneio/modbus/sdm120.json,sha256=4sueFfSw7G6a77gdIUhbfJvE-MNVJFOeVbRvHDw5Rvk,4145
+boneio/modbus/sdm630.json,sha256=TUiuc060IpF64p_HSDvdxEQcwkWHWUpnd48_xaGU-_o,8255
+boneio/modbus/sensor.py,sha256=tfFYQNK0dE1yA0Otw66dxoM5wJ1b6nvW2_k4y8WAk_g,8303
+boneio/modbus/socomec_e23.json,sha256=Is51YelEd4d6SYmz4Gd_oKx4Qi3bp-VHsl9zxWOFI5s,2882
+boneio/modbus/sofar.json,sha256=A_YztQN_ctyItIm2LH1tfcs-pSyG18I530qleLd2tOw,5592
+boneio/modbus/utils.py,sha256=cG75mmKTGaw_qrCG_D1qw-jl9XybUXa03i1ap5oBxGE,1753
 boneio/mqtt_client.py,sha256=hzGT3IyftPHNrQXSKbWUXGYZBpP-VdRBkOrILkXDNHs,8665
 boneio/oled.py,sha256=dLfAaH2Qto9P3mil_JK4siGvkSQ7LebhCabhL-OYGaM,5505
 boneio/relay/__init__.py,sha256=Cz6D37GKHxm8DiuPuxE2EMaey2wdUdJYVet_hfR0lzA,231
@@ -53,7 +66,7 @@ boneio/relay/basic.py,sha256=UfckgRtLC7qp4nuQihqmjTRPu-xJDL53YV9lJb3LnUU,4377
 boneio/relay/gpio.py,sha256=s64FBf6zlxciF57xJ6nrvy0t5Rie0uiXlwos0HL3RKM,1163
 boneio/relay/mcp.py,sha256=m1-AtmgFiIzy00uns3gGGCTwr-ppfAiN_zeIdZXVtQE,2000
 boneio/relay/pca.py,sha256=qiO5YWaywbtkbjVlqKi0y9VomsWuMHsfdQiGG6b_yug,2951
-boneio/relay/pcf.py,sha256=Nl0b3MMB0Ydlw-_vFjwBtdVz9betnX6rxyiBNX-a8G8,2288
+boneio/relay/pcf.py,sha256=TU5yCqUVMFj_-W1rRqweRtCQWOu24Z6kFnBKGZHjptk,2498
 boneio/runner.py,sha256=PC1rbgsURBbtXe3xIX1zk0bDgSGNKwxTdgX1eq68vfc,2855
 boneio/schema/actions.yaml,sha256=kaJZ9B6SOl4Wbujtnr5k-g5JcAi2NSC1oGc0wZy8fnQ,1039
 boneio/schema/actions_sensor.yaml,sha256=rWd8pfsN7KvmvVvW6VedelFayRVehNQt6x4ou6yN9BY,91
@@ -61,7 +74,7 @@ boneio/schema/actions_switch.yaml,sha256=cDgSi12k4S-TWADQ20Fy9NvYKOXnm7YkyMaWpPy
 boneio/schema/filters.yaml,sha256=WopX1SmCZsSZXNiGccLoi7uMCsUpdbs0eVfsAjmbay4,286
 boneio/schema/filters_adc.yaml,sha256=3e0ts92MoFKOnfGOOn6WYIHxu0-tnZe9OjAjN9m7hiI,304
 boneio/schema/id.yaml,sha256=vHI_6dxkJwoiGp5ien_pPpyaWA1F06eirTgfWMyWa1E,75
-boneio/schema/schema.yaml,sha256=CRkOlCkXHpbn6EDfHgcPkpRToXR-e3t81W-UtO_W47o,18131
+boneio/schema/schema.yaml,sha256=R9EqtON1dTNsyCtIXDy6B1vJQArGnSQlnSLExJhVmqc,18418
 boneio/schema/temp_unit.yaml,sha256=m32VGz9RTW92Lz08l9n6RftkcVNZquOGPPr5mc3eZVc,65
 boneio/schema/update_interval.yaml,sha256=L_YLddAZdybcdO-T57Qhlv1GaWIVDwhvH-GadD1oOIo,133
 boneio/sensor/__init__.py,sha256=Ztj-xzey-SWrEdVEozcwFsZSuEmJW8STVaf_vPMWiVc,619
@@ -69,20 +82,13 @@ boneio/sensor/adc.py,sha256=tCUdr3KN5uSbgXiwhNXbMjeNkO2CzPYhIOncHR5_LD0,1328
 boneio/sensor/gpio.py,sha256=8m07tW1xDsrhBM2dZ9_VvmvYRn-5hLQVTTUhPlKg1rg,1199
 boneio/sensor/gpio_new.py,sha256=m54agOF2gUh3aoC6f8WpCPAmBRADvqlKeWLqwlon9fg,1223
 boneio/sensor/ina219.py,sha256=kBwaCjY63CNFj1mRZ2EEtm2BrMZ6BW4ahjAD2LT-0jo,3439
-boneio/sensor/modbus/__init__.py,sha256=QkWfM3HXKLpc2rLHIy6lB9lAb9sjTKGnQGDUl3TAE0A,8573
-boneio/sensor/modbus/dts1964_3f.json,sha256=WABph_2X4OgMidSM28vw4dLd9ZByRoiUP-RqE0UMpR8,8810
-boneio/sensor/modbus/pt100.json,sha256=bzKNYDc3lMto94Ut8gutVIsHytQiMobwFCkonOiMegs,526
-boneio/sensor/modbus/r4dcb08.json,sha256=oj4eK3bD1bG8BTRE4STVHB5L92luWaJ3FYFHQvFg-ZA,2735
-boneio/sensor/modbus/sdm120.json,sha256=4sueFfSw7G6a77gdIUhbfJvE-MNVJFOeVbRvHDw5Rvk,4145
-boneio/sensor/modbus/sdm630.json,sha256=6LbIfXWk_PVRW-OuJwrsFEnRGLVEmEqqGIbj-1FDaiI,10969
-boneio/sensor/modbus/sofar.json,sha256=A_YztQN_ctyItIm2LH1tfcs-pSyG18I530qleLd2tOw,5592
-boneio/sensor/temp/__init__.py,sha256=OViqBb7DwVn_aFIy6V0iqkSUDjsDNLQ5sOS_4frYdwg,1808
+boneio/sensor/temp/__init__.py,sha256=JLNH6Nc78ezleftnIYylIcNtKIm0rdqetbPZLsuCgDc,1844
 boneio/sensor/temp/dallas.py,sha256=xrvd1LNBh1fRcjz_yd_9S29Lv26ItVtLCmhZgVQWJos,2485
 boneio/sensor/temp/lm75.py,sha256=-mpOv78429plRPBp9s09Ljz1x2Bdxuagalqz40vlAKE,243
 boneio/sensor/temp/mcp9808.py,sha256=yAh5yJzZLGTqa39xV4fyqsruj7oy3niOZAUV2W6eyCM,271
-boneio/version.py,sha256=NVg2CbevSdeI0e8-U8dS8r-FiVV8W9Qx16WxoX74WXA,41
-boneIO-0.8.0.dev1.dist-info/entry_points.txt,sha256=Igl1SMDEWwMg144bwRz28UOCb80hdxomC99QJ3u6qC0,46
-boneIO-0.8.0.dev1.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
-boneIO-0.8.0.dev1.dist-info/METADATA,sha256=Es3lCLyoQaXjEh82lyY6r4uNWL3kwib1OgruffKxQD4,1749
-boneIO-0.8.0.dev1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-boneIO-0.8.0.dev1.dist-info/RECORD,,
+boneio/version.py,sha256=SyrsNjuIX7MqP9j5MeW39jpFuPZjcEoVFV9gCwzypPM,41
+boneIO-0.8.0.dev3.dist-info/entry_points.txt,sha256=Igl1SMDEWwMg144bwRz28UOCb80hdxomC99QJ3u6qC0,46
+boneIO-0.8.0.dev3.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
+boneIO-0.8.0.dev3.dist-info/METADATA,sha256=hTnkcXT3BZzrVpDEaJNjowugUPS2yU4A3Hi8UlSO9fg,1801
+boneIO-0.8.0.dev3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+boneIO-0.8.0.dev3.dist-info/RECORD,,

boneio/bonecli.py

@@ -1,20 +1,28 @@
 """Bonecli script."""
+
 from __future__ import annotations
-import argparse
-import asyncio
-import logging
-import sys
+
 import os
-from typing import Any
 
 os.environ["W1THERMSENSOR_NO_KERNEL_MODULE"] = "1"
 
+import argparse
+import asyncio
+import logging
+import sys
 from colorlog import ColoredFormatter
 from yaml import MarkedYAMLError
 
+from boneio.modbus.modbuscli import async_run_modbus_set, async_run_modbus_get
+from boneio.modbus.client import VALUE_TYPES
+
+
 from boneio.const import ACTION
 from boneio.helper import load_config_from_file
-from boneio.helper.exceptions import ConfigurationException, RestartRequestException
+from boneio.helper.exceptions import (
+    ConfigurationException,
+    RestartRequestException,
+)
 from boneio.helper.events import GracefulExit
 from boneio.helper.logger import configure_logger
 from boneio.runner import async_run
@@ -49,30 +57,139 @@ def get_arguments() -> argparse.Namespace:
     parser = argparse.ArgumentParser(
         description="boneIO app for BeagleBone Black.",
     )
-    parser.add_argument(ACTION, type=str, default="run")
-    parser.add_argument("--version", action="version", version=__version__)
-    parser.add_argument(
+    subparsers = parser.add_subparsers(dest=ACTION, required=True)
+    run_parser = subparsers.add_parser("run")
+    run_parser.add_argument(
+        "--debug",
+        "-d",
+        action="count",
+        help="Start boneIO in debug mode",
+        default=0,
+    )
+    run_parser.add_argument(
         "-c",
         "--config",
         metavar="path_to_config_dir",
         default="./config.yaml",
         help="File which contains boneIO configuration",
     )
-    parser.add_argument(
-        "--debug", "-d", action="count", help="Start boneIO in debug mode", default=0
+    run_parser.add_argument(
+        "--mqttusername",
+        help="Mqtt username to use if you don't want provide in file.",
+    )
+    run_parser.add_argument(
+        "--mqttpassword",
+        help="Mqtt password to use if you don't want provide in file.",
+    )
+    modbus_parser = subparsers.add_parser("modbus")
+    modbus_parser.add_argument(
+        "--debug",
+        "-d",
+        action="count",
+        help="Start boneIO in debug mode",
+        default=0,
+    )
+    modbus_parser.add_argument(
+        "--uart",
+        type=str,
+        choices=["uart1", "uart4"],
+        help="Choose UART",
+        required=True,
+    )
+    modbus_parser.add_argument(
+        "--address",
+        type=lambda x: int(x, 0),
+        required=True,
+        help="Current device address (hex or integer)",
     )
-    parser.add_argument(
-        "--mqttusername", help="Mqtt username to use if you don't want provide in file."
+    modbus_parser.add_argument(
+        "--baudrate",
+        type=int,
+        choices=[2400, 4800, 9600, 19200],
+        required=True,
+        help="Current baudrate",
     )
-    parser.add_argument(
-        "--mqttpassword", help="Mqtt password to use if you don't want provide in file."
+
+    modbus_parser.add_argument(
+        "--bytesize",
+        type=int,
+        required=True,
+        default=8,
+        help="Bytesize",
+    )
+
+    modbus_parser.add_argument(
+        "--stopbits",
+        type=int,
+        required=True,
+        default=1,
+        help="stopbits",
     )
+
+    modbus_parser.add_argument(
+        "--parity",
+        type=str,
+        choices=["P", "E", "N"],
+        default="N",
+        required=True,
+        help="Parity",
+    )
+
+    modbus_sub_parser = modbus_parser.add_subparsers(
+        dest="modbus_action", required=True
+    )
+    set_modbus_parser = modbus_sub_parser.add_parser("set")
+    set_modbus_parser.add_argument(
+        "--device",
+        type=str,
+        choices=["cwt"],
+        help="Choose device to set modbus address/baudrate",
+        required=True,
+    )
+    set_modbus_parser_group = set_modbus_parser.add_mutually_exclusive_group()
+    set_modbus_parser_group.add_argument(
+        "--new-address",
+        type=lambda x: int(x, 0),
+        help="Set new address (hex or integer / 1 - 253/)",
+    )
+
+    set_modbus_parser_group.add_argument(
+        "--new-baudrate",
+        type=int,
+        choices=[2400, 4800, 9600, 19200],
+        help="Choose new baudrate to set",
+    )
+
+    get_modbus_parser = modbus_sub_parser.add_parser("get")
+    get_modbus_parser.add_argument(
+        "--register-address",
+        type=int,
+        help="Register address",
+        required=True,
+    )
+    get_modbus_parser.add_argument(
+        "--register-type",
+        type=str,
+        choices=["input", "holding"],
+        help="Register type",
+        required=True,
+    )
+    get_modbus_parser.add_argument(
+        "--value-type",
+        type=str,
+        choices=VALUE_TYPES.keys(),
+        help="Value types",
+        required=True,
+    )
+    parser.add_argument("--version", action="version", version=__version__)
     arguments = parser.parse_args()
 
     return arguments
 
 
-def run(config: str, debug: int, mqttusername: str = "", mqttpassword: str = "") -> int:
+def run(
+    config: str, debug: int, mqttusername: str = "", mqttpassword: str = ""
+) -> int:
     """Run BoneIO."""
     _LOGGER.info("BoneIO %s starting.", __version__)
     try:
@@ -99,6 +216,51 @@ def run(config: str, debug: int, mqttusername: str = "", mqttpassword: str = "")
         return 1
 
 
+def run_modbus_command(
+    args: argparse.Namespace,
+) -> int:
+    """Run BoneIO."""
+    _LOGGER.info("BoneIO %s starting.", __version__)
+    try:
+        configure_logger(log_config={}, debug=args.debug)
+        if args.modbus_action == "set":
+            ret = asyncio.run(
+                async_run_modbus_set(
+                    device=args.device,
+                    uart=args.uart,
+                    address=args.address,
+                    baudrate=args.baudrate,
+                    parity=args.parity,
+                    bytesize=args.bytesize,
+                    stopbits=args.stopbits,
+                    new_baudrate=args.new_baudrate,
+                    new_address=args.new_address,
+                ),
+            )
+        else:
+            ret = asyncio.run(
+                async_run_modbus_get(
+                    uart=args.uart,
+                    device_address=args.address,
+                    baudrate=args.baudrate,
+                    register_address=args.register_address,
+                    register_type=args.register_type,
+                    parity=args.parity,
+                    bytesize=args.bytesize,
+                    stopbits=args.stopbits,
+                    value_type=args.value_type,
+                ),
+            )
+        return ret
+    except (RestartRequestException, GracefulExit) as err:
+        if err is not None:
+            _LOGGER.info(err)
+        return 0
+    except (ConfigurationException, MarkedYAMLError) as err:
+        _LOGGER.error("Failed to load config. %s Exiting.", err)
+        return 1
+
+
 def main() -> int:
     """Start boneIO."""
 
@@ -113,6 +275,12 @@ def main() -> int:
             mqttpassword=args.mqttpassword,
             debug=debug,
         )
+    elif args.action == "modbus":
+        _LOGGER.info("BoneIO Modbus helper %s .", __version__)
+        exit_code = run_modbus_command(
+            args=args,
+        )
+
     _LOGGER.info("Exiting with exit code %s", exit_code)
     return exit_code
 

boneio/const.py

@@ -56,7 +56,11 @@ UARTS = {
     "uart5": {ID: "/dev/ttyS5", TX: "P8.37", RX: "P8.38"},
 }
 
-relay_actions = {ON: "async_turn_on", OFF: "async_turn_off", TOGGLE: "async_toggle"}
+relay_actions = {
+    ON: "async_turn_on",
+    OFF: "async_turn_off",
+    TOGGLE: "async_toggle",
+}
 
 # HA CONSTS
 HOMEASSISTANT = "homeassistant"
@@ -67,7 +71,8 @@ SHOW_HA = "show_in_ha"
 # OLED CONST
 OLED = "oled"
 FONTS = "fonts"
-OLED_PIN = "P9_41"
+OLED_PIN = ("",)
+"P9_41"
 GIGABYTE = 1073741824
 MEGABYTE = 1048576
 WIDTH = 128
@@ -160,3 +165,52 @@ cover_actions = {
 }
 
 INA219 = "ina219"
+PINS = {
+    "P9_22": {"chip": 0, "line": 2},
+    "P9_21": {"chip": 0, "line": 3},
+    "P9_18": {"chip": 0, "line": 4},
+    "P9_17": {"chip": 0, "line": 5},
+    "P8_35": {"chip": 0, "line": 8},
+    "P8_33": {"chip": 0, "line": 9},
+    "P8_31": {"chip": 0, "line": 10},
+    "P8_32": {"chip": 0, "line": 11},
+    "P8_19": {"chip": 0, "line": 22},
+    "P8_13": {"chip": 0, "line": 23},
+    "P8_14": {"chip": 0, "line": 26},
+    "P8_17": {"chip": 0, "line": 27},
+    "P8_12": {"chip": 1, "line": 12},
+    "P8_11": {"chip": 1, "line": 13},
+    "P8_16": {"chip": 1, "line": 14},
+    "P8_15": {"chip": 1, "line": 15},
+    "P9_23": {"chip": 1, "line": 17},
+    "P9_14": {"chip": 1, "line": 18},
+    "P9_16": {"chip": 1, "line": 19},
+    "P8_26": {"chip": 1, "line": 29},
+    "P8_18": {"chip": 2, "line": 1},
+    "P8_7": {"chip": 2, "line": 2},
+    "P8_8": {"chip": 2, "line": 3},
+    "P8_10": {"chip": 2, "line": 4},
+    "P8_9": {"chip": 2, "line": 5},
+    "P8_45": {"chip": 2, "line": 6},
+    "P8_46": {"chip": 2, "line": 7},
+    "P8_43": {"chip": 2, "line": 8},
+    "P8_44": {"chip": 2, "line": 9},
+    "P8_41": {"chip": 2, "line": 10},
+    "P8_42": {"chip": 2, "line": 11},
+    "P8_39": {"chip": 2, "line": 12},
+    "P8_40": {"chip": 2, "line": 13},
+    "P8_37": {"chip": 2, "line": 14},
+    "P8_38": {"chip": 2, "line": 15},
+    "P8_36": {"chip": 2, "line": 16},
+    "P8_34": {"chip": 2, "line": 17},
+    "P8_27": {"chip": 2, "line": 22},
+    "P8_29": {"chip": 2, "line": 23},
+    "P8_28": {"chip": 2, "line": 24},
+    "P8_30": {"chip": 2, "line": 25},
+    "P9_31": {"chip": 3, "line": 14},
+    "P9_29": {"chip": 3, "line": 15},
+    "P9_30": {"chip": 3, "line": 16},
+    "P9_28": {"chip": 3, "line": 17},
+    "P9_27": {"chip": 3, "line": 19},
+    "P9_25": {"chip": 3, "line": 21},
+}

boneio/helper/filter.py

@@ -1,4 +1,5 @@
 """Filter class to adjust sensor values."""
+
 from __future__ import annotations
 import logging
 
@@ -22,7 +23,9 @@ class Filter:
         for filter in self._filters:
             for k, v in filter.items():
                 if k not in FILTERS:
-                    _LOGGER.warn("Filter %s doesn't exists. Fix it in config.", k)
+                    _LOGGER.warning(
+                        "Filter %s doesn't exists. Fix it in config.", k
+                    )
                     continue
                 value = FILTERS[k](value, v)
                 if value is None:

boneio/helper/loader.py

@@ -103,7 +103,9 @@ def create_adc(manager: Manager, topic_prefix: str, adc_list: list = []):
                 manager=manager,
                 send_message=manager.send_message,
                 topic_prefix=topic_prefix,
-                update_interval=gpio.get(UPDATE_INTERVAL, TimePeriod(seconds=60)),
+                update_interval=gpio.get(
+                    UPDATE_INTERVAL, TimePeriod(seconds=60)
+                ),
                 filters=gpio.get(FILTERS, []),
             )
             if gpio.get(SHOW_HA, True):
@@ -163,7 +165,10 @@ expander_class = {MCP: MCP23017, PCA: PCA9685, PCF: PCF8575}
 
 
 def create_expander(
-    expander_dict: dict, expander_config: list, exp_type: ExpanderTypes, i2cbusio: I2C
+    expander_dict: dict,
+    expander_config: list,
+    exp_type: ExpanderTypes,
+    i2cbusio: I2C,
 ) -> dict:
     grouped_outputs = {}
     for expander in expander_config:
@@ -189,7 +194,7 @@ def create_expander(
 
 def create_modbus_sensors(manager: Manager, sensors, **kwargs) -> None:
     """Create Modbus sensor for each device."""
-    from boneio.sensor.modbus import ModbusSensor
+    from boneio.modbus.sensor import ModbusSensor
 
     for sensor in sensors:
         name = sensor.get(ID)
@@ -202,7 +207,9 @@ def create_modbus_sensors(manager: Manager, sensors, **kwargs) -> None:
                 manager=manager,
                 model=sensor[MODEL],
                 send_message=manager.send_message,
-                update_interval=sensor.get(UPDATE_INTERVAL, TimePeriod(seconds=60)),
+                update_interval=sensor.get(
+                    UPDATE_INTERVAL, TimePeriod(seconds=60)
+                ),
                 **kwargs,
             )
         except FileNotFoundError as err:
@@ -272,7 +279,9 @@ def configure_relay(
         if restore_state
         else False
     )
-    if output_type == NONE and state_manager.get(attr_type=RELAY, attr=relay_id):
+    if output_type == NONE and state_manager.get(
+        attr_type=RELAY, attr=relay_id
+    ):
         state_manager.del_attribute(attr_type=RELAY, attribute=relay_id)
         restored_state = False
 
@@ -347,7 +356,7 @@ def configure_event_sensor(
     pin: str,
     press_callback: Callable,
     send_ha_autodiscovery: Callable,
-    input: GpioEventButtonOld | GpioEventButtonNew | None = None
+    input: GpioEventButtonOld | GpioEventButtonNew | None = None,
 ) -> GpioEventButtonOld | GpioEventButtonNew | None:
     """Configure input sensor or button."""
     try:
@@ -473,7 +482,9 @@ def configure_cover(
     return cover
 
 
-def configure_ds2482(i2cbusio: I2C, address: str = DS2482_ADDRESS) -> OneWireBus:
+def configure_ds2482(
+    i2cbusio: I2C, address: str = DS2482_ADDRESS
+) -> OneWireBus:
     ds2482 = DS2482(i2c=i2cbusio, address=address)
     ow_bus = OneWireBus(ds2482=ds2482)
     return ow_bus
@@ -493,7 +504,9 @@ def find_onewire_devices(
         devices = ow_bus.scan()
         for device in devices:
             _addr: int = device.int_address
-            _LOGGER.debug("Found device on bus %s with address %s", bus_id, hex(_addr))
+            _LOGGER.debug(
+                "Found device on bus %s with address %s", bus_id, hex(_addr)
+            )
             out[_addr] = device
     except RuntimeError as err:
         _LOGGER.error("Problem with scanning %s bus. %s", bus_type, err)

boneio/helper/mqtt.py

@@ -1,6 +1,8 @@
 """Class to help initialize classes which uses mqtt send."""
+
 from typing import Callable, Union
 from boneio.helper.util import strip_accents
+from typing import Optional
 
 
 class BasicMqtt:
@@ -11,7 +13,9 @@ class BasicMqtt:
         id: str,
         topic_prefix: str,
         name: str,
-        send_message: Callable[[str, Union[str, dict], bool], None],
+        send_message: Callable[
+            [str, Union[str, int, dict, None], Optional[bool]], None
+        ],
         topic_type: str,
         **kwargs,
     ):

boneio/helper/state_manager.py

@@ -1,4 +1,5 @@
 """State files manager."""
+
 from __future__ import annotations
 import asyncio
 import logging
@@ -38,16 +39,19 @@ class StateManager:
         if attr_type in self._state and attribute in self._state[attr_type]:
             del self._state[attr_type][attribute]
 
-    def save_attribute(self, attr_type: str, attribute: str, value: str) -> None:
+    def save_attribute(
+        self, attr_type: str, attribute: str, value: str
+    ) -> None:
         """Save single attribute to file."""
         if attr_type not in self._state:
             self._state[attr_type] = {}
         self._state[attr_type][attribute] = value
         if self._save_attributes_callback is not None:
-            print(self._save_attributes_callback)
             self._save_attributes_callback.cancel()
             self._save_attributes_callback = None
-        self._save_attributes_callback = self._loop.call_later(1, lambda: self._loop.create_task(self.save_state()))
+        self._save_attributes_callback = self._loop.call_later(
+            1, lambda: self._loop.create_task(self.save_state())
+        )
 
     def get(self, attr_type: str, attr: str, default_value: Any = None) -> Any:
         """Retrieve attribute from json."""
@@ -60,7 +64,7 @@ class StateManager:
     def state(self) -> dict:
         """Retrieve all states."""
         return self._state
-    
+
     def _save_state(self) -> None:
         with open(self._file, "w+", encoding="utf-8") as f:
             json.dump(self._state, f, indent=2)

boneio/helper/util.py

@@ -1,4 +1,6 @@
 import unicodedata
+import os
+import json
 from typing import Any, Callable, TypeVar
 
 CALLABLE_T = TypeVar("CALLABLE_T", bound=Callable[..., Any])
@@ -17,5 +19,17 @@ def is_callback(func: Callable[..., Any]) -> bool:
 
 
 def strip_accents(s):
-    return ''.join(c for c in unicodedata.normalize('NFD', s)
-                   if unicodedata.category(c) != 'Mn' and c != ' ')
+
+    return "".join(
+        c
+        for c in unicodedata.normalize("NFD", s)
+        if unicodedata.category(c) != "Mn" and c != " "
+    )
+
+
+def open_json(path: str, model: str) -> dict:
+    """Open json file."""
+    file = f"{os.path.join(path)}/{model}.json"
+    with open(file, "r") as db_file:
+        datastore = json.load(db_file)
+        return datastore