jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-11 23:37:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade HomeMatic, add devices (#10845)

Browse Source
This commit is contained in:
Daniel Perna 2017-11-29 08:16:47 +01:00 committed by Paulus Schoutsen
parent 253d5aea6e
commit 59fa4f18e4
4 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
homeassistant/components/binary_sensor/homematic.py
View File

@ -25,6 +25,7 @@ SENSOR_TYPES_CLASS = {
'RemoteMotion': None, 'RemoteMotion': None,
'WeatherSensor': None, 'WeatherSensor': None,
'TiltSensor': None, 'TiltSensor': None,
'PresenceIP': 'motion',
} }

9
homeassistant/components/homematic.py
View File

@ -21,7 +21,7 @@ from homeassistant.helpers.entity import Entity
from homeassistant.helpers.event import track_time_interval from homeassistant.helpers.event import track_time_interval
from homeassistant.config import load_yaml_config_file from homeassistant.config import load_yaml_config_file
REQUIREMENTS = ['pyhomematic==0.1.34'] REQUIREMENTS = ['pyhomematic==0.1.35']
DOMAIN = 'homematic' DOMAIN = 'homematic'
@ -56,7 +56,7 @@ SERVICE_SET_DEV_VALUE = 'set_dev_value'
HM_DEVICE_TYPES = { HM_DEVICE_TYPES = {
DISCOVER_SWITCHES: [ DISCOVER_SWITCHES: [
'Switch', 'SwitchPowermeter', 'IOSwitch', 'IPSwitch', 'Switch', 'SwitchPowermeter', 'IOSwitch', 'IPSwitch', 'RFSiren',
'IPSwitchPowermeter', 'KeyMatic', 'HMWIOSwitch', 'Rain', 'EcoLogic'], 'IPSwitchPowermeter', 'KeyMatic', 'HMWIOSwitch', 'Rain', 'EcoLogic'],
DISCOVER_LIGHTS: ['Dimmer', 'KeyDimmer', 'IPKeyDimmer'], DISCOVER_LIGHTS: ['Dimmer', 'KeyDimmer', 'IPKeyDimmer'],
DISCOVER_SENSORS: [ DISCOVER_SENSORS: [
@ -66,7 +66,7 @@ HM_DEVICE_TYPES = {
'WeatherStation', 'ThermostatWall2', 'TemperatureDiffSensor', 'WeatherStation', 'ThermostatWall2', 'TemperatureDiffSensor',
'TemperatureSensor', 'CO2Sensor', 'IPSwitchPowermeter', 'HMWIOSwitch', 'TemperatureSensor', 'CO2Sensor', 'IPSwitchPowermeter', 'HMWIOSwitch',
'FillingLevel', 'ValveDrive', 'EcoLogic', 'IPThermostatWall', 'FillingLevel', 'ValveDrive', 'EcoLogic', 'IPThermostatWall',
'IPSmoke'], 'IPSmoke', 'RFSiren', 'PresenceIP'],
DISCOVER_CLIMATE: [ DISCOVER_CLIMATE: [
'Thermostat', 'ThermostatWall', 'MAXThermostat', 'ThermostatWall2', 'Thermostat', 'ThermostatWall', 'MAXThermostat', 'ThermostatWall2',
'MAXWallThermostat', 'IPThermostat', 'IPThermostatWall', 'MAXWallThermostat', 'IPThermostat', 'IPThermostatWall',
@ -74,7 +74,8 @@ HM_DEVICE_TYPES = {
DISCOVER_BINARY_SENSORS: [ DISCOVER_BINARY_SENSORS: [
'ShutterContact', 'Smoke', 'SmokeV2', 'Motion', 'MotionV2', 'ShutterContact', 'Smoke', 'SmokeV2', 'Motion', 'MotionV2',
'RemoteMotion', 'WeatherSensor', 'TiltSensor', 'IPShutterContact', 'RemoteMotion', 'WeatherSensor', 'TiltSensor', 'IPShutterContact',
'HMWIOSwitch', 'MaxShutterContact', 'Rain', 'WiredSensor'], 'HMWIOSwitch', 'MaxShutterContact', 'Rain', 'WiredSensor',
'PresenceIP'],
DISCOVER_COVER: ['Blind', 'KeyBlind'] DISCOVER_COVER: ['Blind', 'KeyBlind']
} }

21
homeassistant/components/sensor/homematic.py
View File

@ -13,10 +13,23 @@ _LOGGER = logging.getLogger(__name__)
DEPENDENCIES = ['homematic'] DEPENDENCIES = ['homematic']
HM_STATE_HA_CAST = { HM_STATE_HA_CAST = {
'RotaryHandleSensor': {0: 'closed', 1: 'tilted', 2: 'open'}, 'RotaryHandleSensor': {0: 'closed',
'WaterSensor': {0: 'dry', 1: 'wet', 2: 'water'}, 1: 'tilted',
'CO2Sensor': {0: 'normal', 1: 'added', 2: 'strong'}, 2: 'open'},
'IPSmoke': {0: 'off', 1: 'primary', 2: 'intrusion', 3: 'secondary'} 'WaterSensor': {0: 'dry',
1: 'wet',
2: 'water'},
'CO2Sensor': {0: 'normal',
1: 'added',
2: 'strong'},
'IPSmoke': {0: 'off',
1: 'primary',
2: 'intrusion',
3: 'secondary'},
'RFSiren': {0: 'disarmed',
1: 'extsens_armed',
2: 'allsens_armed',
3: 'alarm_blocked'},
} }
HM_UNIT_HA_CAST = { HM_UNIT_HA_CAST = {

2
requirements_all.txt
View File

@ -677,7 +677,7 @@ pyhik==0.1.4
pyhiveapi==0.2.5 pyhiveapi==0.2.5
# homeassistant.components.homematic # homeassistant.components.homematic
pyhomematic==0.1.34 pyhomematic==0.1.35
# homeassistant.components.sensor.hydroquebec # homeassistant.components.sensor.hydroquebec
pyhydroquebec==1.3.1 pyhydroquebec==1.3.1