Update plugin_solax

wills106 · Feb 14, 2023 · 09b323c · 09b323c
1 parent d1552cd
commit 09b323c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/custom_components/solax_modbus/manifest.json b/custom_components/solax_modbus/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "solax_modbus",
   "name": "SolaX Inverter Modbus",
-  "version": "2023.02.6.2",
+  "version": "2023.02.6.3",
   "documentation": "https://github.com/wills106/homsassistant-solax-modbus",
   "issue_tracker": "https://github.com/wills106/homsassistant-solax-modbus/issues",
   "requirements": ["pymodbus>=2.5.3", "pymodbus<=3.1.1"],

diff --git a/custom_components/solax_modbus/plugin_solax.py b/custom_components/solax_modbus/plugin_solax.py
@@ -4438,7 +4438,7 @@ def determineInverterType(self, hub, configdict):
         seriesnumber                       = _read_serialnr(hub, 0x0)
         if not seriesnumber:  
             seriesnumber = _read_serialnr(hub, 0x300) # bug in endian.Little decoding?
-            if seriesnumber and not seriesnumber.startswith("M"):
+            if seriesnumber and not seriesnumber.startswith(("M", "X")):
                 ba = bytearray(seriesnumber,"ascii") # convert to bytearray for swapping
                 ba[0::2], ba[1::2] = ba[1::2], ba[0::2] # swap bytes ourselves - due to bug in Endian.Little ?
                 res = str(ba, "ascii") # convert back to string
@@ -4459,8 +4459,6 @@ def determineInverterType(self, hub, configdict):
         elif seriesnumber.startswith('HUE'):   invertertype = HYBRID | GEN3 | X1 # Gen3 X1 Late
         elif seriesnumber.startswith('XRE'):   invertertype = HYBRID | GEN3 | X1 # Gen3 X1 Alternative
         elif seriesnumber.startswith('XAC'):   invertertype = AC | GEN3 | X1 # X1AC
-        elif seriesnumber.startswith('XB3'):   invertertype = PV | GEN3 | X1 # X1-Boost G3, should work with other kW raiting assuming they use Hybrid registers
-        elif seriesnumber.startswith('XM3'):   invertertype = PV | GEN3 | X1 # X1-Mini G3, should work with other kW raiting assuming they use Hybrid registers
         elif seriesnumber.startswith('H3DE'):  invertertype = HYBRID | GEN3 | X3 # Gen3 X3
         elif seriesnumber.startswith('H3E'):   invertertype = HYBRID | GEN3 | X3 # Gen3 X3
         elif seriesnumber.startswith('H3LE'):   invertertype = HYBRID | GEN3 | X3 # Gen3 X3
@@ -4475,8 +4473,9 @@ def determineInverterType(self, hub, configdict):
         elif seriesnumber.startswith('PRE'):   invertertype = AC | GEN4 | X1 # RetroFit
         elif seriesnumber.startswith('PRI'):   invertertype = AC | GEN4 | X1 # RetroFit
         elif seriesnumber.startswith('H34'):   invertertype = HYBRID | GEN4 | X3 # Gen4 X3
-        elif seriesnumber.startswith('XB3'):   invertertype = MIC | GEN2 | X1 # X1-Boost G3, should work with other kW raiting assuming they use Hybrid registers
-        elif seriesnumber.startswith('XM3'):   invertertype = MIC | GEN2 | X1 # X1-Mini G3, should work with other kW raiting assuming they use Hybrid registers
+        elif seriesnumber.startswith('XB3'):   invertertype = MIC | GEN2 | X1 # X1-Boost
+        elif seriesnumber.startswith('XM3'):   invertertype = MIC | GEN2 | X1 # X1-Mini G3
+        elif seriesnumber.startswith('XMA'):   invertertype = MIC | GEN2 | X1 # X1-Mini G3
         elif seriesnumber.startswith('MC103T'):  invertertype = MIC | GEN | X3 # MIC X3
         elif seriesnumber.startswith('MP153T'):  invertertype = MIC | GEN | X3 # MIC X3
         elif seriesnumber.startswith('MC203T'):  invertertype = MIC | GEN | X3 # MIC X3