Verbraucher: Shelly Temperaturen, Topics beim Hinzufügen initialisieren

packages/control/consumer/consumer_data.py

@@ -77,6 +77,7 @@ class Get:
     set_power: Optional[float] = None
     state: Optional[bool] = False
     state_str: Optional[str] = field(default=None, metadata={"topic": "get/state_str"})
+    temperatures: Optional[List[float]] = None
     voltages: List[float] = field(default_factory=voltages_list_factory)
 
 

packages/helpermodules/command.py

@@ -1227,8 +1227,8 @@ def addConsumer(self, connection_id: str, payload: dict) -> None:
                              MessageType.ERROR)
         Pub().pub(f'openWB/consumer/{new_id}/module', consumer_default)
         Pub().pub(f"openWB/consumer/{new_id}/config", asdict(ConsumerConfig()))
-        self._publish_default_metadata_fields(f"openWB/consumer/{new_id}", ConsumerGet())
-        self._publish_default_metadata_fields(f"openWB/consumer/{new_id}", ConsumerSet())
+        {Pub().pub(f"openWB/consumer/{new_id}/get/"+k, v) for (k, v) in asdict(ConsumerGet()).items()}
+        {Pub().pub(f"openWB/consumer/{new_id}/set/"+k, v) for (k, v) in asdict(ConsumerSet()).items()}
         Pub().pub(f"openWB/consumer/{new_id}/extra_meter", None)
         Pub().pub(f"openWB/consumer/{new_id}/usage", asdict(Usage(type=consumer_default["usage"][0])))
         self.max_id_hierarchy = new_id

packages/modules/common/store/_consumer.py

@@ -29,8 +29,7 @@ def update(self) -> None:
         if self.state.imported is not None and self.state.exported is not None:
             pub_to_broker(f"openWB/set/consumer/{self.num}/get/imported", self.state.imported, 2)
             pub_to_broker(f"openWB/set/consumer/{self.num}/get/exported", self.state.exported, 2)
-        if self.state.temperatures is not None:
-            pub_to_broker(f"openWB/set/consumer/{self.num}/get/temperatures", self.state.temperatures)
+        pub_to_broker(f"openWB/set/consumer/{self.num}/get/temperatures", self.state.temperatures)
 
 
 class PurgeConsumerState(ValueStore[ConsumerState]):

packages/modules/consumers/shelly/shelly_em/consumer.py

@@ -3,7 +3,7 @@
 from modules.common.component_state import ConsumerState
 from modules.common.configurable_consumer import ConfigurableConsumer
 from modules.consumers.shelly.shelly_em.config import ShellyEM
-from modules.devices.shelly.shelly.status_handler import get_generation, request_status, parse_data
+from modules.devices.shelly.shelly.status_handler import get_generation, request_status, parse_data, parse_temperatures
 
 
 def create_consumer(config: ShellyEM):
@@ -22,6 +22,7 @@ def update() -> ConsumerState:
         consumer_state = ConsumerState(
             power=power,
             powers=powers,
+            temperatures=parse_temperatures(status, generation),
         )
         if voltages is not None:
             consumer_state.voltages = voltages

packages/modules/consumers/shelly/shelly_pm/consumer.py

@@ -5,7 +5,7 @@
 from modules.common.component_state import ConsumerState
 from modules.common.configurable_consumer import ConfigurableConsumer
 from modules.consumers.shelly.shelly_pm.config import ShellyPM
-from modules.devices.shelly.shelly.status_handler import get_generation, request_status, parse_data
+from modules.devices.shelly.shelly.status_handler import get_generation, request_status, parse_data, parse_temperatures
 
 
 def create_consumer(config: ShellyPM):
@@ -63,6 +63,7 @@ def update() -> ConsumerState:
             voltages=voltages,
             currents=currents,
             powers=powers,
+            temperatures=parse_temperatures(status, generation),
         )
 
     return ConfigurableConsumer(consumer_config=config,

packages/modules/devices/shelly/shelly/status_handler.py

@@ -31,6 +31,20 @@ def request_status(address: str, generation: Optional[int]) -> Dict:
     return req.get_http_session().get(status_url, timeout=3).json()
 
 
+def parse_temperatures(status: Dict, generation: int) -> Optional[List[float]]:
+    temperatures: List[float] = []
+    for index in range(3):
+        try:
+            if generation == 1:
+                value = status['ext_temperature'][str(index)]['tC']
+            else:
+                value = status[f'temperature:{100 + index}']['tC']
+            temperatures.append(float(value))
+        except (KeyError, TypeError, ValueError):
+            log.exception(f"Error parsing temperature for index {index} in status: {status}")
+    return temperatures if len(temperatures) > 0 else None
+
+
 def parse_data(phase: int, factor: float, status: Dict) -> Tuple[
         List[float], Optional[List[float]], Optional[List[float]], Optional[List[float]], float, Optional[float]]:
     try: