From ccc7e7959ed3ebec9bdc40b6d21bbad3e7c299f3 Mon Sep 17 00:00:00 2001 From: Stefan Allius Date: Sun, 28 Apr 2024 18:31:33 +0200 Subject: [PATCH 1/4] change unit of the collect interval to minutes --- app/src/infos.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/infos.py b/app/src/infos.py index 9245dc9..ba0655e 100644 --- a/app/src/infos.py +++ b/app/src/infos.py @@ -285,7 +285,7 @@ class Infos: # controller: Register.SIGNAL_STRENGTH: {'name': ['controller', 'Signal_Strength'], 'level': logging.DEBUG, 'unit': '%', 'ha': {'dev': 'controller', 'dev_cla': None, 'stat_cla': 'measurement', 'id': 'signal_', 'fmt': '| int', 'name': 'Signal Strength', 'icon': 'mdi:wifi'}}, # noqa: E501 Register.POWER_ON_TIME: {'name': ['controller', 'Power_On_Time'], 'level': logging.DEBUG, 'unit': 's', 'ha': {'dev': 'controller', 'dev_cla': 'duration', 'stat_cla': 'measurement', 'id': 'power_on_time_', 'fmt': '| int', 'name': 'Power on Time', 'ent_cat': 'diagnostic'}}, # noqa: E501 - Register.COLLECT_INTERVAL: {'name': ['controller', 'Collect_Interval'], 'level': logging.DEBUG, 'unit': 's', 'ha': {'dev': 'controller', 'dev_cla': None, 'stat_cla': None, 'id': 'data_collect_intval_', 'fmt': '| string + " s"', 'name': 'Data Collect Interval', 'icon': 'mdi:update', 'ent_cat': 'diagnostic'}}, # noqa: E501 + Register.COLLECT_INTERVAL: {'name': ['controller', 'Collect_Interval'], 'level': logging.DEBUG, 'unit': 'min', 'ha': {'dev': 'controller', 'dev_cla': None, 'stat_cla': None, 'id': 'data_collect_intval_', 'fmt': '| string + " min"', 'name': 'Data Collect Interval', 'icon': 'mdi:update', 'ent_cat': 'diagnostic'}}, # noqa: E501 Register.CONNECT_COUNT: {'name': ['controller', 'Connect_Count'], 'level': logging.DEBUG, 'unit': '', 'ha': {'dev': 'controller', 'dev_cla': None, 'stat_cla': None, 'id': 'connect_count_', 'fmt': '| int', 'name': 'Connect Count', 'icon': 'mdi:counter', 'comp': 'sensor', 'ent_cat': 'diagnostic'}}, # noqa: E501 Register.COMMUNICATION_TYPE: {'name': ['controller', 'Communication_Type'], 'level': logging.DEBUG, 'unit': '', 'ha': {'dev': 'controller', 'dev_cla': None, 'stat_cla': None, 'id': 'comm_type_', 'name': 'Communication Type', 'val_tpl': __comm_type_val_tpl, 'comp': 'sensor', 'icon': 'mdi:wifi'}}, # noqa: E501 Register.DATA_UP_INTERVAL: {'name': ['controller', 'Data_Up_Interval'], 'level': logging.DEBUG, 'unit': 's', 'ha': {'dev': 'controller', 'dev_cla': None, 'stat_cla': None, 'id': 'data_up_intval_', 'fmt': '| string + " s"', 'name': 'Data Up Interval', 'icon': 'mdi:update', 'ent_cat': 'diagnostic'}}, # noqa: E501 From c061d263ebc5ba419bb9febec17775b0aa5d152b Mon Sep 17 00:00:00 2001 From: Stefan Allius Date: Sun, 28 Apr 2024 18:32:26 +0200 Subject: [PATCH 2/4] Convert data collect interval to minutes --- app/src/gen3plus/infos_g3p.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/gen3plus/infos_g3p.py b/app/src/gen3plus/infos_g3p.py index 747058c..0191d04 100644 --- a/app/src/gen3plus/infos_g3p.py +++ b/app/src/gen3plus/infos_g3p.py @@ -15,7 +15,7 @@ class RegisterMap: map = { # 0x41020007: {'reg': Register.DEVICE_SNR, 'fmt': ' Date: Sun, 28 Apr 2024 18:34:11 +0200 Subject: [PATCH 3/4] Convert data collect interval to minutes --- app/tests/test_infos_g3p.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/tests/test_infos_g3p.py b/app/tests/test_infos_g3p.py index c5609be..3878dff 100644 --- a/app/tests/test_infos_g3p.py +++ b/app/tests/test_infos_g3p.py @@ -70,7 +70,7 @@ def test_parse_4110(DeviceData: bytes): pass assert json.dumps(i.db) == json.dumps({ - 'controller': {"Data_Up_Interval": 300, "Collect_Interval": 60, "Heartbeat_Interval": 120, "Signal_Strength": 100, "IP_Adress": "192.168.80.49"}, + 'controller': {"Data_Up_Interval": 300, "Collect_Interval": 1, "Heartbeat_Interval": 120, "Signal_Strength": 100, "IP_Adress": "192.168.80.49"}, 'collector': {"Chip_Model": "LSW5BLE_17_02B0_1.05", "Collector_Fw_Version": "V1.1.00.0B"}, }) From 4e8fd8e2a2e8e95c43be53688c8d5630e6061225 Mon Sep 17 00:00:00 2001 From: Stefan Allius Date: Sun, 28 Apr 2024 18:34:51 +0200 Subject: [PATCH 4/4] update changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a8c073..2ddf9b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +- convert data collect interval to minutes +- add postfix for rc and dev versions to the version number +- change logging level to DEBUG for some logs +- remove experimental value Register.VALUE_1 +- format Register.POWER_ON_TIME as integer +- ignore non realtime values for now + ## [0.7.0] - 2024-04-20 - GEN3PLUS: fix temperature values