Fix illuminator when used with night profile

Author: rroller

custom_components/dahua/__init__.py

@@ -186,8 +186,15 @@ async def _async_update_data(self):
 
                 self.initialized = True
 
+            # We need the profile mode (0=day, 1=night, 2=scene)
+            mode_data = await self.client.async_get_video_in_mode()
+            data.update(mode_data)
+            profile_mode = mode_data.get("table.VideoInMode[0].Config[0]", "0")
+
             # Figure out which APIs we need to call and then fan out and gather the results
-            coros = [asyncio.ensure_future(self.client.async_common_config())]
+            coros = [
+                asyncio.ensure_future(self.client.async_common_config(profile_mode)),
+            ]
             if self._supports_disarming_linkage:
                 coros.append(asyncio.ensure_future(self.client.async_get_disarming_linkage()))
             if self._supports_coaxial_control:
@@ -404,7 +411,6 @@ def get_firmware_version(self) -> str:
         return self.data.get("version")
 
     def get_serial_number(self) -> str:
-
         """ returns the device serial number. This is unique per device """
         return self._serial_number
 
@@ -427,7 +433,10 @@ def get_infrared_brightness(self) -> int:
 
     def is_illuminator_on(self) -> bool:
         """Return true if the illuminator light is on"""
-        return self.data.get("table.Lighting_V2[0][0][0].Mode", "") == "Manual"
+        # profile_mode 0=day, 1=night, 2=scene
+        profile_mode = self.get_profile_mode()
+
+        return self.data.get("table.Lighting_V2[0][" + profile_mode + "][0].Mode", "") == "Manual"
 
     def get_illuminator_brightness(self) -> int:
         """Return the brightness of the illuminator light, as reported by the camera itself, between 0..255 inclusive"""
@@ -439,6 +448,10 @@ def is_security_light_on(self) -> bool:
         """Return true if the security light is on. This is the red/blue flashing light"""
         return self.data.get("status.status.WhiteLight", "") == "On"
 
+    def get_profile_mode(self) -> str:
+        # profile_mode 0=day, 1=night, 2=scene
+        return self.data.get("table.VideoInMode[0].Config[0]", "0")
+
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Handle removal of an entry."""

custom_components/dahua/client.py

@@ -170,7 +170,7 @@ async def async_get_lighting_v2(self) -> dict:
         table.Lighting_V2[0][2][0].PercentOfMaxBrightness=100
         table.Lighting_V2[0][2][0].Sensitive=3
         """
-        url = "http://{0}/cgi-bin/configManager.cgi?action=getConfig&name=Lighting_V2[0][0][0]".format(
+        url = "http://{0}/cgi-bin/configManager.cgi?action=getConfig&name=Lighting_V2".format(
             self._address_with_port
         )
         return await self.api_wrapper("get", url, headers=HEADERS)
@@ -194,10 +194,11 @@ async def async_get_machine_name(self) -> dict:
         )
         return await self.api_wrapper("get", url, headers=HEADERS)
 
-    async def async_common_config(self) -> dict:
+    async def async_common_config(self, profile_mode) -> dict:
         """
         async_common_config will fetch the status of the IR light (InfraRed light) and motion detection status (if it is
         enabled or not)
+        profile_mode: = 0=day, 1=night, 2=normal scene
 
         Example response:
         table.Lighting[0][0].Correction=50
@@ -206,8 +207,8 @@ async def async_common_config(self) -> dict:
         table.Lighting[0][0].Mode=Auto
         table.Lighting[0][0].Sensitive=3
         """
-        url = "http://{0}/cgi-bin/configManager.cgi?action=getConfig&name=MotionDetect&action=getConfig&name=Lighting[0][0]".format(
-            self._address_with_port
+        url = "http://{0}/cgi-bin/configManager.cgi?action=getConfig&name=MotionDetect&action=getConfig&name=Lighting[0][{1}]".format(
+            self._address_with_port, profile_mode
         )
         return await self.api_wrapper("get", url, headers=HEADERS)
 
@@ -301,7 +302,8 @@ async def async_set_service_set_channel_title(self, channel: int, text1: str, te
         if "OK" not in value and "ok" not in value:
             raise Exception("Could not set text")
 
-    async def async_set_service_set_text_overlay(self, channel: int, group: int, text1: str, text2: str, text3: str, text4: str):
+    async def async_set_service_set_text_overlay(self, channel: int, group: int, text1: str, text2: str, text3: str,
+                                                 text4: str):
         """ async_set_service_set_text_overlay sets the video text overlay """
         text = '|'.join(filter(None, [text1, text2, text3, text4]))
         url = "http://{0}/cgi-bin/configManager.cgi?action=setConfig&VideoWidget[{1}].CustomTitle[{2}].Text={3}".format(
@@ -321,23 +323,40 @@ async def async_set_service_set_custom_overlay(self, channel: int, group: int, t
         if "OK" not in value and "ok" not in value:
             raise Exception("Could not set text")
 
-    async def async_set_lighting_v2(self, enabled: bool, brightness: int) -> dict:
+    async def async_set_lighting_v2(self, enabled: bool, brightness: int, profile_mode: str) -> dict:
         """
         async_set_lighting_v2 will turn on or off the white light on the camera. If turning on, the brightness will be used.
         brightness is in the range of 0 to 100 inclusive where 100 is the brightest.
         NOTE: this is not the same as the infrared (IR) light. This is the white visible light on the camera
+
+        profile_mode: 0=day, 1=night, 2=scene
         """
 
         # on = Manual, off = Off
         mode = "Manual"
         if not enabled:
             mode = "Off"
-        url = "http://{0}/cgi-bin/configManager.cgi?action=setConfig&Lighting_V2[0][0][0].Mode={1}&Lighting_V2[0][0][0].MiddleLight[0].Light={2}".format(
-            self._address_with_port, mode, brightness
+        url = "http://{0}/cgi-bin/configManager.cgi?action=setConfig&Lighting_V2[0][{1}][0].Mode={2}&Lighting_V2[0][{3}][0].MiddleLight[0].Light={4}".format(
+            self._address_with_port, profile_mode, mode, profile_mode, brightness
         )
         _LOGGER.debug("Turning light on: %s", url)
         return await self.api_wrapper("get", url, headers=HEADERS)
 
+    async def async_get_video_in_mode(self) -> dict:
+        """
+        async_get_video_in_mode will return the profile mode (day/night)
+        0 means config for day,
+        1 means config for night, and
+        2 means config for normal scene.
+
+        table.VideoInMode[0].Config[0]=2
+        table.VideoInMode[0].Mode=0
+        table.VideoInMode[0].TimeSection[0][0]=0 00:00:00-24:00:00
+        """
+
+        url = "http://{0}/cgi-bin/configManager.cgi?action=getConfig&name=VideoInMode".format(self._address_with_port)
+        return await self.api_wrapper("get", url, headers=HEADERS)
+
     async def async_set_coaxial_control_state(self, dahua_type: int, enabled: bool) -> dict:
         """
         async_set_lighting_v2 will turn on or off the white light on the camera.

custom_components/dahua/light.py

@@ -143,15 +143,17 @@ async def async_turn_on(self, **kwargs):
         """Turn the light on with the current brightness"""
         hass_brightness = kwargs.get(ATTR_BRIGHTNESS)
         dahua_brightness = dahua_utils.hass_brightness_to_dahua_brightness(hass_brightness)
-        await self.coordinator.client.async_set_lighting_v2(True, dahua_brightness)
-        await self.coordinator.async_refresh()
+        profile_mode = self._coordinator.get_profile_mode()
+        await self._coordinator.client.async_set_lighting_v2(True, dahua_brightness, profile_mode)
+        await self._coordinator.async_refresh()
 
     async def async_turn_off(self, **kwargs):
         """Turn the light off"""
         hass_brightness = kwargs.get(ATTR_BRIGHTNESS)
         dahua_brightness = dahua_utils.hass_brightness_to_dahua_brightness(hass_brightness)
-        await self.coordinator.client.async_set_lighting_v2(False, dahua_brightness)
-        await self.coordinator.async_refresh()
+        profile_mode = self._coordinator.get_profile_mode()
+        await self._coordinator.client.async_set_lighting_v2(False, dahua_brightness, profile_mode)
+        await self._coordinator.async_refresh()
 
 
 class DahuaSecurityLight(DahuaBaseEntity, LightEntity):