From 10a18237c7cd4d2516fa466f2f5dd071d4bb1d94 Mon Sep 17 00:00:00 2001
From: Stefan Allius <stefan.allius@t-online.de>
Date: Fri, 25 Oct 2024 21:38:36 +0200
Subject: [PATCH] replace some eval calls

---
 app/src/gen3plus/infos_g3p.py | 8 ++++++--
 app/tests/test_infos_g3p.py   | 5 ++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/src/gen3plus/infos_g3p.py b/app/src/gen3plus/infos_g3p.py
index f31f17b..25eb86c 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': '<L'},                 # noqa: E501
         0x41020018: {'reg': Register.DATA_UP_INTERVAL,     'fmt': '<B', 'ratio':   60, 'dep': ProxyMode.SERVER},  # noqa: E501
-        0x41020019: {'reg': Register.COLLECT_INTERVAL,     'fmt': '<B', 'eval': 'round(result/60)', 'dep': ProxyMode.SERVER},  # noqa: E501
+        0x41020019: {'reg': Register.COLLECT_INTERVAL,     'fmt': '<B', 'quotient': 60, 'dep': ProxyMode.SERVER},  # noqa: E501
         0x4102001a: {'reg': Register.HEARTBEAT_INTERVAL,   'fmt': '<B', 'ratio':    1},  # noqa: E501
         0x4102001c: {'reg': Register.SIGNAL_STRENGTH,      'fmt': '<B', 'ratio':    1, 'dep': ProxyMode.SERVER},  # noqa: E501
         0x4102001e: {'reg': Register.CHIP_MODEL,           'fmt': '!40s'},               # noqa: E501
@@ -32,7 +32,7 @@ class RegisterMap:
         0x420100d2: {'reg': Register.GRID_VOLTAGE,         'fmt': '!H', 'ratio':  0.1},  # noqa: E501
         0x420100d4: {'reg': Register.GRID_CURRENT,         'fmt': '!H', 'ratio': 0.01},  # noqa: E501
         0x420100d6: {'reg': Register.GRID_FREQUENCY,       'fmt': '!H', 'ratio': 0.01},  # noqa: E501
-        0x420100d8: {'reg': Register.INVERTER_TEMP,        'fmt': '!H', 'eval': 'result-40'},  # noqa: E501
+        0x420100d8: {'reg': Register.INVERTER_TEMP,        'fmt': '!H', 'offset': -40},  # noqa: E501
         # 0x420100d8: {'reg': Register.INVERTER_TEMP,        'fmt': '!H'},                 # noqa: E501
         0x420100dc: {'reg': Register.RATED_POWER,          'fmt': '!H', 'ratio':    1},  # noqa: E501
         0x420100de: {'reg': Register.OUTPUT_POWER,         'fmt': '!H', 'ratio':  0.1},  # noqa: E501
@@ -149,4 +149,8 @@ class InfosG3P(Infos):
             result = eval(row['eval'])
         if 'ratio' in row:
             result = round(result * row['ratio'], 2)
+        if 'quotient' in row:
+            result = round(result/row['quotient'])
+        if 'offset' in row:
+            result = result + row['offset']
         return result
diff --git a/app/tests/test_infos_g3p.py b/app/tests/test_infos_g3p.py
index c80a6b7..c9ceb4e 100644
--- a/app/tests/test_infos_g3p.py
+++ b/app/tests/test_infos_g3p.py
@@ -259,6 +259,8 @@ def test_build_ha_conf4():
 def test_exception_and_eval(inverter_data: bytes):
 
     # add eval to convert temperature from °F to °C
+    ofs =     RegisterMap.map[0x420100d8]['offset']
+    del RegisterMap.map[0x420100d8]['offset']
     RegisterMap.map[0x420100d8]['eval'] =  '(result-32)/1.8'
     # map PV1_VOLTAGE to invalid register  
     RegisterMap.map[0x420100e0]['reg'] = Register.TEST_REG2
@@ -279,4 +281,5 @@ def test_exception_and_eval(inverter_data: bytes):
     for key, update in i.parse (inverter_data, 0x42, 1):
         pass  #  side effect is calling generator i.parse()
     assert 54 == i.get_db_value(Register.INVERTER_TEMP, 0)
- 
\ No newline at end of file
+
+    RegisterMap.map[0x420100d8]['offset'] = ofs