snaptec#2245 Namen bereinigt, heißt offizill SMA Tripower Smart Energ…

…y nicht hybrid.
webermax · Jun 17, 2022 · 64770f7 · 64770f7
1 parent 36320de
commit 64770f7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/packages/modules/sma_modbus_tcp/inverter_modbus_tcp.py b/packages/modules/sma_modbus_tcp/inverter_modbus_tcp.py
@@ -49,7 +49,7 @@ def read_inverter_state(self) -> InverterState:
                 power = self.__tcp_client.read_holding_registers(40084, ModbusDataType.INT_16, unit=1) * 10
                 # Gesamtertrag (Wh) [E-Total] SF=2!
                 energy = self.__tcp_client.read_holding_registers(40094, ModbusDataType.UINT_32, unit=1) * 100
-            elif self.component_config["configuration"]["version"] == SmaInverterVersion.hybrid:
+            elif self.component_config["configuration"]["version"] == SmaInverterVersion.tripower_smart_energy:
                 # Leistung des Wechselrichters (inkl Batterie-ladung/-entladung) (W) [Pac]
                 power = self.__tcp_client.read_holding_registers(30775, ModbusDataType.INT_32, unit=3)
                 if power != self.SMA_INT32_NAN:

diff --git a/packages/modules/sma_modbus_tcp/inverter_version.py b/packages/modules/sma_modbus_tcp/inverter_version.py
@@ -5,4 +5,4 @@
 class SmaInverterVersion(IntEnum):
     default = 0
     core2 = 1
-    hybrid = 2
+    tripower_smart_energy = 2
diff --git a/web/settings/modulconfigpv.php b/web/settings/modulconfigpv.php
@@ -554,7 +554,7 @@
 									<select name="wrsmaversion" id="wrsmaversion" class="form-control">
 										<option <?php if($wrsmaversionold == 0) echo "selected" ?> value="0">Standard</option>
 										<option <?php if($wrsmaversionold == 1) echo "selected" ?> value="1">Core-2</option>
-										<option <?php if($wrsmaversionold == 2) echo "selected" ?> value="2">TriPower Hybrid</option>
+										<option <?php if($wrsmaversionold == 2) echo "selected" ?> value="2">Tripower Smart Energy</option>
 									</select>
 								</div>
 							</div>
@@ -1036,7 +1036,7 @@ function display_pvwattmodul() {
 								}
 								if($('#pvwattmodul').val() == 'wr_solax') {
 									showSection('#pvwrsolax');
-									showSection('#pvid');									
+									showSection('#pvid');
 								}
 								if($('#pvwattmodul').val() == 'wr_smartme') {
 									showSection('#pvsmartme');