jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-24 21:57:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modbus: Add support for Holding Registers to Binary Sensor (#80460)

Browse Source 
Update handling of binary sensors to support reading from holding registers (command 0x03).
This commit is contained in:
Nippey 2022-10-18 10:31:08 +02:00 committed by GitHub
parent d4c28e04e4
commit 0e1fe4eba5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/modbus/__init__.py
View File

@ -268,7 +268,7 @@ BINARY_SENSOR_SCHEMA = BASE_COMPONENT_SCHEMA.extend(
{ {
vol.Optional(CONF_DEVICE_CLASS): BINARY_SENSOR_DEVICE_CLASSES_SCHEMA, vol.Optional(CONF_DEVICE_CLASS): BINARY_SENSOR_DEVICE_CLASSES_SCHEMA,
vol.Optional(CONF_INPUT_TYPE, default=CALL_TYPE_COIL): vol.In( vol.Optional(CONF_INPUT_TYPE, default=CALL_TYPE_COIL): vol.In(
[CALL_TYPE_COIL, CALL_TYPE_DISCRETE] [CALL_TYPE_COIL, CALL_TYPE_DISCRETE, CALL_TYPE_REGISTER_HOLDING]
), ),
vol.Optional(CONF_SLAVE_COUNT, default=0): cv.positive_int, vol.Optional(CONF_SLAVE_COUNT, default=0): cv.positive_int,
} }

7
homeassistant/components/modbus/binary_sensor.py
View File

@ -23,7 +23,7 @@ from homeassistant.helpers.update_coordinator import (
from . import get_hub from . import get_hub
from .base_platform import BasePlatform from .base_platform import BasePlatform
from .const import CONF_SLAVE_COUNT from .const import CALL_TYPE_COIL, CALL_TYPE_DISCRETE, CONF_SLAVE_COUNT
from .modbus import ModbusHub from .modbus import ModbusHub
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -109,9 +109,12 @@ class ModbusBinarySensor(BasePlatform, RestoreEntity, BinarySensorEntity):
self._result = None self._result = None
else: else:
self._lazy_errors = self._lazy_error_count self._lazy_errors = self._lazy_error_count
self._attr_is_on = result.bits[0] & 1
self._attr_available = True self._attr_available = True
self._result = result self._result = result
if self._input_type in (CALL_TYPE_COIL, CALL_TYPE_DISCRETE):
self._attr_is_on = bool(result.bits[0] & 1)
else:
self._attr_is_on = bool(result.registers[0] & 1)
self.async_write_ha_state() self.async_write_ha_state()
if self._coordinator: if self._coordinator:

10
tests/components/modbus/test_binary_sensor.py
View File

@ -5,6 +5,7 @@ from homeassistant.components.binary_sensor import DOMAIN as SENSOR_DOMAIN
from homeassistant.components.modbus.const import ( from homeassistant.components.modbus.const import (
CALL_TYPE_COIL, CALL_TYPE_COIL,
CALL_TYPE_DISCRETE, CALL_TYPE_DISCRETE,
CALL_TYPE_REGISTER_HOLDING,
CONF_INPUT_TYPE, CONF_INPUT_TYPE,
CONF_LAZY_ERROR, CONF_LAZY_ERROR,
CONF_SLAVE_COUNT, CONF_SLAVE_COUNT,
@ -81,6 +82,15 @@ async def test_config_binary_sensor(hass, mock_modbus):
}, },
], ],
}, },
{
CONF_BINARY_SENSORS: [
{
CONF_NAME: TEST_ENTITY_NAME,
CONF_ADDRESS: 51,
CONF_INPUT_TYPE: CALL_TYPE_REGISTER_HOLDING,
},
],
},
], ],
) )
@pytest.mark.parametrize( @pytest.mark.parametrize(