Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions custom_components/ws_core/config_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -1372,6 +1372,12 @@ async def async_step_pwsweather(self, user_input: dict[str, Any] | None = None):
return await self.async_step_wow()
if self._data.get(CONF_ENABLE_AWEKAS):
return await self.async_step_awekas()
if self._data.get(CONF_ENABLE_OWM_STATIONS):
return await self.async_step_owm_stations()
if self._data.get(CONF_ENABLE_WINDY):
return await self.async_step_windy()
if self._data.get(CONF_ENABLE_CWOP):
return await self.async_step_cwop()
if self._data.get(CONF_ENABLE_MQTT):
return await self.async_step_mqtt_config()
return await self.async_step_alerts()
Expand Down Expand Up @@ -1415,6 +1421,12 @@ async def async_step_wow(self, user_input: dict[str, Any] | None = None):
self._data[CONF_WOW_INTERVAL_MIN] = int(user_input.get(CONF_WOW_INTERVAL_MIN, DEFAULT_WOW_INTERVAL_MIN))
if self._data.get(CONF_ENABLE_AWEKAS):
return await self.async_step_awekas()
if self._data.get(CONF_ENABLE_OWM_STATIONS):
return await self.async_step_owm_stations()
if self._data.get(CONF_ENABLE_WINDY):
return await self.async_step_windy()
if self._data.get(CONF_ENABLE_CWOP):
return await self.async_step_cwop()
if self._data.get(CONF_ENABLE_MQTT):
return await self.async_step_mqtt_config()
return await self.async_step_alerts()
Expand Down Expand Up @@ -1462,6 +1474,8 @@ async def async_step_awekas(self, user_input: dict[str, Any] | None = None):
return await self.async_step_owm_stations()
if self._data.get(CONF_ENABLE_WINDY):
return await self.async_step_windy()
if self._data.get(CONF_ENABLE_CWOP):
return await self.async_step_cwop()
if self._data.get(CONF_ENABLE_MQTT):
return await self.async_step_mqtt_config()
return await self.async_step_alerts()
Expand Down Expand Up @@ -1507,6 +1521,8 @@ async def async_step_owm_stations(self, user_input: dict[str, Any] | None = None
)
if self._data.get(CONF_ENABLE_WINDY):
return await self.async_step_windy()
if self._data.get(CONF_ENABLE_CWOP):
return await self.async_step_cwop()
if self._data.get(CONF_ENABLE_MQTT):
return await self.async_step_mqtt_config()
return await self.async_step_alerts()
Expand Down
7 changes: 4 additions & 3 deletions custom_components/ws_core/coordinator.py
Original file line number Diff line number Diff line change
Expand Up @@ -2400,12 +2400,13 @@ def _discover_blitzortung(self) -> None:

registry = er.async_get(self.hass)
for entry in registry.entities.values():
if entry.platform != "blitzortung":
continue
eid = entry.entity_id
uid = (entry.unique_id or "").lower()
# Match by platform name OR entity_id prefix (covers renamed/forked installs)
if entry.platform != "blitzortung" and not eid.startswith("sensor.blitzortung_"):
continue
if SRC_LIGHTNING_COUNT not in self._blitzortung_sources and (
"counter" in uid or "count" in uid or "counter" in eid
"counter" in uid or "count" in uid or "counter" in eid or "count" in eid
):
self._blitzortung_sources[SRC_LIGHTNING_COUNT] = eid
_LOGGER.debug("Blitzortung lightning counter auto-detected: %s", eid)
Expand Down
2 changes: 1 addition & 1 deletion custom_components/ws_core/diagnostics.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ async def async_get_config_entry_diagnostics(hass: HomeAssistant, entry: ConfigE

return {
"title": entry.title,
"version": "2.1.0",
"version": "2.1.1",
"entry_data": _redact_coords(dict(entry.data)),
"entry_options": _redact_coords(dict(entry.options)),
"sources": sources,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/ws_core/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
"iot_class": "calculated",
"issue_tracker": "https://github.com/kmich/ha_ws_core/issues",
"requirements": [],
"version": "2.1.0"
"version": "2.1.1"
}
Loading
Loading