diff --git a/homeassistant/components/mqtt/abbreviations.py b/homeassistant/components/mqtt/abbreviations.py index 5fe0da90feb..913a6e13400 100644 --- a/homeassistant/components/mqtt/abbreviations.py +++ b/homeassistant/components/mqtt/abbreviations.py @@ -130,16 +130,12 @@ ABBREVIATIONS = { "pl_cln_sp": "payload_clean_spot", "pl_cls": "payload_close", "pl_disarm": "payload_disarm", - "pl_hi_spd": "payload_high_speed", "pl_home": "payload_home", "pl_lock": "payload_lock", "pl_loc": "payload_locate", - "pl_lo_spd": "payload_low_speed", - "pl_med_spd": "payload_medium_speed", "pl_not_avail": "payload_not_available", "pl_not_home": "payload_not_home", "pl_off": "payload_off", - "pl_off_spd": "payload_off_speed", "pl_on": "payload_on", "pl_open": "payload_open", "pl_osc_off": "payload_oscillation_off", @@ -193,12 +189,8 @@ ABBREVIATIONS = { "set_pos_t": "set_position_topic", "pos_t": "position_topic", "pos_tpl": "position_template", - "spd_cmd_t": "speed_command_topic", - "spd_stat_t": "speed_state_topic", "spd_rng_min": "speed_range_min", "spd_rng_max": "speed_range_max", - "spd_val_tpl": "speed_value_template", - "spds": "speeds", "src_type": "source_type", "stat_cla": "state_class", "stat_clsd": "state_closed", diff --git a/homeassistant/components/mqtt/fan.py b/homeassistant/components/mqtt/fan.py index 2623845fffd..da061da14e4 100644 --- a/homeassistant/components/mqtt/fan.py +++ b/homeassistant/components/mqtt/fan.py @@ -77,20 +77,12 @@ CONF_PRESET_MODE_VALUE_TEMPLATE = "preset_mode_value_template" CONF_PRESET_MODE_COMMAND_TEMPLATE = "preset_mode_command_template" CONF_PRESET_MODES_LIST = "preset_modes" CONF_PAYLOAD_RESET_PRESET_MODE = "payload_reset_preset_mode" -CONF_SPEED_STATE_TOPIC = "speed_state_topic" -CONF_SPEED_COMMAND_TOPIC = "speed_command_topic" -CONF_SPEED_VALUE_TEMPLATE = "speed_value_template" CONF_OSCILLATION_STATE_TOPIC = "oscillation_state_topic" CONF_OSCILLATION_COMMAND_TOPIC = "oscillation_command_topic" CONF_OSCILLATION_VALUE_TEMPLATE = "oscillation_value_template" CONF_OSCILLATION_COMMAND_TEMPLATE = "oscillation_command_template" CONF_PAYLOAD_OSCILLATION_ON = "payload_oscillation_on" CONF_PAYLOAD_OSCILLATION_OFF = "payload_oscillation_off" -CONF_PAYLOAD_OFF_SPEED = "payload_off_speed" -CONF_PAYLOAD_LOW_SPEED = "payload_low_speed" -CONF_PAYLOAD_MEDIUM_SPEED = "payload_medium_speed" -CONF_PAYLOAD_HIGH_SPEED = "payload_high_speed" -CONF_SPEED_LIST = "speeds" DEFAULT_NAME = "MQTT Fan" DEFAULT_PAYLOAD_ON = "ON" @@ -176,9 +168,6 @@ _PLATFORM_SCHEMA_BASE = MQTT_RW_SCHEMA.extend( vol.Optional( CONF_PAYLOAD_OSCILLATION_ON, default=OSCILLATE_ON_PAYLOAD ): cv.string, - vol.Optional(CONF_SPEED_COMMAND_TOPIC): valid_publish_topic, - vol.Optional(CONF_SPEED_STATE_TOPIC): valid_subscribe_topic, - vol.Optional(CONF_SPEED_VALUE_TEMPLATE): cv.template, vol.Optional(CONF_STATE_VALUE_TEMPLATE): cv.template, } ).extend(MQTT_ENTITY_COMMON_SCHEMA.schema) @@ -190,32 +179,12 @@ PLATFORM_SCHEMA = vol.All( ) PLATFORM_SCHEMA_MODERN = vol.All( - # CONF_SPEED_COMMAND_TOPIC, CONF_SPEED_LIST, CONF_SPEED_STATE_TOPIC, CONF_SPEED_VALUE_TEMPLATE and - # Speeds SPEED_LOW, SPEED_MEDIUM, SPEED_HIGH SPEED_OFF, - # are no longer supported, support was removed in release 2021.12 - cv.removed(CONF_PAYLOAD_HIGH_SPEED), - cv.removed(CONF_PAYLOAD_LOW_SPEED), - cv.removed(CONF_PAYLOAD_MEDIUM_SPEED), - cv.removed(CONF_SPEED_COMMAND_TOPIC), - cv.removed(CONF_SPEED_LIST), - cv.removed(CONF_SPEED_STATE_TOPIC), - cv.removed(CONF_SPEED_VALUE_TEMPLATE), _PLATFORM_SCHEMA_BASE, valid_speed_range_configuration, valid_preset_mode_configuration, ) DISCOVERY_SCHEMA = vol.All( - # CONF_SPEED_COMMAND_TOPIC, CONF_SPEED_LIST, CONF_SPEED_STATE_TOPIC, CONF_SPEED_VALUE_TEMPLATE and - # Speeds SPEED_LOW, SPEED_MEDIUM, SPEED_HIGH SPEED_OFF, - # are no longer supported, support was removed in release 2021.12 - cv.removed(CONF_PAYLOAD_HIGH_SPEED), - cv.removed(CONF_PAYLOAD_LOW_SPEED), - cv.removed(CONF_PAYLOAD_MEDIUM_SPEED), - cv.removed(CONF_SPEED_COMMAND_TOPIC), - cv.removed(CONF_SPEED_LIST), - cv.removed(CONF_SPEED_STATE_TOPIC), - cv.removed(CONF_SPEED_VALUE_TEMPLATE), _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA), valid_speed_range_configuration, valid_preset_mode_configuration,