Merge pull request #625 from uzlonewolf/bulb-rewrite

Add Singapore datacenter, update BulbDevice for non-bulb devices again

Author: jasonacox

tinytuya/BulbDevice.py

@@ -120,6 +120,21 @@ class BulbDevice(Device):
         'value_max': 255,
         'value_hexformat': 'rgb8',
     }
+    DEFAULT_DPSET['None'] = {
+        'switch': 1,
+        'mode': None,
+        'brightness': None,
+        'colourtemp': None,
+        'colour': None,
+        'scene': None,
+        'scene_data': None,
+        'timer': None,
+        'music': None,
+        'value_min': 0,
+        'value_max': 255,
+        'value_hexformat': 'rgb8',
+    }
+
 
     # These attributes are obsolete and only kept for backwards compatibility
     DPS_INDEX_SETS = [20, 1] # starts at either DP 20 (Type B) or 1 (all others)
@@ -849,7 +864,11 @@ def detect_bulb(self, response=None, nowait=False):
             # Try to determine type of BulbDevice Type based on DPS indexes
             # 1+2 or 20+21 are required per https://developer.tuya.com/en/docs/iot/product-function-definition?id=K9tp155s4th6b
             #   The rest are optional
-            if '20' in response['dps'] and '21' in response['dps']:
+            if '20' in response['dps'] and '1' in response['dps']:
+                # both 1 and 20 in response, this probably isn't a bulb
+                self.bulb_configured = True
+                self.bulb_type = 'None'
+            elif '20' in response['dps'] and '21' in response['dps']:
                 self.bulb_configured = True
                 self.bulb_type = 'B'
             elif '1' in response['dps'] and '2' in response['dps']:

tinytuya/Cloud.py

@@ -122,16 +122,18 @@ def setregion(self, apiRegion=None):
             apiRegion = self.apiRegion
         self.apiRegion = apiRegion.lower()
         self.urlhost = "openapi.tuyacn.com"          # China Data Center
-        if self.apiRegion == "us":
+        if self.apiRegion == "us" or self.apiRegion == "az":
             self.urlhost = "openapi.tuyaus.com"      # Western America Data Center
-        if self.apiRegion == "us-e":
+        elif self.apiRegion == "us-e" or self.apiRegion == "ue":
             self.urlhost = "openapi-ueaz.tuyaus.com" # Eastern America Data Center
-        if self.apiRegion == "eu":
+        elif self.apiRegion == "eu":
             self.urlhost = "openapi.tuyaeu.com"      # Central Europe Data Center
-        if self.apiRegion == "eu-w":
+        elif self.apiRegion == "eu-w" or self.apiRegion == "we":
             self.urlhost = "openapi-weaz.tuyaeu.com" # Western Europe Data Center
-        if self.apiRegion == "in":
+        elif self.apiRegion == "in":
             self.urlhost = "openapi.tuyain.com"      # India Datacenter
+        elif self.apiRegion == "sg":
+            self.urlhost = "openapi-sg.iotbing.com"  # Singapore Data Center
 
     def _tuyaplatform(self, uri, action='GET', post=None, ver='v1.0', recursive=False, query=None, content_type=None):
         """

tinytuya/core/core.py

@@ -93,7 +93,7 @@
 # Colorama terminal color capability for all platforms
 init()
 
-version_tuple = (1, 17, 1)  # Major, Minor, Patch
+version_tuple = (1, 17, 2)  # Major, Minor, Patch
 version = __version__ = "%d.%d.%d" % version_tuple
 __author__ = "jasonacox"
 

tinytuya/wizard.py

@@ -145,14 +145,15 @@ def wizard(color=True, retries=None, forcescan=False, nocloud=False, assume_yes=
                                       " currently registered in Tuya App (used to pull full list) or 'scan' to scan for one: " + normal)
         # TO DO - Determine apiRegion based on Device - for now, ask
         print("\n      " + subbold + "Region List" + dim +
-              "\n        cn\tChina Data Center" +
-              "\n        us\tUS - Western America Data Center" +
-              "\n        us-e\tUS - Eastern America Data Center" +
+              "\n        cn\tChina Data Center (alias: AY)" +
+              "\n        us\tUS - Western America Data Center (alias: AZ)" +
+              "\n        us-e\tUS - Eastern America Data Center (alias: UE)" +
               "\n        eu\tCentral Europe Data Center" +
-              "\n        eu-w\tWestern Europe Data Center" +
-              "\n        in\tIndia Data Center\n")
+              "\n        eu-w\tWestern Europe Data Center (alias: WE)" +
+              "\n        in\tIndia Data Center\n" +
+              "\n        sg\tSingapore Data Center")
         config['apiRegion'] = input(subbold + "    Enter " + bold + "Your Region" + subbold +
-                                    " (Options: cn, us, us-e, eu, eu-w, or in): " + normal)
+                                    " (Options: cn, us, us-e, eu, eu-w, in, or sg): " + normal)
         # Write Config
         json_object = json.dumps(config, indent=4)
         with open(config_file, "w") as outfile: