diff --git a/app/src/gen3/infos_g3.py b/app/src/gen3/infos_g3.py index 7f93532..726f289 100644 --- a/app/src/gen3/infos_g3.py +++ b/app/src/gen3/infos_g3.py @@ -152,7 +152,7 @@ class InfosG3(Infos): " not supported") return - keys, level, unit, must_incr, new_val = self._key_obj(info_id) + keys, level, unit, must_incr = self._key_obj(info_id) if keys: name, update = self.update_db(keys, must_incr, result) @@ -165,4 +165,3 @@ class InfosG3(Infos): f' update: {update}') i += 1 - diff --git a/app/src/gen3plus/infos_g3p.py b/app/src/gen3plus/infos_g3p.py index d02e7f9..ed53748 100644 --- a/app/src/gen3plus/infos_g3p.py +++ b/app/src/gen3plus/infos_g3p.py @@ -115,7 +115,7 @@ class InfosG3P(Infos): if 'ratio' in row: result = round(result * row['ratio'], 2) - keys, level, unit, must_incr, new_val = self._key_obj(info_id) + keys, level, unit, must_incr = self._key_obj(info_id) if keys: name, update = self.update_db(keys, must_incr, result) diff --git a/app/src/gen3plus/solarman_v5.py b/app/src/gen3plus/solarman_v5.py index 72b2172..c58b51a 100644 --- a/app/src/gen3plus/solarman_v5.py +++ b/app/src/gen3plus/solarman_v5.py @@ -25,8 +25,6 @@ class SolarmanV5(Message): self.control = 0 self.serial = 0 self.snr = 0 - # self.await_conn_resp_cnt = 0 - # self.id_str = id_str self.db = InfosG3P() self.switch = { diff --git a/app/src/infos.py b/app/src/infos.py index 0e443f2..31a18d1 100644 --- a/app/src/infos.py +++ b/app/src/infos.py @@ -403,11 +403,8 @@ class Infos: must_incr = d['ha']['must_incr'] else: must_incr = False - new_val = None - # if 'new_value' in d: - # new_val = d['new_value'] - return d['name'], d['level'], d['unit'], must_incr, new_val + return d['name'], d['level'], d['unit'], must_incr def update_db(self, keys, must_incr, result): name = ''