Remove unused code from RGB/RGBW Adapters

Author: stas-demydiuk

adapters/rgbw_adapter.py

@@ -3,6 +3,7 @@
 from adapters.base_adapter import Adapter
 from devices.color_colortemp_light import RGBWLight
 
+
 class RGBWAdapter(Adapter):
     def __init__(self, devices):
         super().__init__(devices)
@@ -11,7 +12,6 @@ def __init__(self, devices):
         self.devices.append(self.dimmer)
 
     def handleCommand(self, alias, device, device_data, command, level, color):
-        
         cmd = command.upper()
 
         if cmd == 'ON' or cmd == 'OFF':
@@ -39,15 +39,15 @@ def handleCommand(self, alias, device, device_data, command, level, color):
             color_temp = colorObject['t']
             cwww = colorObject['cw'] + colorObject['ww']
             ttime = 1
-            
-            #only use cwww to determine mode
+
+            # only use cwww to determine mode
             if cwww == 0:
                 payload = json.dumps({
                     "state": "ON",
-              # Disabled the transition time for now because hue bulb/zigbee2mqtt will
-              # publish (acknowledge) the new color value during the transition with
-              # a value between start and end of the transition, not the actual target color
-              #      "transition" : ttime,
+                    # Disabled the transition time for now because hue bulb/zigbee2mqtt will
+                    # publish (acknowledge) the new color value during the transition with
+                    # a value between start and end of the transition, not the actual target color
+                    #      "transition" : ttime,
                     "brightness": int(level * 255 / 100),
                     "color": {
                         "r": red,
@@ -58,7 +58,7 @@ def handleCommand(self, alias, device, device_data, command, level, color):
             else:
                 payload = json.dumps({
                     "state": "ON",
-               #     "transition" : ttime,
+                    #     "transition" : ttime,
                     "color_temp": int((color_temp / 255 * 346) + 154),
                     "brightness": int(level * 255 / 100)
                 })

devices/base_colortemp_light.py

@@ -7,9 +7,6 @@ class BaseRGBWLight(Device):
     #The specific device classes need to creat specific Domoticz devices and can create/override specific logics
     """base device class for a color controllable rgbw light bulb"""
 
-    def __init__(self, devices, alias, value_keys):
-        super().__init__(devices, alias, value_keys)
-
     def get_color_value(self, message, mode):
         if mode == 1: #mode 1 us XY from zigbee
             if 'brightness' in message.raw:

devices/color_colortemp_light.py

@@ -2,11 +2,7 @@
 import Domoticz
 from devices.base_colortemp_light import BaseRGBWLight
 
-class RGBWLight(BaseRGBWLight):
-    """device class for a color controllable rgbw light bulb"""
-
-    def __init__(self, devices, alias, value_keys):
-        super().__init__(devices, alias, value_keys)
 
+class RGBWLight(BaseRGBWLight):
     def create_device(self, unit, device_id, device_name):
         return Domoticz.Device(Unit=unit, DeviceID=device_id, Name=device_name, Type=241, Subtype=4, Switchtype=7).Create()

devices/color_light.py

@@ -2,12 +2,7 @@
 import Domoticz
 from devices.base_colortemp_light import BaseRGBWLight
 
-class ColorLight(BaseRGBWLight):
-    """device class for a color controllable light bulb"""
-
-    def __init__(self, devices, alias, value_keys):
-        super().__init__(devices, alias, value_keys)
-        self.value_keys = value_keys.split('_') #list of capabilities as returned form MQTT, separated by '_'
 
+class ColorLight(BaseRGBWLight):
     def create_device(self, unit, device_id, device_name):
         return Domoticz.Device(Unit=unit, DeviceID=device_id, Name=device_name, Type=241, Subtype=1, Switchtype=7).Create()