evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix issue #8285 (#8340)

Browse source 
* Fixed a bug where changing fan speed was not possible

* Bump pymodbus version to 1.3.1 to fix issue #8285

* Changed all modbus components so that they use CONF_SLAVE from const.py
This commit is contained in:
Sabesto 2017-07-04 17:01:35 +02:00 • committed by Fabian Affolter
parent 3363b88a73
commit 6496c38ce6
6 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
homeassistant/components/binary_sensor/modbus.py
View file

@ -8,7 +8,7 @@ import logging
import voluptuous as vol import voluptuous as vol
import homeassistant.components.modbus as modbus import homeassistant.components.modbus as modbus
from homeassistant.const import CONF_NAME from homeassistant.const import CONF_NAME, CONF_SLAVE
from homeassistant.components.binary_sensor import BinarySensorDevice from homeassistant.components.binary_sensor import BinarySensorDevice
from homeassistant.helpers import config_validation as cv from homeassistant.helpers import config_validation as cv
from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.components.sensor import PLATFORM_SCHEMA
@ -18,7 +18,6 @@ DEPENDENCIES = ['modbus']
CONF_COIL = 'coil' CONF_COIL = 'coil'
CONF_COILS = 'coils' CONF_COILS = 'coils'
CONF_SLAVE = 'slave'
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Required(CONF_COILS): [{ vol.Required(CONF_COILS): [{

2
homeassistant/components/climate/flexit.py
View file

@ -145,4 +145,4 @@ class Flexit(ClimateDevice):
def set_fan_mode(self, fan): def set_fan_mode(self, fan):
"""Set new fan mode.""" """Set new fan mode."""
self.unit.set_fan_speed(fan) self.unit.set_fan_speed(self._fan_list.index(fan))

2
homeassistant/components/modbus.py
View file

@ -16,7 +16,7 @@ from homeassistant.const import (
DOMAIN = 'modbus' DOMAIN = 'modbus'
REQUIREMENTS = ['pymodbus==1.3.0rc1'] REQUIREMENTS = ['pymodbus==1.3.1']
# Type of network # Type of network
CONF_BAUDRATE = 'baudrate' CONF_BAUDRATE = 'baudrate'

3
homeassistant/components/sensor/modbus.py
View file

@ -11,7 +11,7 @@ import voluptuous as vol
import homeassistant.components.modbus as modbus import homeassistant.components.modbus as modbus
from homeassistant.const import ( from homeassistant.const import (
CONF_NAME, CONF_OFFSET, CONF_UNIT_OF_MEASUREMENT) CONF_NAME, CONF_OFFSET, CONF_UNIT_OF_MEASUREMENT, CONF_SLAVE)
from homeassistant.helpers.entity import Entity from homeassistant.helpers.entity import Entity
from homeassistant.helpers import config_validation as cv from homeassistant.helpers import config_validation as cv
from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.components.sensor import PLATFORM_SCHEMA
@ -25,7 +25,6 @@ CONF_PRECISION = 'precision'
CONF_REGISTER = 'register' CONF_REGISTER = 'register'
CONF_REGISTERS = 'registers' CONF_REGISTERS = 'registers'
CONF_SCALE = 'scale' CONF_SCALE = 'scale'
CONF_SLAVE = 'slave'
CONF_DATA_TYPE = 'data_type' CONF_DATA_TYPE = 'data_type'
CONF_REGISTER_TYPE = 'register_type' CONF_REGISTER_TYPE = 'register_type'

3
homeassistant/components/switch/modbus.py
View file

@ -8,7 +8,7 @@ import logging
import voluptuous as vol import voluptuous as vol
import homeassistant.components.modbus as modbus import homeassistant.components.modbus as modbus
from homeassistant.const import CONF_NAME from homeassistant.const import CONF_NAME, CONF_SLAVE
from homeassistant.helpers.entity import ToggleEntity from homeassistant.helpers.entity import ToggleEntity
from homeassistant.helpers import config_validation as cv from homeassistant.helpers import config_validation as cv
from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.components.sensor import PLATFORM_SCHEMA
@ -18,7 +18,6 @@ DEPENDENCIES = ['modbus']
CONF_COIL = "coil" CONF_COIL = "coil"
CONF_COILS = "coils" CONF_COILS = "coils"
CONF_SLAVE = "slave"
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Required(CONF_COILS): [{ vol.Required(CONF_COILS): [{

2
requirements_all.txt
View file

@ -619,7 +619,7 @@ pymailgunner==1.4
pymochad==0.1.1 pymochad==0.1.1
# homeassistant.components.modbus # homeassistant.components.modbus
pymodbus==1.3.0rc1 pymodbus==1.3.1
# homeassistant.components.cover.myq # homeassistant.components.cover.myq
pymyq==0.0.8 pymyq==0.0.8