undo changes

- simple memory log handler which stores the last
  64 warnings/errors for the dashboard

CHANGELOG.md

@@ -7,8 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
-- set no of pv modules for MS800 GEN3PLUS inverters
-- fix the paths to copy the config.example.toml file during proxy start
 - add MQTT topic `dcu_power` for setting output power on DCUs
 - Update ghcr.io/hassio-addons/base Docker tag to v17.2.5
 - fix a lot of pytest-asyncio problems in the unit tests  

app/requirements-test.txt

@@ -4,5 +4,5 @@
     pytest-cov==6.1.1
     python-dotenv==1.1.0
     mock==5.2.0
-    coverage==7.8.1
+    coverage==7.8.0
     jinja2-cli==0.8.2

app/src/cnf/config.py

@@ -162,8 +162,7 @@ class Config():
     )
 
     @classmethod
-    def init(cls, def_reader: ConfigIfc, log_path: str = '',
-             cnf_path: str = 'config') -> None | str:
+    def init(cls, def_reader: ConfigIfc, log_path: str = '') -> None | str:
         '''Initialise the Proxy-Config
 
 Copy the internal default config file into the config directory
@@ -174,13 +173,12 @@ and initialise the Config with the default configuration '''
         try:
             # make the default config transparaent by copying it
             # in the config.example file
-            logging.info(
-                f'Copy Default Config to {cnf_path}config.example.toml')
+            logging.debug('Copy Default Config to config.example.toml')
 
-            shutil.copy2("cnf/default_config.toml",
-                         cnf_path + "config.example.toml")
-        except Exception as e:
-            logging.error(e)
+            shutil.copy2("default_config.toml",
+                         "config/config.example.toml")
+        except Exception:
+            pass
 
         # read example config file as default configuration
         try:

app/src/gen3plus/infos_g3p.py

@@ -216,7 +216,7 @@ class InfosG3P(Infos):
         self.set_db_def_value(Register.MANUFACTURER, 'TSUN')
         self.set_db_def_value(Register.EQUIPMENT_MODEL, 'TSOL-MSxx00')
         self.set_db_def_value(Register.CHIP_TYPE, 'IGEN TECH')
-        self.set_db_def_value(Register.NO_INPUTS, 2)
+        self.set_db_def_value(Register.NO_INPUTS, 4)
 
     def __hide_topic(self, row: dict) -> bool:
         if 'dep' in row:

app/src/gen3plus/solarman_v5.py

@@ -562,17 +562,12 @@ class SolarmanV5(SolarmanBase):
         rated = db.get_db_value(Register.RATED_POWER, 0)
         model = None
         if max_pow == 2000:
-            db.set_db_def_value(Register.NO_INPUTS, 4)
             if rated == 800 or rated == 600:
                 model = f'TSOL-MS{max_pow}({rated})'
             else:
                 model = f'TSOL-MS{max_pow}'
         elif max_pow == 1800 or max_pow == 1600:
-            db.set_db_def_value(Register.NO_INPUTS, 4)
             model = f'TSOL-MS{max_pow}'
-        elif max_pow <= 800:
-            model = f'TSOL-MS{max_pow}'
-
         if model:
             logger.info(f'Model: {model}')
             self.db.set_db_def_value(Register.EQUIPMENT_MODEL, model)

app/src/server.py

@@ -127,8 +127,7 @@ class Server():
     def build_config(self):
         # read config file
         Config.init(ConfigReadToml(self.src_dir + "cnf/default_config.toml"),
-                    log_path=self.log_path,
-                    cnf_path=self.config_path)
+                    log_path=self.log_path)
         ConfigReadEnv()
         ConfigReadJson(self.config_path + "config.json")
         ConfigReadToml(self.config_path + "config.toml")

app/tests/test_infos_g3p.py

@@ -109,7 +109,7 @@ def test_default_db():
     i = InfosG3P(client_mode=False)
     
     assert json.dumps(i.db) == json.dumps({
-        "inverter": {"Manufacturer": "TSUN", "Equipment_Model": "TSOL-MSxx00", "No_Inputs": 2}, 
+        "inverter": {"Manufacturer": "TSUN", "Equipment_Model": "TSOL-MSxx00", "No_Inputs": 4}, 
         "collector": {"Chip_Type": "IGEN TECH"},
         })
 
@@ -271,7 +271,7 @@ def test_build_ha_conf1():
         elif id == 'inv_count_456':
             assert False
 
-    assert tests==5
+    assert tests==7
 
 def test_build_ha_conf2():
     i = InfosG3P(client_mode=False)
@@ -346,7 +346,7 @@ def test_build_ha_conf3():
         elif id == 'inv_count_456':
             assert False
 
-    assert tests==5
+    assert tests==7
 
 def test_build_ha_conf4():
     i = InfosG3P(client_mode=True)

app/tests/test_solarman.py

@@ -462,39 +462,6 @@ def inverter_ind_msg800():  # 0x4210 rated Power 800W
     msg += b'\x15'
     return msg
 
-@pytest.fixture
-def inverter_ind_msg900():  # 0x4210 rated Power 900W 
-    msg  = b'\xa5\x99\x01\x10\x42\xe6\x9e' +get_sn()  +b'\x01\xb0\x02\xbc\xc8'
-    msg += b'\x24\x32\x6c\x1f\x00\x00\xa0\x47\xe4\x33\x01\x00\x03\x08\x00\x00'
-    msg += b'\x59\x31\x37\x45\x37\x41\x30\x46\x30\x31\x30\x42\x30\x31\x33\x45'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg += b'\x00\x01\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg +=  b'\x40\x10\x08\xc8\x00\x49\x13\x8d\x00\x36\x00\x00\x03\x84\x06\x7a'
-    msg += b'\x01\x61\x00\xa8\x02\x54\x01\x5a\x00\x8a\x01\xe4\x01\x5a\x00\xbd'
-    msg += b'\x02\x8f\x00\x11\x00\x01\x00\x00\x00\x0b\x00\x00\x27\x98\x00\x04'
-    msg += b'\x00\x00\x0c\x04\x00\x03\x00\x00\x0a\xe7\x00\x05\x00\x00\x0c\x75'
-    msg += b'\x00\x00\x00\x00\x06\x16\x02\x00\x00\x00\x55\xaa\x00\x01\x00\x00'
-    msg +=  b'\x00\x00\x00\x00\xff\xff\x03\x84\x00\x03\x04\x00\x04\x00\x04\x00'
-    msg += b'\x04\x00\x00\x01\xff\xff\x00\x01\x00\x06\x00\x68\x00\x68\x05\x00'
-    msg += b'\x09\xcd\x07\xb6\x13\x9c\x13\x24\x00\x01\x07\xae\x04\x0f\x00\x41'
-    msg += b'\x00\x0f\x0a\x64\x0a\x64\x00\x06\x00\x06\x09\xf6\x12\x8c\x12\x8c'
-    msg += b'\x00\x10\x00\x10\x14\x52\x14\x52\x00\x10\x00\x10\x01\x51\x00\x05'
-    msg += b'\x04\x00\x00\x01\x13\x9c\x0f\xa0\x00\x4e\x00\x66\x03\xe8\x04\x00'
-    msg += b'\x09\xce\x07\xa8\x13\x9c\x13\x26\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg += b'\x00\x00\x00\x00\x04\x00\x04\x00\x00\x00\x00\x00\xff\xff\x00\x00'
-    msg += b'\x00\x00\x00\x00'
-    msg += correct_checksum(msg)
-    msg += b'\x15'
-    return msg
-
 @pytest.fixture
 def inverter_ind_msg_81():  # 0x4210 fcode 0x81
     msg  = b'\xa5\x99\x01\x10\x42\x02\x03' +get_sn()  +b'\x81\xb0\x02\xbc\xc8'
@@ -1468,7 +1435,6 @@ async def test_build_modell_600(my_loop, config_tsun_allow_all, inverter_ind_msg
     m.read()         # read complete msg, and dispatch msg
     assert 2000 == m.db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
     assert 600 == m.db.get_db_value(Register.RATED_POWER, 0)
-    assert 4 == m.db.get_db_value(Register.NO_INPUTS, 0)
     assert 'TSOL-MS2000(600)' == m.db.get_db_value(Register.EQUIPMENT_MODEL, 0)
     assert '02b0' == m.db.get_db_value(Register.SENSOR_LIST, None)
     assert 0 == m.sensor_list   # must not been set by an inverter data ind
@@ -1488,7 +1454,6 @@ async def test_build_modell_1600(my_loop, config_tsun_allow_all, inverter_ind_ms
     m.read()         # read complete msg, and dispatch msg
     assert 1600 == m.db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
     assert 1600 == m.db.get_db_value(Register.RATED_POWER, 0)
-    assert 4 == m.db.get_db_value(Register.NO_INPUTS, 0)
     assert 'TSOL-MS1600' == m.db.get_db_value(Register.EQUIPMENT_MODEL, 0)
     m.close()
 
@@ -1502,7 +1467,6 @@ async def test_build_modell_1800(my_loop, config_tsun_allow_all, inverter_ind_ms
     m.read()         # read complete msg, and dispatch msg
     assert 1800 == m.db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
     assert 1800 == m.db.get_db_value(Register.RATED_POWER, 0)
-    assert 4 == m.db.get_db_value(Register.NO_INPUTS, 0)
     assert 'TSOL-MS1800' == m.db.get_db_value(Register.EQUIPMENT_MODEL, 0)
     m.close()
 
@@ -1516,7 +1480,6 @@ async def test_build_modell_2000(my_loop, config_tsun_allow_all, inverter_ind_ms
     m.read()         # read complete msg, and dispatch msg
     assert 2000 == m.db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
     assert 2000 == m.db.get_db_value(Register.RATED_POWER, 0)
-    assert 4 == m.db.get_db_value(Register.NO_INPUTS, 0)
     assert 'TSOL-MS2000' == m.db.get_db_value(Register.EQUIPMENT_MODEL, 0)
     m.close()
 
@@ -1530,21 +1493,6 @@ async def test_build_modell_800(my_loop, config_tsun_allow_all, inverter_ind_msg
     m.read()         # read complete msg, and dispatch msg
     assert 800 == m.db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
     assert 800 == m.db.get_db_value(Register.RATED_POWER, 0)
-    assert 2 == m.db.get_db_value(Register.NO_INPUTS, 0)
-    assert 'TSOL-MS800' == m.db.get_db_value(Register.EQUIPMENT_MODEL, 0)
-    m.close()
-
-@pytest.mark.asyncio
-async def test_build_modell_900(my_loop, config_tsun_allow_all, inverter_ind_msg900):
-    _ = config_tsun_allow_all
-    m = MemoryStream(inverter_ind_msg900, (0,))
-    assert 0 == m.db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
-    assert None == m.db.get_db_value(Register.RATED_POWER, None)
-    assert None == m.db.get_db_value(Register.INVERTER_TEMP, None)
-    m.read()         # read complete msg, and dispatch msg
-    assert 900 == m.db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
-    assert 900 == m.db.get_db_value(Register.RATED_POWER, 0)
-    assert 2 == m.db.get_db_value(Register.NO_INPUTS, 0)
     assert 'TSOL-MSxx00' == m.db.get_db_value(Register.EQUIPMENT_MODEL, 0)
     m.close()
 
@@ -2594,7 +2542,6 @@ async def test_proxy_dcu_cmd(my_loop, config_tsun_dcu1, patch_open_connection, d
         assert l.db.stat['proxy']['AT_Command'] == 0
         assert l.db.stat['proxy']['AT_Command_Blocked'] == 0
         assert l.db.stat['proxy']['Modbus_Command'] == 0
-        assert 2 == l.db.get_db_value(Register.NO_INPUTS, 0)
 
         l.append_msg(dcu_command_rsp_msg)
         l.read() # read at resp