Remove incoming inversion toggles

This commit is contained in:
2026-02-15 16:47:44 +01:00
parent b59455909c
commit c5ab9e854c
47 changed files with 73 additions and 1015 deletions

View File

@@ -14,7 +14,6 @@ from .const import (
CONF_ANGLE_ADDRESS,
CONF_ANGLE_STATE_ADDRESS,
CONF_COMMAND_ADDRESS,
CONF_INVERT_INCOMING,
CONF_INVERT_OUTGOING,
CONF_KNX_ENTRY_ID,
CONF_MOVE_LONG_ADDRESS,
@@ -399,12 +398,6 @@ def _binary_sensor_schema(defaults: dict | None = None) -> vol.Schema:
): selector.TextSelector(
selector.TextSelectorConfig(type="text")
),
vol.Optional(
_invert_in_key(CONF_STATE_ADDRESS),
default=bool(defaults.get(_invert_in_key(CONF_STATE_ADDRESS))),
): (
selector.BooleanSelector()
),
vol.Optional(
_invert_out_key(CONF_STATE_ADDRESS),
default=bool(defaults.get(_invert_out_key(CONF_STATE_ADDRESS))),
@@ -434,84 +427,30 @@ def _cover_schema(defaults: dict | None = None) -> vol.Schema:
): selector.TextSelector(
selector.TextSelectorConfig(type="text")
),
vol.Optional(
_invert_in_key(CONF_MOVE_LONG_ADDRESS),
default=bool(defaults.get(_invert_in_key(CONF_MOVE_LONG_ADDRESS))),
): (
selector.BooleanSelector()
),
vol.Optional(
_invert_out_key(CONF_MOVE_LONG_ADDRESS),
default=bool(defaults.get(_invert_out_key(CONF_MOVE_LONG_ADDRESS))),
): (
selector.BooleanSelector()
),
vol.Optional(
CONF_MOVE_SHORT_ADDRESS,
default=defaults.get(CONF_MOVE_SHORT_ADDRESS, ""),
): selector.TextSelector(
selector.TextSelectorConfig(type="text")
),
vol.Optional(
_invert_in_key(CONF_MOVE_SHORT_ADDRESS),
default=bool(defaults.get(_invert_in_key(CONF_MOVE_SHORT_ADDRESS))),
): (
selector.BooleanSelector()
),
vol.Optional(
_invert_out_key(CONF_MOVE_SHORT_ADDRESS),
default=bool(defaults.get(_invert_out_key(CONF_MOVE_SHORT_ADDRESS))),
): (
selector.BooleanSelector()
),
vol.Optional(
CONF_STOP_ADDRESS,
default=defaults.get(CONF_STOP_ADDRESS, ""),
): selector.TextSelector(
selector.TextSelectorConfig(type="text")
),
vol.Optional(
_invert_in_key(CONF_STOP_ADDRESS),
default=bool(defaults.get(_invert_in_key(CONF_STOP_ADDRESS))),
): (
selector.BooleanSelector()
),
vol.Optional(
_invert_out_key(CONF_STOP_ADDRESS),
default=bool(defaults.get(_invert_out_key(CONF_STOP_ADDRESS))),
): (
selector.BooleanSelector()
),
vol.Optional(
CONF_POSITION_ADDRESS,
default=defaults.get(CONF_POSITION_ADDRESS, ""),
): selector.TextSelector(
selector.TextSelectorConfig(type="text")
),
vol.Optional(
_invert_in_key(CONF_POSITION_ADDRESS),
default=bool(defaults.get(_invert_in_key(CONF_POSITION_ADDRESS))),
): (
selector.BooleanSelector()
),
vol.Optional(
_invert_out_key(CONF_POSITION_ADDRESS),
default=bool(defaults.get(_invert_out_key(CONF_POSITION_ADDRESS))),
): (
selector.BooleanSelector()
),
vol.Optional(
CONF_POSITION_STATE_ADDRESS,
default=defaults.get(CONF_POSITION_STATE_ADDRESS, ""),
): selector.TextSelector(
selector.TextSelectorConfig(type="text")
),
vol.Optional(
_invert_in_key(CONF_POSITION_STATE_ADDRESS),
default=bool(defaults.get(_invert_in_key(CONF_POSITION_STATE_ADDRESS))),
): (
selector.BooleanSelector()
),
vol.Optional(
_invert_out_key(CONF_POSITION_STATE_ADDRESS),
default=bool(defaults.get(_invert_out_key(CONF_POSITION_STATE_ADDRESS))),
@@ -524,30 +463,12 @@ def _cover_schema(defaults: dict | None = None) -> vol.Schema:
): selector.TextSelector(
selector.TextSelectorConfig(type="text")
),
vol.Optional(
_invert_in_key(CONF_ANGLE_ADDRESS),
default=bool(defaults.get(_invert_in_key(CONF_ANGLE_ADDRESS))),
): (
selector.BooleanSelector()
),
vol.Optional(
_invert_out_key(CONF_ANGLE_ADDRESS),
default=bool(defaults.get(_invert_out_key(CONF_ANGLE_ADDRESS))),
): (
selector.BooleanSelector()
),
vol.Optional(
CONF_ANGLE_STATE_ADDRESS,
default=defaults.get(CONF_ANGLE_STATE_ADDRESS, ""),
): selector.TextSelector(
selector.TextSelectorConfig(type="text")
),
vol.Optional(
_invert_in_key(CONF_ANGLE_STATE_ADDRESS),
default=bool(defaults.get(_invert_in_key(CONF_ANGLE_STATE_ADDRESS))),
): (
selector.BooleanSelector()
),
vol.Optional(
_invert_out_key(CONF_ANGLE_STATE_ADDRESS),
default=bool(defaults.get(_invert_out_key(CONF_ANGLE_STATE_ADDRESS))),
@@ -577,30 +498,12 @@ def _switch_schema(defaults: dict | None = None) -> vol.Schema:
): selector.TextSelector(
selector.TextSelectorConfig(type="text")
),
vol.Optional(
_invert_in_key(CONF_COMMAND_ADDRESS),
default=bool(defaults.get(_invert_in_key(CONF_COMMAND_ADDRESS))),
): (
selector.BooleanSelector()
),
vol.Optional(
_invert_out_key(CONF_COMMAND_ADDRESS),
default=bool(defaults.get(_invert_out_key(CONF_COMMAND_ADDRESS))),
): (
selector.BooleanSelector()
),
vol.Optional(
CONF_STATE_ADDRESS,
default=defaults.get(CONF_STATE_ADDRESS, ""),
): selector.TextSelector(
selector.TextSelectorConfig(type="text")
),
vol.Optional(
_invert_in_key(CONF_STATE_ADDRESS),
default=bool(defaults.get(_invert_in_key(CONF_STATE_ADDRESS))),
): (
selector.BooleanSelector()
),
vol.Optional(
_invert_out_key(CONF_STATE_ADDRESS),
default=bool(defaults.get(_invert_out_key(CONF_STATE_ADDRESS))),
@@ -643,7 +546,6 @@ def _validate_knx_addresses(
value = cleaned.get(key)
if value is None:
cleaned.pop(key, None)
cleaned.pop(_invert_in_key(key), None)
cleaned.pop(_invert_out_key(key), None)
continue
try:
@@ -653,7 +555,6 @@ def _validate_knx_addresses(
continue
if normalized == "":
cleaned.pop(key, None)
cleaned.pop(_invert_in_key(key), None)
cleaned.pop(_invert_out_key(key), None)
else:
cleaned[key] = normalized
@@ -689,10 +590,6 @@ def _parse_int(value: str) -> int:
return int(text)
def _invert_in_key(address_key: str) -> str:
return f"{address_key}_{CONF_INVERT_INCOMING}"
def _invert_out_key(address_key: str) -> str:
return f"{address_key}_{CONF_INVERT_OUTGOING}"