From b1a025fd0014f2b9e1c3bbc11ec94f309079a808 Mon Sep 17 00:00:00 2001
From: indigo-jay <jay@indigodomo.com>
Date: Fri, 11 Feb 2022 14:57:47 -0600
Subject: [PATCH] Rolling back changes to my branch to remove my changes to the
 Custom Device example. Matt will be doing that conversion.

---
 .../Contents/Info.plist                       |   6 +-
 .../Contents/Server Plugin/Actions.xml        |   4 +-
 .../Contents/Server Plugin/MenuItems.xml      |   2 +-
 .../Contents/Server Plugin/plugin.py          | 517 +++++++++---------
 4 files changed, 259 insertions(+), 270 deletions(-)

diff --git a/Example Device - Custom.indigoPlugin/Contents/Info.plist b/Example Device - Custom.indigoPlugin/Contents/Info.plist
index df65011..319ae50 100644
--- a/Example Device - Custom.indigoPlugin/Contents/Info.plist	
+++ b/Example Device - Custom.indigoPlugin/Contents/Info.plist	
@@ -3,9 +3,9 @@
 <plist version="1.0">
 <dict>
 	<key>PluginVersion</key>
-	<string>2022.1.0</string>
+	<string>2021.1.0</string>
 	<key>ServerApiVersion</key>
-	<string>3.0</string>
+	<string>2.5</string>
 	<key>IwsApiVersion</key>
 	<string>1.0.0</string>
 	<key>CFBundleDisplayName</key>
@@ -18,7 +18,7 @@
 	<array>
 		<dict>
 			<key>CFBundleURLName</key>
-			<string>https://wiki.indigodomo.com/doku.php?id=plugins:example_dev_1</string>
+			<string>http://wiki.indigodomo.com/doku.php?id=plugins:example_dev_1</string>
 		</dict>
 	</array>
 </dict>
diff --git a/Example Device - Custom.indigoPlugin/Contents/Server Plugin/Actions.xml b/Example Device - Custom.indigoPlugin/Contents/Server Plugin/Actions.xml
index 6a71d99..2a2d617 100644
--- a/Example Device - Custom.indigoPlugin/Contents/Server Plugin/Actions.xml	
+++ b/Example Device - Custom.indigoPlugin/Contents/Server Plugin/Actions.xml	
@@ -3,11 +3,11 @@
 	<SupportURL>http://wiki.indigodomo.com/doku.php?id=plugins:example_dev_1</SupportURL>
 	<Action id="resetHardware" deviceFilter="self">
 		<Name>Reset Hardware</Name>
-		<CallbackMethod>reset_hardware</CallbackMethod>
+		<CallbackMethod>resetHardware</CallbackMethod>
 	</Action>
 	<Action id="updateHardwareFirmware" deviceFilter="self">
 		<Name>Update Hardware Firmware</Name>
-		<CallbackMethod>update_hardware_firmware</CallbackMethod>
+		<CallbackMethod>updateHardwareFirmware</CallbackMethod>
 		<ConfigUI>
 			<SupportURL>http://wiki.indigodomo.com/doku.php?id=plugins:example_dev_1</SupportURL>
 			<Field id="description" type="textfield" hidden="true">
diff --git a/Example Device - Custom.indigoPlugin/Contents/Server Plugin/MenuItems.xml b/Example Device - Custom.indigoPlugin/Contents/Server Plugin/MenuItems.xml
index 7bcf0e9..c4e995c 100644
--- a/Example Device - Custom.indigoPlugin/Contents/Server Plugin/MenuItems.xml	
+++ b/Example Device - Custom.indigoPlugin/Contents/Server Plugin/MenuItems.xml	
@@ -8,6 +8,6 @@
 <MenuItems>
 	<MenuItem id="menu1">
 		<Name>Time Warp!</Name>
-		<CallbackMethod>time_warp</CallbackMethod>
+		<CallbackMethod>timeWarp</CallbackMethod>
 	</MenuItem>
 </MenuItems>
diff --git a/Example Device - Custom.indigoPlugin/Contents/Server Plugin/plugin.py b/Example Device - Custom.indigoPlugin/Contents/Server Plugin/plugin.py
index 4c11b72..1f80ea1 100644
--- a/Example Device - Custom.indigoPlugin/Contents/Server Plugin/plugin.py	
+++ b/Example Device - Custom.indigoPlugin/Contents/Server Plugin/plugin.py	
@@ -5,6 +5,9 @@
 # http://www.indigodomo.com
 
 import indigo
+
+import os
+import sys
 import time
 
 # Note the "indigo" module is automatically imported and made available inside
@@ -12,284 +15,270 @@
 
 ################################################################################
 class Plugin(indigo.PluginBase):
-    ########################################
-    def __init__(self, plugin_id, plugin_display_name, plugin_version, plugin_prefs):
-        super(Plugin, self).__init__(plugin_id, plugin_display_name, plugin_version, plugin_prefs)
-        self.debug = True
-        self.time_warp_on = False
-        self.time_warp_count = 0
-        self.state_updater_dev = None
-        self.server_time_dev = None
+	########################################
+	def __init__(self, pluginId, pluginDisplayName, pluginVersion, pluginPrefs):
+		super(Plugin, self).__init__(pluginId, pluginDisplayName, pluginVersion, pluginPrefs)
+		self.debug = True
+		self.timeWarpOn = False
+		self.timeWarpCount = 0
 
-    ########################################
-    def startup(self):
-        self.logger.debug("startup called")
-        # Most plugins that expose new device types will depend on the user
-        # creating the new device from the Indigo UI (just like a native device).
-        #
-        # However, it is also possible for the plugin to create the devices
-        # automatically at runtime:
-        if "Example Server Time" in indigo.devices:
-            self.server_time_dev = indigo.devices["Example Server Time"]
-        else:
-            self.logger.info("creating test device: Example Server Time")
-            self.server_time_dev = indigo.device.create(
-                indigo.kProtocol.Plugin, 
-                "Example Server Time", 
-                "test device created by example plugin", 
-                deviceTypeId="serverTimeDevice"
-            )
-        # Override the state icon shown (in Indigo Touch and client Main Window)
-        # for this device to be the timer image icon:
-        self.server_time_dev.updateStateImageOnServer(indigo.kStateImageSel.TimerOn)
-        if "Example State Updater" in indigo.devices:
-            self.state_updater_dev = indigo.devices["Example State Updater"]
-        else:
-            self.logger.info("creating test device: Example State Updater")
-            self.state_updater_dev = indigo.device.create(
-                indigo.kProtocol.Plugin, 
-                "Example State Updater", 
-                "test state value updating device created by example plugin device", 
-                deviceTypeId="stateUpdater"
-            )
-        # Override the state icon shown (in Indigo Touch and client Main Window)
-        # for this device to be the timer image icon:
-        self.state_updater_dev.updateStateImageOnServer(indigo.kStateImageSel.TimerOn)
+	########################################
+	def startup(self):
+		self.debugLog(u"startup called")
 
-    def shutdown(self):
-        self.logger.debug("shutdown called")
-        key_value_list = list()
-        key_value_list.append({'key': 'serverTimeSeconds', 'value': 0})
-        key_value_list.append({'key': 'serverSecondsEven', 'value': False})
-        key_value_list.append({'key': 'serverDateTime', 'value': "--"})
-        self.server_time_dev.updateStatesOnServer(key_value_list)
+		# Most plugins that expose new device types will depend on the user
+		# creating the new device from the Indigo UI (just like a native device).
+		#
+		# However, it is also possible for the plugin to create the devices
+		# automatically at runtime:
+		if "Example Server Time" in indigo.devices:
+			self.serverTimeDev = indigo.devices["Example Server Time"]
+		else:
+			indigo.server.log(u"creating test device: Example Server Time")
+			self.serverTimeDev = indigo.device.create(indigo.kProtocol.Plugin, "Example Server Time", "test device created by example plugin", deviceTypeId="serverTimeDevice")
+		# Override the state icon shown (in Indigo Touch and client Main Window)
+		# for this device to be the timer image icon:
+		self.serverTimeDev.updateStateImageOnServer(indigo.kStateImageSel.TimerOn)
 
-    ########################################
-    # If runConcurrentThread() is defined, then a new thread is automatically created
-    # and runConcurrentThread() is called in that thread after startup() has been called.
-    #
-    # runConcurrentThread() should loop forever and only return after self.stopThread
-    # becomes True. If this function returns prematurely then the plugin host process
-    # will log an error and attempt to call runConcurrentThread() again after several seconds.
-    def runConcurrentThread(self):
-        try:
-            while True:
-                server_time = indigo.server.getTime()
-                server_time_second = server_time.second
-                if self.time_warp_on:
-                    self.time_warp_count += 1
-                    server_time_second = self.time_warp_count
+		if "Example State Updater" in indigo.devices:
+			self.stateUpdaterDev = indigo.devices["Example State Updater"]
+		else:
+			indigo.server.log(u"creating test device: Example State Updater")
+			self.stateUpdaterDev = indigo.device.create(indigo.kProtocol.Plugin, "Example State Updater", "test state value updating device created by example plugin device", deviceTypeId="stateUpdater")
+		# Override the state icon shown (in Indigo Touch and client Main Window)
+		# for this device to be the timer image icon:
+		self.stateUpdaterDev.updateStateImageOnServer(indigo.kStateImageSel.TimerOn)
 
-                key_value_list = list()
-                key_value_list.append({'key': 'serverTimeSeconds', 'value': server_time_second})
-                key_value_list.append({'key': 'serverSecondsEven', 'value': not bool(server_time_second % 2)})
-                key_value_list.append({'key': 'serverDateTime', 'value': str(server_time)})
-                self.server_time_dev.updateStatesOnServer(key_value_list)
+	def shutdown(self):
+		self.debugLog(u"shutdown called")
 
-                key_value_list = []
-                if server_time_second % 2:
-                    key_value_list.append({'key': 'alwaysInteger', 'value': 0})
-                    key_value_list.append({'key': 'alwaysFloat', 'value': 0.01})
-                    key_value_list.append({'key': 'stringToggleFloats', 'value': "0.0"})
-                    key_value_list.append({'key': 'stringToggleStrings', 'value': "abc"})
-                    key_value_list.append({'key': 'integerToFloat', 'value': 0})
-                    key_value_list.append({'key': 'integerToString', 'value': 0})
-                    key_value_list.append({'key': 'floatToString', 'value': 0.1})
-                else:
-                    key_value_list.append({'key': 'alwaysInteger', 'value': 1})
-                    key_value_list.append({'key': 'alwaysFloat', 'value': 0.123456, 'decimalPlaced': 4})
-                    key_value_list.append({'key': 'stringToggleFloats', 'value': "0.0000"})
-                    key_value_list.append({'key': 'stringToggleStrings', 'value': "def"})
-                    key_value_list.append({'key': 'integerToFloat', 'value': 0.1})
-                    key_value_list.append({'key': 'integerToString', 'value': "abc"})
-                    key_value_list.append({'key': 'floatToString', 'value': "abc"})
-                key_value_list.append({'key': 'timeStamp', 'value': str(time.time()).split(".")[0]})
-                try:
-                    self.state_updater_dev.updateStatesOnServer(key_value_list)
-                except Exception as e:
-                    self.logger.exception(e)
-                if self.time_warp_on:
-                    self.sleep(0.12)
-                else:
-                    self.sleep(1)
-        except self.StopThread:
-            pass  # Optionally catch the StopThread exception and do any needed cleanup.
+		keyValueList = []
+		keyValueList.append({'key':'serverTimeSeconds', 'value':0})
+		keyValueList.append({'key':'serverSecondsEven', 'value':False})
+		keyValueList.append({'key':'serverDateTime', 'value':"--"})
+		self.serverTimeDev.updateStatesOnServer(keyValueList)
 
-    ########################################
-    # Actions defined in MenuItems.xml:
-    ####################
-    def time_warp(self):
-        if not self.time_warp_on:
-            self.logger.info("starting mega time warp")
-            self.time_warp_on = True
-        else:
-            self.logger.info("stopping mega time warp")
-            self.time_warp_on = False
+	########################################
+	# If runConcurrentThread() is defined, then a new thread is automatically created
+	# and runConcurrentThread() is called in that thread after startup() has been called.
+	#
+	# runConcurrentThread() should loop forever and only return after self.stopThread
+	# becomes True. If this function returns prematurely then the plugin host process
+	# will log an error and attempt to call runConcurrentThread() again after several seconds.
+	def runConcurrentThread(self):
+		try:
+			while True:
+				serverTime = indigo.server.getTime()
+				serverTimeSecond = serverTime.second
+				if self.timeWarpOn:
+					self.timeWarpCount += 1
+					serverTimeSecond = self.timeWarpCount
 
-    ########################################
-    """
-    Buttons and dynamic list methods defined for the scenes custom device
+				keyValueList = []
+				keyValueList.append({'key':'serverTimeSeconds', 'value':serverTimeSecond})
+				keyValueList.append({'key':'serverSecondsEven', 'value':not bool(serverTimeSecond % 2)})
+				keyValueList.append({'key':'serverDateTime', 'value':str(serverTime)})
+				self.serverTimeDev.updateStatesOnServer(keyValueList)
 
-    Overview of scene devices:
-        Scene devices are custom devices that will contain multiple devices.
-        We implement this custom device by storing a comma-delimited list of
-        device IDs which is manipulated by clicking Add and Delete buttons
-        in the device config dialog. There are two dynamic list controls in
-        the dialog:
-            1) one popup button control on which the user selects a device
-               to add then clicks the Add Device button.
-            2) one list control which shows all the devices that have already
-               been added to the scene and in which the user can select devices
-               and click the Delete Devices button
-        There is a hidden field "memberDevices" that stores a comma-delimited
-        list of device ids for each member of the scene. The addDevice and
-        deleteDevices methods will take the selections from the respective
-        dynamic lists and do the right thing with the list.
-        Finally, there are the two methods that build the dynamic lists.
-        The method that builds the source list will inspect the "memberDevices"
-        field and won't include those devices in the source list (so the user
-        won't be confused by seeing a device that's already in the member list
-        in the source list). The method that builds the member list of course
-        uses "memberDevices" to build the list.
+				keyValueList = []
+				if serverTimeSecond % 2:
+					keyValueList.append({'key':'alwaysInteger', 'value':0})
+					keyValueList.append({'key':'alwaysFloat', 'value':0.01})
+					keyValueList.append({'key':'stringToggleFloats', 'value':"0.0"})
+					keyValueList.append({'key':'stringToggleStrings', 'value':"abc"})
+					keyValueList.append({'key':'integerToFloat', 'value':0})
+					keyValueList.append({'key':'integerToString', 'value':0})
+					keyValueList.append({'key':'floatToString', 'value':0.1})
+				else:
+					keyValueList.append({'key':'alwaysInteger', 'value':1})
+					keyValueList.append({'key':'alwaysFloat', 'value':0.123456, 'decimalPlaced':4})
+					keyValueList.append({'key':'stringToggleFloats', 'value':"0.0000"})
+					keyValueList.append({'key':'stringToggleStrings', 'value':"def"})
+					keyValueList.append({'key':'integerToFloat', 'value':0.1})
+					keyValueList.append({'key':'integerToString', 'value':"abc"})
+					keyValueList.append({'key':'floatToString', 'value':"abc"})
+				keyValueList.append({'key':'timeStamp', 'value':str(time.time()).split(".")[0]})
+				self.stateUpdaterDev.updateStatesOnServer(keyValueList)
+				if self.timeWarpOn:
+					self.sleep(0.12)
+				else:
+					self.sleep(1)
+		except self.StopThread:
+			pass	# Optionally catch the StopThread exception and do any needed cleanup.
 
-        One other thing that should be done probably - in the deviceStartComm
-        method (or the appropriate CRUD methods if you're using them instead)
-        you should check the IDs to make sure they're still around and if not
-        remove them from the device id list.
+	########################################
+	# Actions defined in MenuItems.xml:
+	####################
+	def timeWarp(self):
+		if not self.timeWarpOn:
+			indigo.server.log(u"starting mega time warp")
+			self.timeWarpOn = True
+		else:
+			indigo.server.log(u"stopping mega time warp")
+			self.timeWarpOn = False
 
-        The device id list property ("memberDevices") could, of course, be
-        formatted in some other way besides a comma-delimited list of ids
-        if you need to store more information. You could, for instance, store
-        some kind of formatted text like JSON or XML that had much more
-        information.
-    """
+	########################################
+	# Buttons and dynamic list methods defined for the scenes custom device
+	#
+	# Overview of scene devices:
+	#	Scene devices are custom devices that will contain multiple devices.
+	# 	We implement this custom device by storing a comma-delimited list of
+	#	device IDs which is manipulated by clicking Add and Delete buttons
+	#	in the device config dialog. There are two dynamic list controls in
+	#	the dialog:
+	#		1) one popup button control on which the user selects a device
+	#		   to add then clicks the Add Device button.
+	#		2) one list control which shows all the devices that have already
+	#		   been added to the scene and in which the user can select devices
+	#		   and click the Delete Devices button
+	#	There is a hidden field "memberDevices" that stores a comma-delimited
+	#	list of device ids for each member of the scene. The addDevice and
+	#	deleteDevices methods will take the selections from the respective
+	#	dynamic lists and do the right thing with the list.
+	#	Finally, there are the two methods that build the dynamic lists.
+	#	The method that builds the source list will inspect the "memberDevices"
+	#	field and won't include those devices in the source list (so the user
+	#	won't be confused by seeing a device that's already in the member list
+	#	in the source list). The method that builds the member list of course
+	#	uses "memberDevices" to build the list.
+	#
+	#	One other thing that should be done probably - in the deviceStartComm
+	#	method (or the appropriate CRUD methods if you're using them instead)
+	#	you should check the IDs to make sure they're still around and if not
+	#	remove them from the device id list.
+	#
+	#	The device id list property ("memberDevices") could, of course, be
+	#	formatted in some other way besides a comma-delimited list of ids
+	#	if you need to store more information. You could, for instance, store
+	#	some kind of formatted text like JSON or XML that had much more
+	#	information.
 
-    ####################
-    # This is the method that's called by the Add Device button in the scene
-    # device config UI.
-    ####################
-    def addDevice(self, values_dict, type_id, dev_id):
-        self.logger.debug("addDevice called")
-        # just making sure that they have selected a device in the source
-        # list - it shouldn't be possible not to but it's safer
-        if "sourceDeviceMen" in values_dict:
-            # Get the device ID of the selected device
-            device_id = values_dict["sourceDeviceMen"]
-            if device_id == "":
-                return
-            # Get the list of devices that have already been added to the "scene"
-            # If the key doesn't exist then return an empty string indicating
-            # no devices have yet been added. "memberDevices" is a hidden text
-            # field in the dialog that holds a comma-delimited list of device
-            # ids, one for each of the devices in the scene.
-            selected_devices_string = values_dict.get("memberDevices", "")
-            self.logger.debug(f"adding device: {device_id} to {selected_devices_string}")
-            # If no devices have been added then just set the selected device string to
-            # the device id of the device they selected in the popup
-            if selected_devices_string == "":
-                selected_devices_string = device_id
-            # Otherwise append it to the end separated by a comma
-            else:
-                selected_devices_string += f",{device_id}"
-            # Set the device string back to the hidden text field that contains the
-            # list of device ids that are in the scene
-            values_dict["memberDevices"] = selected_devices_string
-            self.logger.debug("values_dict = " + str(values_dict))
-            # Delete the selections on both dynamic lists since we don't
-            # want to preserve those across dialog runs
-            if "memberDeviceList" in values_dict:
-                del values_dict["memberDeviceList"]
-            if "sourceDeviceMen" in values_dict:
-                del values_dict["sourceDeviceMen"]
-            # return the new dict
-            return values_dict
+	####################
+	# This is the method that's called by the Add Device button in the scene
+	# device config UI.
+	####################
+	def addDevice(self, valuesDict, typeId, devId):
+		self.debugLog(u"addDevice called")
+		# just making sure that they have selected a device in the source
+		# list - it shouldn't be possible not to but it's safer
+		if "sourceDeviceMenu" in valuesDict:
+			# Get the device ID of the selected device
+			deviceId = valuesDict["sourceDeviceMenu"]
+			if deviceId == "":
+				return
+			# Get the list of devices that have already been added to the "scene"
+			# If the key doesn't exist then return an empty string indicating
+			# no devices have yet been added. "memberDevices" is a hidden text
+			# field in the dialog that holds a comma-delimited list of device
+			# ids, one for each of the devices in the scene.
+			selectedDevicesString = valuesDict.get("memberDevices","")
+			self.debugLog(u"adding device: %s to %s" % (deviceId, selectedDevicesString))
+			# If no devices have been added then just set the selected device string to
+			# the device id of the device they selected in the popup
+			if selectedDevicesString == "":
+				selectedDevicesString = deviceId
+			# Otherwise append it to the end separated by a comma
+			else:
+				selectedDevicesString += "," + str(deviceId)
+			# Set the device string back to the hidden text field that contains the
+			# list of device ids that are in the scene
+			valuesDict["memberDevices"] = selectedDevicesString
+			self.debugLog(u"valuesDict = " + str(valuesDict))
+			# Delete the selections on both dynamic lists since we don't
+			# want to preserve those across dialog runs
+			if "memberDeviceList" in valuesDict:
+				del valuesDict["memberDeviceList"]
+			if "sourceDeviceMenu" in valuesDict:
+				del valuesDict["sourceDeviceMenu"]
+			# return the new dict
+			return valuesDict
 
-    ####################
-    # This is the method that's called by the Delete Device button in the scene
-    # device config UI.
-    ####################
-    def deleteDevices(self, values_dict, type_id, dev_id):
-        self.logger.debug("deleteDevices called")
-        if "memberDevices" in values_dict:
-            # Get the list of devices that are already in the scene
-            devices_in_scene = values_dict.get("memberDevices", "").split(",")
-            # Get the devices they've selected in the list that they want
-            # to remove
-            selected_devices = values_dict.get("memberDeviceList", [])
-            # Loop through the devices to be deleted list and remove them
-            for device_id in selected_devices:
-                self.logger.debug(f"remove device_id: {device_id}")
-                if device_id in devices_in_scene:
-                    devices_in_scene.remove(device_id)
-            # Set the "memberDevices" field back to the new list which
-            # has the devices deleted from it.
-            values_dict["memberDevices"] = ",".join(devices_in_scene)
-            # Delete the selections on both dynamic lists since we don't
-            # want to preserve those across dialog runs
-            if "memberDeviceList" in values_dict:
-                del values_dict["memberDeviceList"]
-            if "sourceDeviceMen" in values_dict:
-                del values_dict["sourceDeviceMen"]
-            return values_dict
+	####################
+	# This is the method that's called by the Delete Device button in the scene
+	# device config UI.
+	####################
+	def deleteDevices(self, valuesDict, typeId, devId):
+		self.debugLog(u"deleteDevices called")
+		if "memberDevices" in valuesDict:
+			# Get the list of devices that are already in the scene
+			devicesInScene = valuesDict.get("memberDevices","").split(",")
+			# Get the devices they've selected in the list that they want
+			# to remove
+			selectedDevices = valuesDict.get("memberDeviceList", [])
+			# Loop through the devices to be deleted list and remove them
+			for deviceId in selectedDevices:
+				self.debugLog(u"remove deviceId: " + deviceId)
+				if deviceId in devicesInScene:
+					devicesInScene.remove(deviceId)
+			# Set the "memberDevices" field back to the new list which
+			# has the devices deleted from it.
+			valuesDict["memberDevices"] = ",".join(devicesInScene)
+			# Delete the selections on both dynamic lists since we don't
+			# want to preserve those across dialog runs
+			if "memberDeviceList" in valuesDict:
+				del valuesDict["memberDeviceList"]
+			if "sourceDeviceMenu" in valuesDict:
+				del valuesDict["sourceDeviceMenu"]
+			return valuesDict
 
-    ####################
-    # This is the method that's called to build the source device list. Note
-    # that values_dict is read-only so any changes you make to it will be discarded.
-    ####################
-    def sourceDevices(self, filter_str="", values_dict=None, type_id="", target_id=0):
-        self.logger.debug(f"sourceDevices called with filter: {filter_str}  type_id: {type_id}  target_id: {target_id}")
-        return_list = list()
-        # if values_dict doesn't exist yet - if this is a brand new device
-        # then we just create an empty dict so the rest of the logic will
-        # work correctly. Many other ways to skin that particular cat.
-        if not values_dict:
-            values_dict = {}
-        # Get the member device id list, loop over all devices, and if the device
-        # id isn't in the member list then include it in the source list.
-        device_list = values_dict.get("memberDevices", "").split(",")
-        for dev_id in indigo.devices.keys():
-            if str(dev_id) not in device_list:
-                return_list.append((str(dev_id), indigo.devices.get(dev_id).name))
-        return return_list
+	####################
+	# This is the method that's called to build the source device list. Note
+	# that valuesDict is read-only so any changes you make to it will be discarded.
+	####################
+	def sourceDevices(self, filter="", valuesDict=None, typeId="", targetId=0):
+		self.debugLog(u"sourceDevices called with filter: %s  typeId: %s  targetId: %s" % (filter, typeId, str(targetId)))
+		returnList = list()
+		# if valuesDict doesn't exist yet - if this is a brand new device
+		# then we just create an empty dict so the rest of the logic will
+		# work correctly. Many other ways to skin that particular cat.
+		if not valuesDict:
+			valuesDict = {}
+		# Get the member device id list, loop over all devices, and if the device
+		# id isn't in the member list then include it in the source list.
+		deviceList = valuesDict.get("memberDevices","").split(",")
+		for devId in indigo.devices.iterkeys():
+			if str(devId) not in deviceList:
+				returnList.append((str(devId),indigo.devices.get(devId).name))
+		return returnList
 
-    ####################
-    # This is the method that's called to build the member device list. Note
-    # that values_dict is read-only so any changes you make to it will be discarded.
-    ####################
-    def memberDevices(self, filter_str="", values_dict=None, type_id="", target_id=0):
-        self.logger.debug(f"memberDevices called with filter: {filter_str}  type_id: {type_id}  target_id: {target_id}")
-        return_list = list()
-        # values_dict may be empty or None if it's a brand new device
-        if values_dict and "memberDevices" in values_dict:
-            # Get the list of devices
-            deviceListString = values_dict["memberDevices"]
-            self.logger.debug("memberDeviceString: " + deviceListString)
-            device_list = deviceListString.split(",")
-            # Iterate over the list and if the device exists (it could have been
-            # deleted) then add it to the list.
-            for dev_id in device_list:
-                if int(dev_id) in indigo.devices:
-                    return_list.append((dev_id, indigo.devices[int(dev_id)].name))
-        return return_list
+	####################
+	# This is the method that's called to build the member device list. Note
+	# that valuesDict is read-only so any changes you make to it will be discarded.
+	####################
+	def memberDevices(self, filter="", valuesDict=None, typeId="", targetId=0):
+		self.debugLog(u"memberDevices called with filter: %s  typeId: %s  targetId: %s" % (filter, typeId, str(targetId)))
+		returnList = list()
+		# valuesDict may be empty or None if it's a brand new device
+		if valuesDict and "memberDevices" in valuesDict:
+			# Get the list of devices
+			deviceListString = valuesDict["memberDevices"]
+			self.debugLog(u"memberDeviceString: " + deviceListString)
+			deviceList = deviceListString.split(",")
+			# Iterate over the list and if the device exists (it could have been
+			# deleted) then add it to the list.
+			for devId in deviceList:
+				if int(devId) in indigo.devices:
+					returnList.append((devId, indigo.devices[int(devId)].name))
+		return returnList
 
-    ########################################
-    def validateDeviceConfigUi(self, values_dict, type_id, dev_id):
-        # If the type_id is "scene", we want to clear the selections on both
-        # dynamic lists so that they're not stored since we really don't
-        # care about those.
-        self.logger.debug(f"validateDeviceConfigUi: type_id: {type_id}  devId: {dev_id}")
-        if type_id == "scene":
-            if "memberDeviceList" in values_dict:
-                values_dict["memberDeviceList"] = ""
-            if "sourceDeviceMen" in values_dict:
-                values_dict["sourceDeviceMen"] = ""
-        return (True, values_dict)
+	########################################
+	def validateDeviceConfigUi(self, valuesDict, typeId, devId):
+		# If the typeId is "scene", we want to clear the selections on both
+		# dynamic lists so that they're not stored since we really don't
+		# care about those.
+		self.debugLog(u"validateDeviceConfigUi: typeId: %s  devId: %s" % (typeId, str(devId)))
+		if typeId == "scene":
+			if "memberDeviceList" in valuesDict:
+				valuesDict["memberDeviceList"] = ""
+			if "sourceDeviceMenu" in valuesDict:
+				valuesDict["sourceDeviceMenu"] = ""
+		return (True, valuesDict)
 
-    ########################################
-    # Plugin Actions object callbacks (action is an Indigo plugin action instance)
-    ######################
-    def reset_hardware(self, action):
-        self.logger.debug("reset_hardware action called:\n" + str(action))
+	########################################
+	# Plugin Actions object callbacks (pluginAction is an Indigo plugin action instance)
+	######################
+	def resetHardware(self, pluginAction):
+		self.debugLog(u"resetHardware action called:\n" + str(pluginAction))
 
-    def update_hardware_firmware(self, action):
-        self.logger.debug("update_hardware_firmware action called:\n" + str(action))
+	def updateHardwareFirmware(self, pluginAction):
+		self.debugLog(u"updateHardwareFirmware action called:\n" + str(pluginAction))