Fix *.*_SCHEMA deprecations (#63)

.github/workflows/ci.yaml

@@ -415,6 +415,9 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
           cache-key: ${{ needs.common.outputs.cache-key }}
 
+      - name: Register matcher
+        run: echo "::add-matcher::.github/workflows/matchers/esphome-config.json"
+
       - name: Validate example configurations
         run: |
           . venv/bin/activate

.github/workflows/matchers/esphome-config.json

@@ -0,0 +1,14 @@
+{
+    "problemMatcher": [
+        {
+            "owner": "esphome-config",
+            "severity": "warning",
+            "pattern": [
+                {
+                    "regexp": "^WARNING Using `([^`]+)` is deprecated and will be removed(.*)$",
+                    "message": 1
+                }
+            ]
+        }
+    ]
+}

components/votronic/text_sensor.py

@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import text_sensor
 import esphome.config_validation as cv
-from esphome.const import CONF_ICON, CONF_ID
+from esphome.const import CONF_ID
 
 from . import CONF_VOTRONIC_ID, Votronic
 
@@ -39,73 +39,41 @@ TEXT_SENSORS = [
 CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(CONF_VOTRONIC_ID): cv.use_id(Votronic),
-        cv.Optional(CONF_BATTERY_STATUS): text_sensor.TEXT_SENSOR_SCHEMA.extend(
-            {
-                cv.GenerateID(): cv.declare_id(text_sensor.TextSensor),
-                cv.Optional(CONF_ICON, default="mdi:alert-circle-outline"): cv.icon,
-            }
+        cv.Optional(CONF_BATTERY_STATUS): text_sensor.text_sensor_schema(
+            text_sensor.TextSensor, icon="mdi:alert-circle-outline"
         ),
-        cv.Optional(CONF_CHARGER_MODE_SETTING): text_sensor.TEXT_SENSOR_SCHEMA.extend(
-            {
-                cv.GenerateID(): cv.declare_id(text_sensor.TextSensor),
-                cv.Optional(CONF_ICON, default="mdi:car-battery"): cv.icon,
-            }
+        cv.Optional(CONF_CHARGER_MODE_SETTING): text_sensor.text_sensor_schema(
+            text_sensor.TextSensor, icon="mdi:car-battery"
         ),
-        cv.Optional(
-            CONF_CHARGER_CONTROLLER_STATUS
-        ): text_sensor.TEXT_SENSOR_SCHEMA.extend(
-            {
-                cv.GenerateID(): cv.declare_id(text_sensor.TextSensor),
-                cv.Optional(CONF_ICON, default="mdi:heart-pulse"): cv.icon,
-            }
+        cv.Optional(CONF_CHARGER_CONTROLLER_STATUS): text_sensor.text_sensor_schema(
+            text_sensor.TextSensor, icon="mdi:heart-pulse"
         ),
-        cv.Optional(CONF_CHARGER_BATTERY_STATUS): text_sensor.TEXT_SENSOR_SCHEMA.extend(
-            {
-                cv.GenerateID(): cv.declare_id(text_sensor.TextSensor),
-                cv.Optional(CONF_ICON, default="mdi:alert-circle-outline"): cv.icon,
-            }
+        cv.Optional(CONF_CHARGER_BATTERY_STATUS): text_sensor.text_sensor_schema(
+            text_sensor.TextSensor, icon="mdi:alert-circle-outline"
         ),
         cv.Optional(
             CONF_CHARGING_CONVERTER_BATTERY_STATUS
-        ): text_sensor.TEXT_SENSOR_SCHEMA.extend(
-            {
-                cv.GenerateID(): cv.declare_id(text_sensor.TextSensor),
-                cv.Optional(CONF_ICON, default="mdi:car-battery"): cv.icon,
-            }
+        ): text_sensor.text_sensor_schema(
+            text_sensor.TextSensor, icon="mdi:car-battery"
         ),
         cv.Optional(
             CONF_CHARGING_CONVERTER_CONTROLLER_STATUS
-        ): text_sensor.TEXT_SENSOR_SCHEMA.extend(
-            {
-                cv.GenerateID(): cv.declare_id(text_sensor.TextSensor),
-                cv.Optional(CONF_ICON, default="mdi:heart-pulse"): cv.icon,
-            }
+        ): text_sensor.text_sensor_schema(
+            text_sensor.TextSensor, icon="mdi:heart-pulse"
         ),
         cv.Optional(
             CONF_CHARGING_CONVERTER_MODE_SETTING
-        ): text_sensor.TEXT_SENSOR_SCHEMA.extend(
-            {
-                cv.GenerateID(): cv.declare_id(text_sensor.TextSensor),
-                cv.Optional(CONF_ICON, default="mdi:car-battery"): cv.icon,
-            }
+        ): text_sensor.text_sensor_schema(
+            text_sensor.TextSensor, icon="mdi:car-battery"
         ),
-        cv.Optional(CONF_PV_MODE_SETTING): text_sensor.TEXT_SENSOR_SCHEMA.extend(
-            {
-                cv.GenerateID(): cv.declare_id(text_sensor.TextSensor),
-                cv.Optional(CONF_ICON, default="mdi:car-battery"): cv.icon,
-            }
+        cv.Optional(CONF_PV_MODE_SETTING): text_sensor.text_sensor_schema(
+            text_sensor.TextSensor, icon="mdi:car-battery"
         ),
-        cv.Optional(CONF_PV_BATTERY_STATUS): text_sensor.TEXT_SENSOR_SCHEMA.extend(
-            {
-                cv.GenerateID(): cv.declare_id(text_sensor.TextSensor),
-                cv.Optional(CONF_ICON, default="mdi:alert-circle-outline"): cv.icon,
-            }
+        cv.Optional(CONF_PV_BATTERY_STATUS): text_sensor.text_sensor_schema(
+            text_sensor.TextSensor, icon="mdi:alert-circle-outline"
         ),
-        cv.Optional(CONF_PV_CONTROLLER_STATUS): text_sensor.TEXT_SENSOR_SCHEMA.extend(
-            {
-                cv.GenerateID(): cv.declare_id(text_sensor.TextSensor),
-                cv.Optional(CONF_ICON, default="mdi:heart-pulse"): cv.icon,
-            }
+        cv.Optional(CONF_PV_CONTROLLER_STATUS): text_sensor.text_sensor_schema(
+            text_sensor.TextSensor, icon="mdi:heart-pulse"
         ),
     }
 )

components/votronic_ble/binary_sensor.py

@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
-from esphome.const import CONF_ICON, CONF_ID
+from esphome.const import CONF_ID
 
 from . import CONF_VOTRONIC_BLE_ID, VotronicBle
 
@@ -32,35 +32,20 @@ BINARY_SENSORS = [
 CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(CONF_VOTRONIC_BLE_ID): cv.use_id(VotronicBle),
-        cv.Optional(CONF_CHARGING): binary_sensor.BINARY_SENSOR_SCHEMA.extend(
-            {
-                cv.GenerateID(): cv.declare_id(binary_sensor.BinarySensor),
-                cv.Optional(CONF_ICON, default=ICON_CHARGING): cv.icon,
-            }
+        cv.Optional(CONF_CHARGING): binary_sensor.binary_sensor_schema(
+            binary_sensor.BinarySensor, icon=ICON_CHARGING
         ),
-        cv.Optional(CONF_DISCHARGING): binary_sensor.BINARY_SENSOR_SCHEMA.extend(
-            {
-                cv.GenerateID(): cv.declare_id(binary_sensor.BinarySensor),
-                cv.Optional(CONF_ICON, default=ICON_DISCHARGING): cv.icon,
-            }
+        cv.Optional(CONF_DISCHARGING): binary_sensor.binary_sensor_schema(
+            binary_sensor.BinarySensor, icon=ICON_DISCHARGING
         ),
-        cv.Optional(CONF_CONTROLLER_ACTIVE): binary_sensor.BINARY_SENSOR_SCHEMA.extend(
-            {
-                cv.GenerateID(): cv.declare_id(binary_sensor.BinarySensor),
-                cv.Optional(CONF_ICON, default=ICON_CONTROLLER_ACTIVE): cv.icon,
-            }
+        cv.Optional(CONF_CONTROLLER_ACTIVE): binary_sensor.binary_sensor_schema(
+            binary_sensor.BinarySensor, icon=ICON_CONTROLLER_ACTIVE
         ),
-        cv.Optional(CONF_CURRENT_REDUCTION): binary_sensor.BINARY_SENSOR_SCHEMA.extend(
-            {
-                cv.GenerateID(): cv.declare_id(binary_sensor.BinarySensor),
-                cv.Optional(CONF_ICON, default=ICON_CURRENT_REDUCTION): cv.icon,
-            }
+        cv.Optional(CONF_CURRENT_REDUCTION): binary_sensor.binary_sensor_schema(
+            binary_sensor.BinarySensor, icon=ICON_CURRENT_REDUCTION
         ),
-        cv.Optional(CONF_AES_ACTIVE): binary_sensor.BINARY_SENSOR_SCHEMA.extend(
-            {
-                cv.GenerateID(): cv.declare_id(binary_sensor.BinarySensor),
-                cv.Optional(CONF_ICON, default=ICON_AES_ACTIVE): cv.icon,
-            }
+        cv.Optional(CONF_AES_ACTIVE): binary_sensor.binary_sensor_schema(
+            binary_sensor.BinarySensor, icon=ICON_AES_ACTIVE
         ),
     }
 )

components/votronic_ble/text_sensor.py

@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import text_sensor
 import esphome.config_validation as cv
-from esphome.const import CONF_ICON, CONF_ID
+from esphome.const import CONF_ID
 
 from . import CONF_VOTRONIC_BLE_ID, VotronicBle
 
@@ -23,17 +23,13 @@ TEXT_SENSORS = [
 CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(CONF_VOTRONIC_BLE_ID): cv.use_id(VotronicBle),
-        cv.Optional(CONF_BATTERY_STATUS): text_sensor.TEXT_SENSOR_SCHEMA.extend(
-            {
-                cv.GenerateID(): cv.declare_id(text_sensor.TextSensor),
-                cv.Optional(CONF_ICON, default=ICON_BATTERY_STATUS): cv.icon,
-            }
+        cv.Optional(CONF_BATTERY_STATUS): text_sensor.text_sensor_schema(
+            class_=text_sensor.TextSensor,
+            icon=ICON_BATTERY_STATUS,
         ),
-        cv.Optional(CONF_PV_CONTROLLER_STATUS): text_sensor.TEXT_SENSOR_SCHEMA.extend(
-            {
-                cv.GenerateID(): cv.declare_id(text_sensor.TextSensor),
-                cv.Optional(CONF_ICON, default=ICON_PV_CONTROLLER_STATUS): cv.icon,
-            }
+        cv.Optional(CONF_PV_CONTROLLER_STATUS): text_sensor.text_sensor_schema(
+            class_=text_sensor.TextSensor,
+            icon=ICON_PV_CONTROLLER_STATUS,
         ),
     }
 )

tests/esp32c6-compatibility-test.yaml

@@ -98,12 +98,35 @@ binary_sensor:
       name: "${name} charging"
     discharging:
       name: "${name} discharging"
-    controller_active:
-      name: "${name} controller active"
-    current_reduction:
-      name: "${name} current reduction"
-    aes_active:
-      name: "${name} aes active"
+
+    charger_charging:
+      name: "${name} charger charging"
+    charger_discharging:
+      name: "${name} charger discharging"
+    charger_controller_active:
+      name: "${name} charger controller active"
+    charger_current_reduction:
+      name: "${name} charger current reduction"
+    charger_aes_active:
+      name: "${name} charger aes active"
+
+    charging_converter_charging:
+      name: "${name} charging converter charging"
+    charging_converter_discharging:
+      name: "${name} charging converter discharging"
+    charging_converter_controller_active:
+      name: "${name} charging converter controller active"
+    charging_converter_current_reduction:
+      name: "${name} charging converter current reduction"
+    charging_converter_aes_active:
+      name: "${name} charging converter aes active"
+
+    pv_controller_active:
+      name: "${name} pv controller active"
+    pv_current_reduction:
+      name: "${name} pv current reduction"
+    pv_aes_active:
+      name: "${name} pv aes active"
 
 sensor:
   - platform: votronic_ble
@@ -144,22 +167,59 @@ sensor:
     votronic_id: votronic1
     battery_voltage:
       name: "${name} battery voltage"
-    secondary_battery_voltage:
-      name: "${name} secondary battery voltage"
     current:
       name: "${name} current"
     power:
       name: "${name} power"
-    state_of_charge:
-      name: "${name} state of charge"
-    controller_temperature:
-      name: "${name} controller temperature"
-    charging_mode_setting_id:
-      name: "${name} charging mode setting id"
     battery_status_bitmask:
       name: "${name} battery status bitmask"
-    charging_controller_status_bitmask:
-      name: "${name} charging controller status bitmask"
+
+    charger_current:
+      name: "${name} charger current"
+    charger_power:
+      name: "${name} charger power"
+    charger_load:
+      name: "${name} charger load"
+    charger_controller_temperature:
+      name: "${name} charger controller temperature"
+    charger_mode_setting_id:
+      name: "${name} charger mode setting id"
+    charger_battery_status_bitmask:
+      name: "${name} charger battery status bitmask"
+    charger_controller_status_bitmask:
+      name: "${name} charger controller status bitmask"
+
+    charging_converter_battery_voltage:
+      name: "${name} charging converter battery voltage"
+    charging_converter_secondary_battery_voltage:
+      name: "${name} charging converter secondary battery voltage"
+    charging_converter_current:
+      name: "${name} charging converter current"
+    charging_converter_power:
+      name: "${name} charging converter power"
+    charging_converter_load:
+      name: "${name} charging converter load"
+    charging_converter_controller_temperature:
+      name: "${name} charging converter controller temperature"
+    charging_converter_mode_setting_id:
+      name: "${name} charging converter mode setting id"
+    charging_converter_battery_status_bitmask:
+      name: "${name} charging converter battery status bitmask"
+    charging_converter_controller_status_bitmask:
+      name: "${name} charging converter controller status bitmask"
+
+    pv_controller_status_bitmask:
+      name: "${name} pv controller status bitmask"
+    pv_controller_temperature:
+      name: "${name} pv controller temperature"
+    pv_battery_status_bitmask:
+      name: "${name} pv battery status bitmask"
+    pv_voltage:
+      name: "${name} pv voltage"
+    pv_current:
+      name: "${name} pv current"
+    pv_power:
+      name: "${name} pv power"
 
 text_sensor:
   - platform: votronic_ble
@@ -171,9 +231,26 @@ text_sensor:
 
   - platform: votronic
     votronic_id: votronic1
-    charging_mode_setting:
-      name: "${name} charging mode setting"
     battery_status:
       name: "${name} battery status"
-    charging_controller_status:
-      name: "${name} charging controller status"
+
+    charger_mode_setting:
+      name: "${name} charger mode setting"
+    charger_battery_status:
+      name: "${name} charger battery status"
+    charger_controller_status:
+      name: "${name} charger controller status"
+
+    charging_converter_mode_setting:
+      name: "${name} charging converter mode setting"
+    charging_converter_battery_status:
+      name: "${name} charging converter battery status"
+    charging_converter_controller_status:
+      name: "${name} charging converter controller status"
+
+    pv_mode_setting:
+      name: "${name} pv mode setting"
+    pv_controller_status:
+      name: "${name} pv controller status"
+    pv_battery_status:
+      name: "${name} pv battery status"