Merge pull request #174 from SzczepanLeon/esphome_2025.02

ESPHome 2025.02

Author: SzczepanLeon

components/wmbus/__init__.py

@@ -72,7 +72,7 @@
 CLIENT_SCHEMA = cv.Schema({
     cv.GenerateID():                              cv.declare_id(Client),
     cv.Required(CONF_NAME):                       cv.string_strict,
-    cv.Required(CONF_IP_ADDRESS):                 cv.ipv4,
+    cv.Required(CONF_IP_ADDRESS):                 cv.ipv4address,
     cv.Required(CONF_PORT):                       cv.port,
     cv.Optional(CONF_TRANSPORT, default="TCP"):   cv.templatable(validate_transport),
     cv.Optional(CONF_FORMAT, default="RTLWMBUS"): cv.templatable(validate_format),
@@ -82,7 +82,7 @@
     cv.GenerateID(CONF_WMBUS_MQTT_ID):        cv.declare_id(MqttClient),
     cv.Required(CONF_USERNAME):               cv.string_strict,
     cv.Required(CONF_PASSWORD):               cv.string_strict,
-    cv.Required(CONF_BROKER):                 cv.ipv4,
+    cv.Required(CONF_BROKER):                 cv.ipv4address,
     cv.Optional(CONF_PORT,    default=1883):  cv.port,
     cv.Optional(CONF_RETAIN,  default=False): cv.boolean,
 })
@@ -113,7 +113,7 @@
 def safe_ip(ip):
     if ip is None:
         return IPAddress(0, 0, 0, 0)
-    return IPAddress(*ip.args)
+    return IPAddress(str(ip))
 
 async def to_code(config):
     var_adv = cg.new_Pvariable(config[CONF_INFO_COMP_ID])

components/wmbus/version.h

@@ -1,4 +1,4 @@
 #ifndef MY_VERSION
-#define MY_VERSION "4.1.2"
+#define MY_VERSION "4.1.3"
 #define WMBUSMETERS_VERSION "1.17.1-b8f4a945"
 #endif