1 files changed, 20 insertions, 7 deletions

diff --git a/client/AndroidClients/LightingController/src/com/lightingcontroller/Zigbee/ZigbeeDevice.java b/client/AndroidClients/LightingController/src/com/lightingcontroller/Zigbee/ZigbeeDevice.java
index 4ff3119..8076bca 100644..100755
--- a/client/AndroidClients/LightingController/src/com/lightingcontroller/Zigbee/ZigbeeDevice.java
+++ b/client/AndroidClients/LightingController/src/com/lightingcontroller/Zigbee/ZigbeeDevice.java
@@ -62,8 +62,6 @@ public class ZigbeeDevice {
         public boolean hasColourable = false;
         public boolean hasDimmable = false;
         public boolean hasSwitchable = false;
-        public boolean hasThermometer = false;
-        public boolean hasPowerUsage = false;
         public boolean hasOutSwitch = false;
         public boolean hasOutLeveL = false;
         public boolean hasOutColor = false;
@@ -374,22 +372,37 @@ public class ZigbeeDevice {
                         default:        Type = "Unknown Device"; Name="Unknown";        
                         }
                 }
-
-                //String notification = "New "+Type+" connected!"; 
-                //ZigbeeNotification.showNotification(notification);
+                
+                if(!_deviceName.isEmpty())
+                {
+                        Name = _deviceName;
+                }
         }
         
+        public void updateDevice(ZigbeeDevice device)
+        {       
+                Name = device.Name;
+                Type = device.Type;
+                ProfileId = device.ProfileId;
+                DeviceId = device.DeviceId;
+                NetworkAddr = device.NetworkAddr;
+                hasColourable = device.hasColourable;
+                hasDimmable = device.hasDimmable;
+                hasSwitchable = device.hasSwitchable;
+                hasOutLeveL = device.hasOutLeveL;
+                hasOutScene = device.hasOutScene;
+                hasOutGroup = device.hasOutGroup;
+        }       
+        
         public void addCluster(boolean in, int ClusterId)
         {
                 if (in)
                 {
                         switch (ClusterId)
                         {
-                        case (0x0402): hasThermometer = true;                   break;
                         case (0x0006): hasSwitchable = true;                    break;
                         case (0x0008): hasDimmable = true;                      break;
                         case (0x0300): hasColourable = true;                    break;
-                        case (0x0702): hasPowerUsage = true;                    break;
                         }
                 } else
                 {