Merge pull request #342 from claudegel/TH6250

Better support for TH6250WF and TH6500WF

Author: claudegel

README.md

@@ -253,6 +253,8 @@ Automations require services to be able to send commande. Ex. light.turn_on. For
 - neviweb130.set_cool_min_time_off, to set cooling minimum time off.
 - neviweb130.set_neviweb_status, to set global Neviweb status, home / away.
 - neviweb130.set_refuel_alert, to get an alert when the propane tank is refueled,
+- neviweb130.set_humidifier_type, to set the type of humidifier device connected to TH6500WF or TH6250WF.
+- neviseb130.set_schedule_mode, to set the schedule mode, manual or auto for TH6500WF or TH6250WF.
 
 ## Catch Éco Sinopé signal for peak period
 If you have at least on thermostat or one load controler registered with Éco-Sinopé program, it is now possible to catch when Neviweb send the signal for pre-heating start period for thermostats or turn_off signal for the load controler. Seven attributes have been added for thermostats and three for load controler to know that peak period is comming and how it is managed:
@@ -281,15 +283,16 @@ If you have at least on thermostat or one load controler registered with Éco-Si
 It is then possible to make an automation to set all HA devices ready for peak period by following the eco_status attribute change from «off» to «on».
 
 ## Statistic for energy
-Six attributes are added to track energy usage for devices:
-- hourly_kwh: kwh used for last hour
-- daily_kwh: kwh used for last day
-- monthly_kwh: kwh used for last month
-- current_hour_kwh": kwh used during current hour
-- current_today_kwh: kwh used during current day
-- current_month_kwh: kwh used during current month
+Seven attributes are added to track energy usage for devices:
+- total_kwh_count: total count of energy usage to date.
+- hourly_kwh_count:  total count for hourly usage for current day.
+- daily_kwh_count: total count of water liters daily usage for current month.
+- monthly_kwh_count: total count of water liters monthly usage for current year.
+- hourly_kwh: kwh used for last hour.
+- daily_kwh: kwh used for last day.
+- monthly_kwh: kwh used for last month.
 
-They are polled from Neviweb every 30 minutes. The first polling start 5 minutes after HA restart.
+They are polled from Neviweb every 30 minutes. The first polling start 5 minutes after HA restart. Neviweb have a two hours delay to publish his data.
 
 ### Track energy consumption in HA Energy dashboard
 When energy attributes are available, it is possible to track energy consumption of individual devices in Home Assistant energy dashboard by creating a [Template sensor](https://www.home-assistant.io/integrations/template/) in configuration.yaml:
@@ -318,15 +321,16 @@ template:
 ```
 
 ## Statistic for Sedna flow sensor
-Six attributes are added to track water usage for Sedna valve. They are shown as m³ (cubic meeter) which is what energy module is looking for:
-- hourly_flow_count: total count of water liters hourly usage
-- daily_flow_count: total count of water liters daily usage
-- monthly_flow_count: total count of water liters monthly usage
-- hourly_flow: water liters used for last hour
-- daily_flow: water liters used for last day
-- monthly_flow: water liters used for last month
-
-They are polled from Neviweb every 30 minutes. The first polling start 5 minutes after HA restart.
+Seven attributes are added to track water usage for Sedna valve. They are shown as m³ (cubic meeter) which is what energy module is looking for:
+- total_flow_count: total count of water liters usage to date.
+- hourly_flow_count:  total count of hourly water liters usage for current day.
+- daily_flow_count: total count of daily water liters usage for current month.
+- monthly_flow_count: total count of monthly water liters usage for current year.
+- hourly_flow: water liters used for last hour.
+- daily_flow: water liters used for last day.
+- monthly_flow: water liters used for last month.
+
+They are polled from Neviweb every 30 minutes. The first polling start 5 minutes after HA restart. Neviweb have a two hours delay to publish his data.
 
 ### Track water consumption in HA Energy dashboard
 When flow attributes are available, it is possible to track water consumption of sedna valve in Home Assistant energy dashboard by creating a [Template sensor](https://www.home-assistant.io/integrations/template/) in configuration.yaml:

custom_components.json

@@ -1,6 +1,6 @@
 {
     "neviweb130": {
-        "version": "3.0.5",
+        "version": "3.0.6",
         "local_location": "/custom_components/neviweb130/__init__.py",
         "remote_location": "https://github.com/claudegel/sinope-130/tree/master/custom_components/__init__.py",
         "visit_repo": "https://github.com/claudegel/sinope-130",

custom_components/neviweb130/__init__.py

@@ -18,21 +18,23 @@
                     ATTR_BATTERY_TYPE, ATTR_COLD_LOAD_PICKUP_REMAIN_TIME,
                     ATTR_CONF_CLOSURE, ATTR_CONTROLLED_DEVICE,
                     ATTR_COOL_LOCK_TEMP, ATTR_COOL_MIN_TIME_OFF,
-                    ATTR_COOL_MIN_TIME_ON, ATTR_COOL_SETPOINT_MAX,
-                    ATTR_COOL_SETPOINT_MIN, ATTR_CYCLE, ATTR_CYCLE_OUTPUT2,
-                    ATTR_DISPLAY2, ATTR_DISPLAY_CONF, ATTR_DRSETPOINT,
-                    ATTR_DRSTATUS, ATTR_EARLY_START, ATTR_FAN_SPEED,
-                    ATTR_FAN_SWING_HORIZ, ATTR_FAN_SWING_VERT,
+                    ATTR_COOL_MIN_TIME_ON, ATTR_COOL_SETPOINT,
+                    ATTR_COOL_SETPOINT_MAX, ATTR_COOL_SETPOINT_MIN, ATTR_CYCLE,
+                    ATTR_CYCLE_OUTPUT2, ATTR_DISPLAY2, ATTR_DISPLAY_CONF,
+                    ATTR_DRSETPOINT, ATTR_DRSTATUS, ATTR_EARLY_START,
+                    ATTR_FAN_SPEED, ATTR_FAN_SWING_HORIZ, ATTR_FAN_SWING_VERT,
                     ATTR_FLOOR_AIR_LIMIT, ATTR_FLOOR_AUX, ATTR_FLOOR_MAX,
                     ATTR_FLOOR_MIN, ATTR_FLOOR_MODE, ATTR_FLOOR_OUTPUT2,
                     ATTR_FLOOR_SENSOR, ATTR_FLOW_ALARM1_LENGHT,
                     ATTR_FLOW_ALARM1_OPTION, ATTR_FLOW_ALARM1_PERIOD,
                     ATTR_FLOW_ENABLED, ATTR_FLOW_METER_CONFIG,
                     ATTR_FLOW_THRESHOLD, ATTR_FUEL_ALERT,
-                    ATTR_FUEL_PERCENT_ALERT, ATTR_GAUGE_TYPE,
-                    ATTR_HEAT_LOCK_TEMP, ATTR_INPUT_1_OFF_DELAY,
-                    ATTR_INPUT_1_ON_DELAY, ATTR_INPUT_2_OFF_DELAY,
-                    ATTR_INPUT_2_ON_DELAY, ATTR_INTENSITY, ATTR_KEY_DOUBLE_UP,
+                    ATTR_FUEL_PERCENT_ALERT, ATTR_GAUGE_TYPE, ATTR_HEAT_COOL,
+                    ATTR_HEAT_LOCK_TEMP, ATTR_HUMID_SETPOINT,
+                    ATTR_HUMIDIFIER_TYPE, ATTR_HUMIDITY,
+                    ATTR_INPUT_1_OFF_DELAY, ATTR_INPUT_1_ON_DELAY,
+                    ATTR_INPUT_2_OFF_DELAY, ATTR_INPUT_2_ON_DELAY,
+                    ATTR_INTENSITY, ATTR_INTENSITY_MIN, ATTR_KEY_DOUBLE_UP,
                     ATTR_KEYPAD, ATTR_LANGUAGE, ATTR_LEAK_ALERT,
                     ATTR_LED_OFF_COLOR, ATTR_LED_OFF_INTENSITY,
                     ATTR_LED_ON_COLOR, ATTR_LED_ON_INTENSITY,
@@ -49,7 +51,7 @@
                     ATTR_TIMER, ATTR_TIMER2, ATTR_WATER_TEMP_MIN,
                     ATTR_WIFI_KEYPAD, CONF_HOMEKIT_MODE, CONF_IGNORE_MIWI,
                     CONF_NETWORK, CONF_NETWORK2, CONF_NETWORK3, CONF_NOTIFY,
-                    CONF_STAT_INTERVAL, DOMAIN, MODE_MANUAL)
+                    CONF_STAT_INTERVAL, DOMAIN, MODE_MANUAL, STARTUP_MESSAGE)
 from .schema import CONFIG_SCHEMA as config_schema
 from .schema import HOMEKIT_MODE as DEFAULT_HOMEKIT_MODE
 from .schema import IGNORE_MIWI as DEFAULT_IGNORE_MIWI
@@ -72,6 +74,8 @@
 
 def setup(hass, hass_config):
     """Set up neviweb130."""
+    _LOGGER.info(STARTUP_MESSAGE)
+
     data = Neviweb130Data(hass, hass_config[DOMAIN])
     hass.data[DOMAIN] = data
 
@@ -757,13 +761,16 @@ def set_mode(self, device_id, mode):
         data = {ATTR_POWER_MODE: mode}
         self.set_device_attributes(device_id, data)
 
-    def set_setpoint_mode(self, device_id, mode, wifi):
+    def set_setpoint_mode(self, device_id, mode, wifi, HC):
         """Set thermostat operation mode."""
-        """Work differently for wifi and zigbee devices."""
+        """Work differently for wifi and zigbee devices and TH6250xx devices."""
         if wifi:
-            if mode in [HVACMode.HEAT, MODE_MANUAL]:
-                mode = MODE_MANUAL
-            data = {ATTR_SETPOINT_MODE: mode}
+            if HC:
+                data = {ATTR_HEAT_COOL: mode}
+            else:
+                if mode in [HVACMode.HEAT, MODE_MANUAL]:
+                    mode = MODE_MANUAL
+                data = {ATTR_SETPOINT_MODE: mode}
         else:
             data = {ATTR_SYSTEM_MODE: mode}
         self.set_device_attributes(device_id, data)
@@ -779,10 +786,36 @@ def set_occupancy_mode(self, device_id, mode, wifi):
         self.set_device_attributes(device_id, data)
 
     def set_temperature(self, device_id, temperature):
-        """Set device temperature."""
+        """Set device heating temperature target."""
         data = {ATTR_ROOM_SETPOINT: temperature}
         self.set_device_attributes(device_id, data)
 
+    def set_cool_temperature(self, device_id, temperature):
+        """Set device cooling temperature target."""
+        data = {ATTR_COOL_SETPOINT: temperature}
+        self.set_device_attributes(device_id, data)
+
+    def set_humidity(self, device_id, humidity):
+        """Set device humidity target."""
+        data = {ATTR_HUMID_SETPOINT: humidity}
+        self.set_device_attributes(device_id, data)
+
+    def set_humidifier_type(self, device_id, type):
+        """Set humidifier type for TH6500WF and TH6250WF."""
+        data = {ATTR_HUMIDIFIER_TYPE: type}
+        self.set_device_attributes(device_id, data)
+
+    def set_schedule_mode(self, device_id, mode, HC):
+        """Set schedule mode for TH6500WF and TH6250WF."""
+        if HC:
+            data = {ATTR_SETPOINT_MODE: mode}
+            self.set_device_attributes(device_id, data)
+        else:
+            self.notify_ha(
+                "Warning: Service set_schedule_mode is only for "
+                + "TH6500WF or TH6250WF thermostats."
+            )
+
     def set_backlight(self, device_id, level, device):
         """Set backlight intensity when idle, on or auto."""
         """Work differently for wifi and zigbee devices."""
@@ -888,9 +921,12 @@ def set_cool_setpoint_max(self, device_id, temp):
         _LOGGER.debug("CoolsetpointMax.data = %s", data)
         self.set_device_attributes(device_id, data)
 
-    def set_aux_cycle_output(self, device_id, status, val):
+    def set_aux_cycle_output(self, device_id, status, val, wifi):
         """Set low voltage thermostat aux cycle status and length."""
-        data = {ATTR_CYCLE_OUTPUT2: {"status": status, "value": val}}
+        if wifi:
+            data = {ATTR_AUX_CYCLE: val}
+        else:
+            data = {ATTR_CYCLE_OUTPUT2: {"status": status, "value": val}}
         _LOGGER.debug("auxCycleoutput.data = %s", data)
         self.set_device_attributes(device_id, data)
 
@@ -938,7 +974,7 @@ def set_em_heat(self, device_id, heat, low, sec):
         if low == "voltage":
             data = {ATTR_CYCLE_OUTPUT2: {"status": heat, "value": sec}}
         elif low == "wifi":
-            data = {ATTR_AUX_CYCLE: heat}
+            data = {ATTR_AUX_CYCLE: sec}
         else:
             data = {ATTR_FLOOR_AUX: heat}
         _LOGGER.debug("em_heat.data = %s", data)
@@ -1053,7 +1089,7 @@ def set_flow_meter_options(self, device_id, alarm, action, lenght, threshold):
         _LOGGER.debug("Flowmeter options.data = %s", data)
         self.set_device_attributes(device_id, data)
 
-    def set_led_indicator(self, device_id, state, intensity, red, green, blue):
+    def set_led_indicator(self, device_id, state, red, green, blue):
         """Set devive led indicator intensity and color for on and off state."""
         if state == 1:
             data = {
@@ -1063,9 +1099,7 @@ def set_led_indicator(self, device_id, state, intensity, red, green, blue):
                     "blue": blue,
                 }
             }
-            self.set_device_attributes(device_id, data)
-            data2 = {ATTR_LED_ON_INTENSITY: intensity}
-            self.set_device_attributes(device_id, data2)
+            _LOGGER.debug("led on color.data = %s", data)
         else:
             data = {
                 ATTR_LED_OFF_COLOR: {
@@ -1074,11 +1108,26 @@ def set_led_indicator(self, device_id, state, intensity, red, green, blue):
                     "blue": blue,
                 }
             }
-            self.set_device_attributes(device_id, data)
-            data2 = {ATTR_LED_OFF_INTENSITY: intensity}
-            self.set_device_attributes(device_id, data2)
-        _LOGGER.debug("led.data = %s, led.data2 = %s", data, data2)
+            _LOGGER.debug("led off color.data = %s", data)
+        self.set_device_attributes(device_id, data)
+
+    def set_led_on_intensity(self, device_id, intensity):
+        """Set devive led indicator intensity for on state."""
+        data = {ATTR_LED_ON_INTENSITY: intensity}
+        self.set_device_attributes(device_id, data)
+        _LOGGER.debug("led on intensity.data on = %s", data)
+
+    def set_led_off_intensity(self, device_id, intensity):
+        """Set devive led indicator intensity for off state."""
+        data = {ATTR_LED_OFF_INTENSITY: intensity}
+        self.set_device_attributes(device_id, data)
+        _LOGGER.debug("led off intensity.data on = %s", data)
+
+    def set_light_min_intensity(self, device_id, intensity):
+        """Set dimmer light minimum intensity from 1 to 3000."""
+        data = {ATTR_INTENSITY_MIN: intensity}
         self.set_device_attributes(device_id, data)
+        _LOGGER.debug("led min intensity.data on = %s", data)
 
     def set_wattage(self, device_id, watt):
         """Set light and dimmer watt load."""