From 3173f1672bf2f02816aed1cbf6b1f377c90f2829 Mon Sep 17 00:00:00 2001 From: jan iversen Date: Fri, 25 Feb 2022 17:01:03 +0100 Subject: [PATCH] Remove deprecated reverse_order and data_count from Modbus (#67236) --- homeassistant/components/modbus/__init__.py | 5 ----- homeassistant/components/modbus/const.py | 2 -- 2 files changed, 7 deletions(-) diff --git a/homeassistant/components/modbus/__init__.py b/homeassistant/components/modbus/__init__.py index a5ad05a4711..d6fe41f66fc 100644 --- a/homeassistant/components/modbus/__init__.py +++ b/homeassistant/components/modbus/__init__.py @@ -60,7 +60,6 @@ from .const import ( CONF_BYTESIZE, CONF_CLIMATES, CONF_CLOSE_COMM_ON_ERROR, - CONF_DATA_COUNT, CONF_DATA_TYPE, CONF_FANS, CONF_INPUT_TYPE, @@ -72,7 +71,6 @@ from .const import ( CONF_PRECISION, CONF_RETRIES, CONF_RETRY_ON_EMPTY, - CONF_REVERSE_ORDER, CONF_SCALE, CONF_SLAVE_COUNT, CONF_STATE_CLOSED, @@ -210,7 +208,6 @@ BASE_SWITCH_SCHEMA = BASE_COMPONENT_SCHEMA.extend( CLIMATE_SCHEMA = vol.All( - cv.deprecated(CONF_DATA_COUNT, replacement_key=CONF_COUNT), BASE_STRUCT_SCHEMA.extend( { vol.Required(CONF_TARGET_TEMP): cv.positive_int, @@ -254,13 +251,11 @@ LIGHT_SCHEMA = BASE_SWITCH_SCHEMA.extend({}) FAN_SCHEMA = BASE_SWITCH_SCHEMA.extend({}) SENSOR_SCHEMA = vol.All( - cv.deprecated(CONF_REVERSE_ORDER), BASE_STRUCT_SCHEMA.extend( { vol.Optional(CONF_DEVICE_CLASS): SENSOR_DEVICE_CLASSES_SCHEMA, vol.Optional(CONF_STATE_CLASS): SENSOR_STATE_CLASSES_SCHEMA, vol.Optional(CONF_UNIT_OF_MEASUREMENT): cv.string, - vol.Optional(CONF_REVERSE_ORDER): cv.boolean, } ), ) diff --git a/homeassistant/components/modbus/const.py b/homeassistant/components/modbus/const.py index 82c5245da80..62929505acc 100644 --- a/homeassistant/components/modbus/const.py +++ b/homeassistant/components/modbus/const.py @@ -18,7 +18,6 @@ CONF_CLOSE_COMM_ON_ERROR = "close_comm_on_error" CONF_COILS = "coils" CONF_CURRENT_TEMP = "current_temp_register" CONF_CURRENT_TEMP_REGISTER_TYPE = "current_temp_register_type" -CONF_DATA_COUNT = "data_count" CONF_DATA_TYPE = "data_type" CONF_FANS = "fans" CONF_HUB = "hub" @@ -34,7 +33,6 @@ CONF_REGISTER_TYPE = "register_type" CONF_REGISTERS = "registers" CONF_RETRIES = "retries" CONF_RETRY_ON_EMPTY = "retry_on_empty" -CONF_REVERSE_ORDER = "reverse_order" CONF_PRECISION = "precision" CONF_SCALE = "scale" CONF_SLAVE_COUNT = "slave_count"