Merge pull request #2782 from openWB/release-merge-1

Merge master into Release

Author: LKuemmel

packages/helpermodules/subdata.py

@@ -338,6 +338,18 @@ def process_vehicle_charge_template_topic(self, var: Dict[str, ChargeTemplate],
                 if "ct"+index not in var:
                     var["ct"+index] = ChargeTemplate()
                 var["ct"+index].data = dataclass_from_dict(ChargeTemplateData, decode_payload(msg.payload))
+                # Temporäres ChargeTemplate aktualisieren, wenn persistentes geändert wird
+                for vehicle in self.ev_data.values():
+                    if vehicle.data.charge_template == int(index):
+                        for cp in self.cp_data.values():
+                            if (((cp.chargepoint.data.set.charging_ev != -1 and
+                                    cp.chargepoint.data.set.charging_ev == vehicle.num) or
+                                    cp.chargepoint.data.config.ev == vehicle.num) and
+                                    cp.chargepoint.data.get.plug_state is False):
+                                if decode_payload(msg.payload) == "":
+                                    Pub().pub(f"openWB/chargepoint/{cp.chargepoint.num}/set/charge_template", "")
+                                else:
+                                    cp.chargepoint.update_charge_template(var["ct"+index])
         except Exception:
             log.exception("Fehler im subdata-Modul")
 

packages/modules/devices/huawei/huawei_emma/inverter.py

@@ -32,7 +32,7 @@ def initialize(self) -> None:
 
     def update(self) -> None:
         power = self.client.read_holding_registers(30354, ModbusDataType.INT_32, unit=self.modbus_id) * -1
-        exported = self.client.read_holding_registers(30344, ModbusDataType.UINT_32, unit=self.modbus_id) * 0.01
+        exported = self.client.read_holding_registers(30344, ModbusDataType.UINT_32, unit=self.modbus_id) * 10
 
         inverter_state = InverterState(
             power=power,