Minor Fixes and Tidy Up

Minor fixes and tidy up.
IndigoDomotics · Sep 2, 2019 · 3166ef5 · 3166ef5
1 parent 80e3288
commit 3166ef5
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Alexa-Hue Bridge.indigoPlugin/Contents/Info.plist b/Alexa-Hue Bridge.indigoPlugin/Contents/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>PluginVersion</key>
-	<string>3.0.32</string>
+	<string>3.0.34</string>
 	<key>ServerApiVersion</key>
 	<string>2.0</string>
 	<key>IwsApiVersion</key>

diff --git a/Alexa-Hue Bridge.indigoPlugin/Contents/Server Plugin/Devices.xml b/Alexa-Hue Bridge.indigoPlugin/Contents/Server Plugin/Devices.xml
@@ -25,7 +25,7 @@
 
 
     <Device type="relay" id="emulatedHueBridge">
-        <Name>Emulated Hue Bridge [Devices]</Name>
+        <Name>Emulated Hue Bridge [Alexa Devices]</Name>
         <ConfigUI>
             <Field type="textfield" id="port" defaultValue="auto" hidden="false">
                 <Label>Port:</Label>

diff --git a/Alexa-Hue Bridge.indigoPlugin/Contents/Server Plugin/constants.py b/Alexa-Hue Bridge.indigoPlugin/Contents/Server Plugin/constants.py
@@ -15,6 +15,7 @@
 # DEVICE_LIMIT = 5 #  TESTING (30-JUL-2017)
 DEVICE_LIMIT = 20 # Imposed by the built-in Hue support in Alexa
 EMULATED_HUE_BRIDGE_TYPEID = 'emulatedHueBridge'  # See definition in Devices.xml
+EMULATED_HUE_BRIDGE_MODEL = 'Emulated Hue Bridge [Alexa Devices]'  # See definition in Devices.xml 
 ECHO_DEVICE_TYPEID = 'echoDevice'  # See definition in Devices.xml
 ECHO_DEVICE_TIMER_LIMIT = 15.0  # In seconds - the amount of time an Echo device will show active after a command is received
 

diff --git a/Alexa-Hue Bridge.indigoPlugin/Contents/Server Plugin/menuItems.xml b/Alexa-Hue Bridge.indigoPlugin/Contents/Server Plugin/menuItems.xml
@@ -1,7 +1,3 @@
 <?xml version="1.0"?>
 <MenuItems>
-  <MenuItem id="checkRateLimit" hidden="true">
-    <Name>Check Rate Limit</Name>
-    <CallbackMethod>checkRateLimit</CallbackMethod>
-  </MenuItem>
 </MenuItems>
diff --git a/Alexa-Hue Bridge.indigoPlugin/Contents/Server Plugin/plugin.py b/Alexa-Hue Bridge.indigoPlugin/Contents/Server Plugin/plugin.py
@@ -108,6 +108,12 @@ def __init__(self, pluginId, pluginDisplayName, pluginVersion, pluginPrefs):
                     self.globals['portList'].append(int(dev.address))  # Do this regardless whether device enabled or not
                 except:
                     pass
+                # Fix to make model names consistent #
+                if dev.model != EMULATED_HUE_BRIDGE_MODEL:
+                    dev.model = EMULATED_HUE_BRIDGE_MODEL
+                    dev.replaceOnServer()
+
+
         self.generalLogger.debug(u"PORTLIST @Plugin INIT: {}".format(self.globals['portList']))
 
         # Set Plugin Config Values
@@ -1056,7 +1062,7 @@ def alexaDevicesListGlobal(self, filter, valuesDict, typeId, ahbDevId):
                 alexaDeviceName = alexaDeviceData['name'].replace(',',' ').replace(';',' ')
                 self.globals['alexaDevicesListGlobal'][alexaDeviceNameKey] = int(alexaHueBridgeId)
                 alexaDeviceListKey = alexaDeviceNameKey + '|' + alexaDeviceName + '|' + str(alexaHueBridgeId)
-                alexaDeviceListKey = str(u'{}|{}|{}'.format(alexaDeviceNameKey, alexaDeviceName, alexaHueBridgeId))
+                alexaDeviceListKey = u'{}|{}|{}'.format(alexaDeviceNameKey, alexaDeviceName, alexaHueBridgeId)
                 allocatedAlexaDevicesListGlobal.append((alexaDeviceListKey, alexaDeviceName))
 
         for alexaDeviceNameKey, alexaDeviceData in self.globals['alexaHueBridge'][ahbDevId]['publishedAlexaDevices'].iteritems():