Door, PIR and Temp sensors status

README.md

@@ -1,4 +1,8 @@
+# This plugin is no longer supported. For better device support, see https://github.com/Xenomes/Domoticz-TinyTUYA-Plugin
+
+
 # Domoticz-TUYA-Plugin
+
 TUYA Plugin for Domoticz home automation
 
 Controls TUYA devices your network (mainly on/off switches and Lights). Tuya devices come in many brands and may come with different apps such as Smart Life or Jinvoo Smart, so select the matching App when configuring the plugin.
@@ -8,7 +12,7 @@ Controls TUYA devices your network (mainly on/off switches and Lights). Tuya dev
 * Auto-detects devices on your account
 * Tested with lights and switches (but should control other devices on/off)
 * Cloud control only uses your user/password account with encrypted communications without requiring IP or device IDs or Keys to configure it
-* Allows controlling Dimmer/RGB Color for lights
+* Allows controlling Dimmer/RGB(WW) Colour for lights (⚠ RGBW(W) lights must be on a colour for correct detection ⚠)
 * Supports scene activation
 
 ## Installation
@@ -17,7 +21,8 @@ Python version 3.4 or higher required & Domoticz version 3.9446 or greater.
 
 To install:
 * Go in your Domoticz directory using a command line and open the plugins directory.
-* Run: ```git clone https://github.com/guino/tuyaha.git```
+* The plugin required Python library tuyaha and requests ```sudo pip3 install tuyaha requests==2.23.0```
+* Run: ```git clone https://github.com/Xenomes/Domoticz-TUYA-Plugin.git```
 * Restart Domoticz.
 
 ## Updating
@@ -27,14 +32,9 @@ To update:
 * Run: ```git pull```
 * Restart Domoticz.
 
-## Alternate Install/Update:
-
-* Simply create a directory under domoticz/plugins directory like 'TUYA' and download/copy the plugin.py file and tuyaha directory (with all its contents) into it.
-* Restart Domoticz.
-
 ## Configuration
 
-Enter your username and password for your app account along with your country code (1=US/Canada, 55=Brazil, etc). The initial setup of your devices should be done with the app and this plugin will detect/use the same settings and automatically find/add the devices into Domoticz.
+Enter your username and password for your app account along with your country code (1=US/Canada, 55=Brazil, etc), keep the setting 'Data Timeout' disabled. The initial setup of your devices should be done with the app and this plugin will detect/use the same settings and automatically find/add the devices into Domoticz.
 
 ## Usage
 
@@ -45,23 +45,28 @@ Devices detected are created in the 'Devices' tab, to use them you need to click
 
 | Version | Information|
 | ----- | ---------- |
+| 1.0.16 | Update for blinds/cover |
+| 1.0.15 | Update for blinds/cover |
+| 1.0.14 | Change blinds/cover control for Domoticz 2022.2 |
+| 1.0.13 | Disabled turn devices offline at startup |
+| 1.0.12 | Fix for cover or blinds status |
+| 1.0.11 | Added stop for cover or blinds |
+| 1.0.10 | Added turn off for off-line devices |
+| 1.0.9 | Changed scene switch type to push button |
+| 1.0.8 | Added fix for 0 device detection |
+| 1.0.7 | Added fix for error Tuyaapi time-out |
+| 1.0.6 | Added detection for White and RGB(WW) lights |
+| 1.0.5 | Fixed update time api to Domoticz from 10 min to 1 min |
+| 1.0.4 | Add light device if no match found in the json |
+| 1.0.3 | Update for tuyaha 0.0.8 |
+| 1.0.2 | Update light support added temperature control |
 | 1.0.1 | Support for SmartLife and Jinvoo Apps |
 | 1.0.0 | Initial upload version |
 
-# Includes 'tuyaha' project:
-
-Cloned from the abandoned package [tuyapy](https://pypi.org/project/tuyapy/) v0.1.3. This package implements a Tuya
-API endpoint that was specially designed for Home Assistant.
+## Note
 
-This clone contains several critical fixes. Check commits.
+I can only support devices or with similar functions that I have myself. Thank you for your understanding.
 
-## How to check whether the API this library using can control your device?
+# Original project:
 
-- Copy [this script](https://github.com/PaulAnnekov/tuyaha/blob/master/tools/debug_discovery.py) to your PC with Python
-  installed or to https://repl.it/
-- Set/update config inside and run it
-- Check if your devices are listed
-  - If they are - open an issue and provide the output
-  - If they are not - don't open an issue. Ask [Tuya support](mailto:[email protected]) to support your device in their 
-    `/homeassistant` API
-- Remove the updated script, so your credentials won't leak
+Fork from https://github.com/guino/tuyaha to make a standalone project.

fakeDomoticz.py

@@ -0,0 +1,8 @@
+def Log(s):
+    print(s)
+
+def Error(s):
+    print(s)
+
+def Debug(s):
+    print(s)

plugin.py

@@ -2,16 +2,21 @@
 #
 # Author: Wagner Oliveira ([email protected])
 #
+# Contributed: Xenomes ([email protected])
+#
 """
-<plugin key="tuya" name="TUYA" author="Wagner Oliveira" version="1.0.0" wikilink="http://www.domoticz.com/wiki/plugins/plugin.html" externallink="https://github.com/guino/Domoticz-TUYA">
+<plugin key="tuya" name="TUYA" author="Wagner Oliveira contributed Xenomes" version="1.0.16" wikilink="" externallink="https://github.com/Xenomes/Domoticz-TUYA-Plugin.git">
     <description>
-        <h2>TUYA Plugin</h2><br/>
+        Support forum: <a href="https://www.domoticz.com/forum/viewtopic.php?f=65&amp;t=33145">https://www.domoticz.com/forum/viewtopic.php?f=65&amp;t=33145</a><br/>
+        Support forum Dutch: <a href="https://contactkring.nl/phpbb/viewtopic.php?f=60&amp;t=846">https://contactkring.nl/phpbb/viewtopic.php?f=60&amp;t=846</a><br/>
+        <br/>
+        <h2>TUYA Plugin v.1.0.16</h2><br/>
         This plugin is meant to control TUYA devices (mainly on/off switches and LED lights). TUYA devices may come with different brands and different Apps such as Smart Life or Jinvoo Smart, so select the corresponding App you're using below.
         <h3>Features</h3>
         <ul style="list-style-type:square">
             <li>Auto-detection of devices on network</li>
             <li>On/Off control, state and available status display</li>
-            <li>Dimmer/RGB Color setting for Lights</li>
+            <li>Dimmer/RGBWW Color setting for Lights</li>
             <li>Scene activation support</li>
         </ul>
         <h3>Devices</h3>
@@ -48,7 +53,10 @@
     </params>
 </plugin>
 """
-import Domoticz
+try:
+    import Domoticz
+except ImportError:
+    import fakeDomoticz as Domoticz
 import threading
 import socket
 import html
@@ -65,16 +73,23 @@ class BasePlugin:
     last_update = 0
 
     def __init__(self):
+        self.tuya._discovery_interval = 600
+        self.tuya._query_interval = 30
+        self.tuya._force_discovery = True
         return
 
     def onStart(self):
+        Domoticz.Log("Waiting 60 seconds to connect TuyaApi login error timeout")
+        t = 60
+        t_end = time.time() + t
+        while time.time() < t_end:
+            t = t - 10
+            Domoticz.Log("Waiting " + str(t) + " seconds to connect TuyaApi (Tuya Plug-in)")
+            time.sleep(10.0)
         Domoticz.Log("TUYA plugin started")
         if Parameters["Mode6"] != "0":
             Domoticz.Debugging(int(Parameters["Mode6"]))
             DumpConfigToLog()
-        # Mark all existing devices as off/timed out initially (until they are discovered)
-        for u in Devices:
-            UpdateDevice(u, 0, 'Off', True)
         # If Mode2 is not set (previous version didn't use it), set it
         if Parameters["Mode2"] == "":
             Parameters["Mode2"] = "tuya"
@@ -110,7 +125,7 @@ def onCommand(self, Unit, Command, Level, Hue):
             return
 
         if not dev.available():
-            Domoticz.Error('Command for DeviceID='+Devices[Unit].DeviceID+' but device is offline.')
+            Domoticz.Log('Command for DeviceID='+Devices[Unit].DeviceID+' but device is offline.')
             return
 
         Domoticz.Log('Sending command for DeviceID='+Devices[Unit].DeviceID)
@@ -120,39 +135,60 @@ def onCommand(self, Unit, Command, Level, Hue):
         if Command == 'On':
             if dev_type == 'scene':
                 dev.activate()
-            elif dev_type == 'cover':
-                dev.close_cover()
             else:
                 dev.turn_on()
             UpdateDevice(Unit, 1, 'On', not dev.available())
+            Domoticz.Log('On Called')
         elif Command == 'Off':
             if dev_type == 'scene':
                 dev.activate()
-            elif dev_type == 'cover':
-                dev.open_cover()
             else:
-                dev.turn_off();
+                dev.turn_off()
             UpdateDevice(Unit, 0, 'Off', not dev.available())
+            Domoticz.Log('Off Called')
+        # elif dev_type == 'cover':
+        if Command == 'Open':
+            dev.open_cover()
+            UpdateDevice(Unit, 1, 'Open', not dev.available())
+            Domoticz.Log('Open Called')
+        elif Command == 'Stop':
+            dev.stop_cover()
+            UpdateDevice(Unit, 0, 'Stop', not dev.available())
+            Domoticz.Log('Stop Called')
+        elif Command == 'Close':
+            dev.close_cover()
+            UpdateDevice(Unit, 0, 'Close', not dev.available())
+            Domoticz.Log('CLose Called')
         elif Command == 'Set Color':
             # Convert RGB to Hue+Saturation
             rgb = json.loads(Hue)
             h, s = rgb_to_hs(rgb.get("r"), rgb.get("g"), rgb.get("b"))
+            mode = rgb.get("m")
+            t = rgb.get("t")
             Domoticz.Debug("color="+str(rgb)+" h="+str(h)+" s="+str(s))
             # If color changed
             if Devices[Unit].Color != Hue:
-                dev.set_color( [ h*360, s*100 ] )
-                Domoticz.Debug("Set color called")
+                if mode == 3:
+                    dev.set_color( [ h*360, s*100 ] )
+                    Domoticz.Debug("Set color called")
+                if mode == 2:
+                    temp = round(2700+((6500-2700)/255*(255-t)))
+                    Domoticz.Debug("temp = " + str(temp))
+                    dev.set_color_temp( temp )
+                    Domoticz.Debug("Set white called")
             # If level changed
             if Devices[Unit].sValue != str(Level):
                 dev.set_brightness(round(Level*2.55))
                 Domoticz.Debug("Set bright called")
             # Update status of Domoticz device
             Devices[Unit].Update(nValue=1, sValue=str(Level), TimedOut=Devices[Unit].TimedOut, Color=Hue)
+            Domoticz.Log('Set Color Called')
         elif Command == 'Set Level':
             # Set new level
             dev.set_brightness(round(Level*2.55))
             # Update status of Domoticz device
             UpdateDevice(Unit, 1 if Devices[Unit].Type == 241 else 2, str(Level), Devices[Unit].TimedOut)
+            Domoticz.Log('Set Level Called')
 
         # Set last update
         self.last_update = time.time()
@@ -164,10 +200,10 @@ def onDisconnect(self, Connection):
         Domoticz.Debug("onDisconnect called")
 
     def onHeartbeat(self):
-        Domoticz.Debug("onHeartbeat called time="+str(time.time()))
-        # If it hasn't been at least 1 minute (corrected for ~2s runtime) since last update, skip it
-        if time.time() - self.last_update < 58:
+        # If it hasn't been at least 1 minute since last update, skip it
+        if time.time() - self.last_update < 61:
             return
+        Domoticz.Debug("onHeartbeat called time="+str(time.time()))
         self.startup = False
         # Create/Start update thread
         self.updateThread = threading.Thread(name="TUYAUpdateThread", target=BasePlugin.handleThread, args=(self,))
@@ -181,9 +217,14 @@ def handleThread(self):
             if self.startup == True:
                 self.devs = self.tuya.init(Parameters["Username"], Parameters["Password"], Parameters["Mode1"], Parameters["Mode2"])
             else:
-                self.tuya.check_access_token()
-                self.tuya.poll_devices_update()
-                self.devs = self.tuya.get_all_devices()
+                Domoticz.Debug("Device count: " + str(len(Devices)))
+                if int(len(self.tuya.get_all_devices())) > 0:
+                    self.tuya._force_discovery = True
+                    time.sleep(0.5)
+                    self.tuya.refresh_access_token()
+                    time.sleep(0.5)
+                    self.tuya.discover_devices()
+                    self.devs = self.tuya.get_all_devices()
 
             # Set last update
             self.last_update = time.time()
@@ -199,14 +240,32 @@ def handleThread(self):
                     unit = nextUnit()
                     dev_type = dev.device_type()
                     if dev_type == "light":
-                        if dev.data.get("color_mode") is None:
+                        if dev.data.get("color_mode") == 'colour' and dev.data.get("color_temp") is not None and dev.data.get("brightness") is not None:
+                            # Light Color and White temperature contol
+                            Domoticz.Device(Name=dev.name(), Unit=unit, Type=241, Subtype=4, Switchtype=7, DeviceID=dev.object_id()).Create()
+                        elif dev.data.get("color_mode") == 'colour' and dev.data.get("color_temp") is None and dev.data.get("brightness") is not None:
+                            # Light Color control
+                            Domoticz.Device(Name=dev.name(), Unit=unit, Type=241, Subtype=2, Switchtype=7, DeviceID=dev.object_id()).Create()
+                        elif dev.data.get("color_mode") == 'colour' and dev.data.get("color_temp") is None and dev.data.get("brightness") is None:
+                            # Light Color control
+                            Domoticz.Device(Name=dev.name(), Unit=unit, Type=241, Subtype=2, Switchtype=7, DeviceID=dev.object_id()).Create()
+                        elif dev.data.get("color_mode") == 'white' and dev.data.get("color_temp") is not None and dev.data.get("brightness") is not None:
+                            # Light White temperature control
+                            Domoticz.Device(Name=dev.name(), Unit=unit, Type=241, Subtype=8, Switchtype=7, DeviceID=dev.object_id()).Create()
+                        elif dev.data.get("color_mode") == 'white' and dev.data.get("color_temp") is None and dev.data.get("brightness") is not None:
+                            # Light Brightness control
+                            Domoticz.Device(Name=dev.name(), Unit=unit, Type=241, Subtype=3, Switchtype=7, DeviceID=dev.object_id()).Create()
+                        elif dev.data.get("color_mode") is None and dev.data.get("color_temp") is None and dev.data.get("brightness") is None:
+                            # Light On/Off control
                             Domoticz.Device(Name=dev.name(), Unit=unit, Type=244, Subtype=73, Switchtype=7, Image=0, DeviceID=dev.object_id()).Create()
                         else:
-                            Domoticz.Device(Name=dev.name(), Unit=unit, Type=241, Subtype=2, Switchtype=7, DeviceID=dev.object_id()).Create()
+                            # Light On/Off control
+                            Domoticz.Device(Name=dev.name(), Unit=unit, Type=244, Subtype=73, Switchtype=7, Image=0, DeviceID=dev.object_id()).Create()
+                            Domoticz.Debug("No controls found for your light device!")
                     elif dev_type == "climate":
                         Domoticz.Device(Name=dev.name(), Unit=unit, Type=244, Subtype=73, Switchtype=0, Image=16, DeviceID=dev.object_id()).Create()
                     elif dev_type == "scene":
-                        Domoticz.Device(Name=dev.name(), Unit=unit, Type=244, Subtype=73, Switchtype=0, Image=9, DeviceID=dev.object_id()).Create()
+                        Domoticz.Device(Name=dev.name(), Unit=unit, Type=244, Subtype=73, Switchtype=9, Image=9, DeviceID=dev.object_id()).Create()
                     elif dev_type == "fan":
                         Domoticz.Device(Name=dev.name(), Unit=unit, Type=244, Subtype=73, Switchtype=0, Image=7, DeviceID=dev.object_id()).Create()
                     elif dev_type == "cover":
@@ -219,8 +278,17 @@ def handleThread(self):
                 # Update device
                 if dev.state() == False:
                     UpdateDevice(unit, 0, 'Off', not dev.available())
+                elif dev.state() == True:
+                    if dev.available():
+                        UpdateDevice(unit, 1, 'On', not dev.available())
+                    else:
+                        UpdateDevice(unit, 0, 'Off', not dev.available())
+                        Domoticz.Log('DeviceID='+Devices[unit].DeviceID+' Turned off because device is offline.')
                 else:
-                    UpdateDevice(unit, 1, 'On', not dev.available())
+                    Domoticz.Log('DeviceID='+Devices[unit].DeviceID+' State update skiped. status = '+str(dev.state()))
+
+                #if dev.device_type() == 'cover' and dev.state() != 'Stop':
+                #    UpdateDevice(unit, 1, 'Stop', not dev.available())
 
         except Exception as err:
             Domoticz.Error("handleThread: "+str(err)+' line '+format(sys.exc_info()[-1].tb_lineno))