1f1115f631
All mochad devices are sharing a single socket interface. When multiple threads are issuing requests to the mochad daemon at the same time the write read cycle might get crossed between the threads. This is normally not an issue for 1-way X10 devices because as long as the request issued successfully and data is read over the socket then we know as much as mochad will tell us (since there is no ACK from the request for most X10 devices). However, where it does matter is on the device __init__() because we're relying on the mochad daemon's internal state to take an educated guess at the device's state to intialize things with. When there are multiple devices being initialized at the same time the wires can get crossed between and the wrong device state may be read. To address this potential issue this commit adds locking using a semaphore around all pairs of send_cmd() and read_data() (which is what pymochad.device.Device.get_status() does internally) calls to the mochad controller to ensure we're only ever dealing with a single request at a time. Fixes mtreinish/pymochad#4
83 lines
2.5 KiB
Python
83 lines
2.5 KiB
Python
"""
|
|
Contains functionality to use a X10 switch over Mochad.
|
|
|
|
For more details about this platform, please refer to the documentation at
|
|
https://home.assistant.io/components/switch.mochad
|
|
"""
|
|
|
|
import logging
|
|
|
|
import voluptuous as vol
|
|
|
|
from homeassistant.components import mochad
|
|
from homeassistant.components.switch import SwitchDevice
|
|
from homeassistant.const import (CONF_NAME, CONF_DEVICES,
|
|
CONF_PLATFORM, CONF_ADDRESS)
|
|
from homeassistant.helpers import config_validation as cv
|
|
|
|
DEPENDENCIES = ['mochad']
|
|
_LOGGER = logging.getLogger(__name__)
|
|
|
|
|
|
PLATFORM_SCHEMA = vol.Schema({
|
|
vol.Required(CONF_PLATFORM): mochad.DOMAIN,
|
|
CONF_DEVICES: [{
|
|
vol.Optional(CONF_NAME): cv.string,
|
|
vol.Required(CONF_ADDRESS): cv.x10_address,
|
|
vol.Optional(mochad.CONF_COMM_TYPE): cv.string,
|
|
}]
|
|
})
|
|
|
|
|
|
def setup_platform(hass, config, add_devices, discovery_info=None):
|
|
"""Set up X10 switches over a mochad controller."""
|
|
devs = config.get(CONF_DEVICES)
|
|
add_devices([MochadSwitch(
|
|
hass, mochad.CONTROLLER.ctrl, dev) for dev in devs])
|
|
return True
|
|
|
|
|
|
class MochadSwitch(SwitchDevice):
|
|
"""Representation of a X10 switch over Mochad."""
|
|
|
|
def __init__(self, hass, ctrl, dev):
|
|
"""Initialize a Mochad Switch Device."""
|
|
from pymochad import device
|
|
|
|
self._controller = ctrl
|
|
self._address = dev[CONF_ADDRESS]
|
|
self._name = dev.get(CONF_NAME, 'x10_switch_dev_%s' % self._address)
|
|
self._comm_type = dev.get(mochad.CONF_COMM_TYPE, 'pl')
|
|
self.device = device.Device(ctrl, self._address,
|
|
comm_type=self._comm_type)
|
|
self._state = self._get_device_status()
|
|
|
|
@property
|
|
def name(self):
|
|
"""Get the name of the switch."""
|
|
return self._name
|
|
|
|
def turn_on(self, **kwargs):
|
|
"""Turn the switch on."""
|
|
self._state = True
|
|
with mochad.REQ_LOCK:
|
|
self.device.send_cmd('on')
|
|
self._controller.read_data()
|
|
|
|
def turn_off(self, **kwargs):
|
|
"""Turn the switch off."""
|
|
self._state = False
|
|
with mochad.REQ_LOCK:
|
|
self.device.send_cmd('off')
|
|
self._controller.read_data()
|
|
|
|
def _get_device_status(self):
|
|
"""Get the status of the switch from mochad."""
|
|
with mochad.REQ_LOCK:
|
|
status = self.device.get_status().rstrip()
|
|
return status == 'on'
|
|
|
|
@property
|
|
def is_on(self):
|
|
"""Return true if switch is on."""
|
|
return self._state
|