From 923610f35542954dd66cce7d5073901ede5cb4a8 Mon Sep 17 00:00:00 2001 From: Daniel Perna Date: Tue, 3 Oct 2017 22:01:40 +0200 Subject: [PATCH 1/2] Bump pyhomematic, add path setting, HM-CC-VG-1 support --- homeassistant/components/homematic.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/homeassistant/components/homematic.py b/homeassistant/components/homematic.py index e2d34ca897e471..7e09ee326c4474 100644 --- a/homeassistant/components/homematic.py +++ b/homeassistant/components/homematic.py @@ -21,7 +21,7 @@ from homeassistant.helpers.event import track_time_interval from homeassistant.config import load_yaml_config_file -REQUIREMENTS = ['pyhomematic==0.1.32'] +REQUIREMENTS = ['pyhomematic==0.1.33'] DOMAIN = 'homematic' @@ -69,7 +69,8 @@ 'IPSmoke'], DISCOVER_CLIMATE: [ 'Thermostat', 'ThermostatWall', 'MAXThermostat', 'ThermostatWall2', - 'MAXWallThermostat', 'IPThermostat', 'IPThermostatWall'], + 'MAXWallThermostat', 'IPThermostat', 'IPThermostatWall', + 'ThermostatGroup'], DISCOVER_BINARY_SENSORS: [ 'ShutterContact', 'Smoke', 'SmokeV2', 'Motion', 'MotionV2', 'RemoteMotion', 'WeatherSensor', 'TiltSensor', 'IPShutterContact', @@ -129,6 +130,7 @@ CONF_LOCAL_PORT = 'local_port' CONF_IP = 'ip' CONF_PORT = 'port' +CONF_PATH = 'path' CONF_CALLBACK_IP = 'callback_ip' CONF_CALLBACK_PORT = 'callback_port' CONF_RESOLVENAMES = 'resolvenames' @@ -140,6 +142,7 @@ DEFAULT_LOCAL_PORT = 0 DEFAULT_RESOLVENAMES = False DEFAULT_PORT = 2001 +DEFAULT_PATH = '' DEFAULT_USERNAME = 'Admin' DEFAULT_PASSWORD = '' DEFAULT_VARIABLES = False @@ -160,8 +163,8 @@ DOMAIN: vol.Schema({ vol.Required(CONF_HOSTS): {cv.match_all: { vol.Required(CONF_IP): cv.string, - vol.Optional(CONF_PORT, default=DEFAULT_PORT): - cv.port, + vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port, + vol.Optional(CONF_PATH, default=DEFAULT_PATH): cv.string, vol.Optional(CONF_USERNAME, default=DEFAULT_USERNAME): cv.string, vol.Optional(CONF_PASSWORD, default=DEFAULT_PASSWORD): cv.string, vol.Optional(CONF_VARIABLES, default=DEFAULT_VARIABLES): @@ -258,6 +261,7 @@ def setup(hass, config): remotes[rname] = {} remotes[rname][CONF_IP] = server remotes[rname][CONF_PORT] = rconfig.get(CONF_PORT) + remotes[rname][CONF_PATH] = rconfig.get(CONF_PATH) remotes[rname][CONF_RESOLVENAMES] = rconfig.get(CONF_RESOLVENAMES) remotes[rname][CONF_USERNAME] = rconfig.get(CONF_USERNAME) remotes[rname][CONF_PASSWORD] = rconfig.get(CONF_PASSWORD) From d9b588a0460b9d9c8f32b96c461a4e0b3931c8f5 Mon Sep 17 00:00:00 2001 From: Daniel Perna Date: Thu, 5 Oct 2017 22:47:22 +0200 Subject: [PATCH 2/2] Added requirement --- requirements_all.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_all.txt b/requirements_all.txt index 4956ea4a194d81..d0ca86276c6b7c 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -626,7 +626,7 @@ pyharmony==1.0.16 pyhik==0.1.4 # homeassistant.components.homematic -pyhomematic==0.1.32 +pyhomematic==0.1.33 # homeassistant.components.sensor.hydroquebec pyhydroquebec==1.2.0