diff --git a/app/src/gen3/infos_g3.py b/app/src/gen3/infos_g3.py index 7e45634..d3fb987 100644 --- a/app/src/gen3/infos_g3.py +++ b/app/src/gen3/infos_g3.py @@ -161,7 +161,7 @@ class InfosG3(Infos): update = False name = str(f'info-id.0x{addr:x}') - self.tracer.log(level, f'GEN3: {name} : {result}{unit}' - f' update: {update}') + if update: + self.tracer.log(level, f'GEN3: {name} : {result}{unit}') i += 1 diff --git a/app/src/gen3plus/infos_g3p.py b/app/src/gen3plus/infos_g3p.py index b0adc0a..ed8d9bd 100644 --- a/app/src/gen3plus/infos_g3p.py +++ b/app/src/gen3plus/infos_g3p.py @@ -122,5 +122,5 @@ class InfosG3P(Infos): name = str(f'info-id.0x{addr:x}') update = False - self.tracer.log(level, f'GEN3PLUS: {name} : {result}{unit}' - f' update: {update}') + if update: + self.tracer.log(level, f'GEN3PLUS: {name} : {result}{unit}') diff --git a/app/src/infos.py b/app/src/infos.py index e9e8ebe..dadacd7 100644 --- a/app/src/infos.py +++ b/app/src/infos.py @@ -193,7 +193,7 @@ class Infos: Register.SERIAL_NUMBER: {'name': ['inverter', 'Serial_Number'], 'level': logging.DEBUG, 'unit': ''}, # noqa: E501 Register.EQUIPMENT_MODEL: {'name': ['inverter', 'Equipment_Model'], 'level': logging.DEBUG, 'unit': ''}, # noqa: E501 Register.NO_INPUTS: {'name': ['inverter', 'No_Inputs'], 'level': logging.DEBUG, 'unit': ''}, # noqa: E501 - Register.MAX_DESIGNED_POWER: {'name': ['inverter', 'Max_Designed_Power'], 'level': logging.DEBUG, 'unit': 'W', 'ha': {'dev': 'inverter', 'dev_cla': None, 'stat_cla': None, 'id': 'designed_power_', 'fmt': '| string + " W"', 'name': 'Max Designed Power', 'icon': 'mdi:lightning-bolt', 'ent_cat': 'diagnostic'}}, # noqa: E501 + Register.MAX_DESIGNED_POWER: {'name': ['inverter', 'Max_Designed_Power'], 'level': logging.INFO, 'unit': 'W', 'ha': {'dev': 'inverter', 'dev_cla': None, 'stat_cla': None, 'id': 'designed_power_', 'fmt': '| string + " W"', 'name': 'Max Designed Power', 'icon': 'mdi:lightning-bolt', 'ent_cat': 'diagnostic'}}, # noqa: E501 Register.RATED_POWER: {'name': ['inverter', 'Rated_Power'], 'level': logging.DEBUG, 'unit': 'W', 'ha': {'dev': 'inverter', 'dev_cla': None, 'stat_cla': None, 'id': 'rated_power_', 'fmt': '| string + " W"', 'name': 'Rated Power', 'icon': 'mdi:lightning-bolt', 'ent_cat': 'diagnostic'}}, # noqa: E501 Register.PV1_MANUFACTURER: {'name': ['inverter', 'PV1_Manufacturer'], 'level': logging.DEBUG, 'unit': ''}, # noqa: E501 diff --git a/app/src/modbus.py b/app/src/modbus.py index e8a8d0e..25c5734 100644 --- a/app/src/modbus.py +++ b/app/src/modbus.py @@ -146,10 +146,10 @@ class Modbus(): else: name = str(f'info-id.0x{addr:x}') update = False - - info_db.tracer.log(level, - f'MODBUS({node_id}): {name} : {result}' - f'{unit} update: {update}') + if update: + info_db.tracer.log(level, + f'MODBUS[{node_id}]: {name} : {result}' + f'{unit}') def check_crc(self, msg) -> bool: return 0 == self.__calc_crc(msg) diff --git a/app/src/scheduler.py b/app/src/scheduler.py index dc45890..a1e763b 100644 --- a/app/src/scheduler.py +++ b/app/src/scheduler.py @@ -40,4 +40,4 @@ class Schedule: if m.server_side: fnc = getattr(m, "send_modbus_cmd", None) if callable(fnc): - await fnc(Modbus.READ_REGS, 0x300e, 2) + await fnc(Modbus.READ_REGS, 0x3008, 20)