Merge branch 'dev' into btnpresets-migrate

esphome/components/dfrobot_sen0609/button/__init__.py

@@ -2,17 +2,7 @@ import esphome.codegen as cg
 from esphome.components import button
 from esphome.components.const import CONF_QUERY_PARAMS
 import esphome.config_validation as cv
-from esphome.const import (
-    CONF_FACTORY_RESET,
-    CONF_ID,
-    CONF_RESTART,
-    DEVICE_CLASS_RESTART,
-    ENTITY_CATEGORY_CONFIG,
-    ENTITY_CATEGORY_DIAGNOSTIC,
-    ICON_DATABASE,
-    ICON_RESTART,
-    ICON_RESTART_ALERT,
-)
+from esphome.const import CONF_FACTORY_RESET, CONF_ID, CONF_RESTART
 from esphome.types import ConfigType
 
 from .. import CONF_DFROBOT_SEN0609_ID, DFRobotSEN0609Component, dfrobot_sen0609_ns
@@ -23,23 +13,11 @@ ButtonAction = dfrobot_sen0609_ns.enum("ButtonAction")
 CONFIG_SCHEMA = {
     cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase),
     cv.GenerateID(CONF_DFROBOT_SEN0609_ID): cv.use_id(DFRobotSEN0609Component),
-    cv.Optional(CONF_FACTORY_RESET): button.button_schema(
-        DFRobotSEN0609Button,
-        device_class=DEVICE_CLASS_RESTART,
-        entity_category=ENTITY_CATEGORY_CONFIG,
-        icon=ICON_RESTART_ALERT,
-    ),
-    cv.Optional(CONF_QUERY_PARAMS): button.button_schema(
-        DFRobotSEN0609Button,
-        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
-        icon=ICON_DATABASE,
-    ),
-    cv.Optional(CONF_RESTART): button.button_schema(
-        DFRobotSEN0609Button,
-        device_class=DEVICE_CLASS_RESTART,
-        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
-        icon=ICON_RESTART,
+    cv.Optional(CONF_FACTORY_RESET): button.factory_reset_button_schema(
+        DFRobotSEN0609Button
     ),
+    cv.Optional(CONF_QUERY_PARAMS): button.query_button_schema(DFRobotSEN0609Button),
+    cv.Optional(CONF_RESTART): button.restart_button_schema(DFRobotSEN0609Button),
 }
 
 

esphome/components/ld2410/button/__init__.py

@@ -2,17 +2,7 @@ import esphome.codegen as cg
 from esphome.components import button
 from esphome.components.const import CONF_QUERY_PARAMS
 import esphome.config_validation as cv
-from esphome.const import (
-    CONF_FACTORY_RESET,
-    CONF_ID,
-    CONF_RESTART,
-    DEVICE_CLASS_RESTART,
-    ENTITY_CATEGORY_CONFIG,
-    ENTITY_CATEGORY_DIAGNOSTIC,
-    ICON_DATABASE,
-    ICON_RESTART,
-    ICON_RESTART_ALERT,
-)
+from esphome.const import CONF_FACTORY_RESET, CONF_ID, CONF_RESTART
 from esphome.types import ConfigType
 
 from .. import CONF_LD2410_ID, LD2410Component, ld2410_ns
@@ -24,23 +14,11 @@ RestartButton = ld2410_ns.class_("RestartButton", button.Button)
 CONFIG_SCHEMA = {
     cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase),
     cv.GenerateID(CONF_LD2410_ID): cv.use_id(LD2410Component),
-    cv.Optional(CONF_FACTORY_RESET): button.button_schema(
-        FactoryResetButton,
-        device_class=DEVICE_CLASS_RESTART,
-        entity_category=ENTITY_CATEGORY_CONFIG,
-        icon=ICON_RESTART_ALERT,
-    ),
-    cv.Optional(CONF_RESTART): button.button_schema(
-        RestartButton,
-        device_class=DEVICE_CLASS_RESTART,
-        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
-        icon=ICON_RESTART,
-    ),
-    cv.Optional(CONF_QUERY_PARAMS): button.button_schema(
-        QueryButton,
-        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
-        icon=ICON_DATABASE,
+    cv.Optional(CONF_FACTORY_RESET): button.factory_reset_button_schema(
+        FactoryResetButton
     ),
+    cv.Optional(CONF_RESTART): button.restart_button_schema(RestartButton),
+    cv.Optional(CONF_QUERY_PARAMS): button.query_button_schema(QueryButton),
 }
 
 

esphome/components/ld2412/button/__init__.py

@@ -6,13 +6,8 @@ from esphome.const import (
     CONF_FACTORY_RESET,
     CONF_ID,
     CONF_RESTART,
-    DEVICE_CLASS_RESTART,
     ENTITY_CATEGORY_CONFIG,
-    ENTITY_CATEGORY_DIAGNOSTIC,
-    ICON_DATABASE,
     ICON_PULSE,
-    ICON_RESTART,
-    ICON_RESTART_ALERT,
 )
 from esphome.types import ConfigType
 
@@ -29,23 +24,11 @@ CONF_START_DYNAMIC_BACKGROUND_CORRECTION = "start_dynamic_background_correction"
 CONFIG_SCHEMA = {
     cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase),
     cv.GenerateID(CONF_LD2412_ID): cv.use_id(LD2412Component),
-    cv.Optional(CONF_FACTORY_RESET): button.button_schema(
-        FactoryResetButton,
-        device_class=DEVICE_CLASS_RESTART,
-        entity_category=ENTITY_CATEGORY_CONFIG,
-        icon=ICON_RESTART_ALERT,
-    ),
-    cv.Optional(CONF_QUERY_PARAMS): button.button_schema(
-        QueryButton,
-        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
-        icon=ICON_DATABASE,
-    ),
-    cv.Optional(CONF_RESTART): button.button_schema(
-        RestartButton,
-        device_class=DEVICE_CLASS_RESTART,
-        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
-        icon=ICON_RESTART,
+    cv.Optional(CONF_FACTORY_RESET): button.factory_reset_button_schema(
+        FactoryResetButton
     ),
+    cv.Optional(CONF_QUERY_PARAMS): button.query_button_schema(QueryButton),
+    cv.Optional(CONF_RESTART): button.restart_button_schema(RestartButton),
     cv.Optional(CONF_START_DYNAMIC_BACKGROUND_CORRECTION): button.button_schema(
         StartDynamicBackgroundCorrectionButton,
         entity_category=ENTITY_CATEGORY_CONFIG,

esphome/components/ld2450/button/__init__.py

@@ -1,16 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import button
 import esphome.config_validation as cv
-from esphome.const import (
-    CONF_FACTORY_RESET,
-    CONF_ID,
-    CONF_RESTART,
-    DEVICE_CLASS_RESTART,
-    ENTITY_CATEGORY_CONFIG,
-    ENTITY_CATEGORY_DIAGNOSTIC,
-    ICON_RESTART,
-    ICON_RESTART_ALERT,
-)
+from esphome.const import CONF_FACTORY_RESET, CONF_ID, CONF_RESTART
 from esphome.types import ConfigType
 
 from .. import CONF_LD2450_ID, LD2450Component, ld2450_ns
@@ -21,18 +12,10 @@ RestartButton = ld2450_ns.class_("RestartButton", button.Button)
 CONFIG_SCHEMA = {
     cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase),
     cv.GenerateID(CONF_LD2450_ID): cv.use_id(LD2450Component),
-    cv.Optional(CONF_FACTORY_RESET): button.button_schema(
-        FactoryResetButton,
-        device_class=DEVICE_CLASS_RESTART,
-        entity_category=ENTITY_CATEGORY_CONFIG,
-        icon=ICON_RESTART_ALERT,
-    ),
-    cv.Optional(CONF_RESTART): button.button_schema(
-        RestartButton,
-        device_class=DEVICE_CLASS_RESTART,
-        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
-        icon=ICON_RESTART,
+    cv.Optional(CONF_FACTORY_RESET): button.factory_reset_button_schema(
+        FactoryResetButton
     ),
+    cv.Optional(CONF_RESTART): button.restart_button_schema(RestartButton),
 }
 
 

esphome/components/tfluna/button/__init__.py

@@ -1,16 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import button
 import esphome.config_validation as cv
-from esphome.const import (
-    CONF_ADDRESS,
-    CONF_FACTORY_RESET,
-    CONF_RESTART,
-    DEVICE_CLASS_RESTART,
-    ENTITY_CATEGORY_CONFIG,
-    ENTITY_CATEGORY_DIAGNOSTIC,
-    ICON_RESTART,
-    ICON_RESTART_ALERT,
-)
+from esphome.const import CONF_ADDRESS, CONF_FACTORY_RESET, CONF_RESTART
 import esphome.final_validate as fv
 from esphome.types import ConfigType
 
@@ -23,18 +14,8 @@ RestartButton = tfluna_ns.class_("RestartButton", button.Button)
 
 CONFIG_SCHEMA = {
     cv.GenerateID(CONF_TFLUNA_ID): cv.use_id(TFLunaComponent),
-    cv.Optional(CONF_FACTORY_RESET): button.button_schema(
-        ResetButton,
-        device_class=DEVICE_CLASS_RESTART,
-        entity_category=ENTITY_CATEGORY_CONFIG,
-        icon=ICON_RESTART_ALERT,
-    ),
-    cv.Optional(CONF_RESTART): button.button_schema(
-        RestartButton,
-        device_class=DEVICE_CLASS_RESTART,
-        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
-        icon=ICON_RESTART,
-    ),
+    cv.Optional(CONF_FACTORY_RESET): button.factory_reset_button_schema(ResetButton),
+    cv.Optional(CONF_RESTART): button.restart_button_schema(RestartButton),
 }