[zb4osgi-changeset] [scm] ZigBee 4 OSGi repository change: r553 - in /projects/zb4osgi/trunk: zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/ zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/ zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/attribute/ zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/

[scm-notify at zb4osgi.aaloa.org]

Author: stefano.lenzi
Date: Mon Oct 22 16:31:59 2012
New Revision: 553

Log:
Updated Basic cluster with the new attribute DisableLocalConfig 


Modified:
    projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Basic.java
    projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/BasicImpl.java
    projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/Basic.java
    projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/attribute/Attributes.java
    projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/BasicCluster.java

Modified: projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Basic.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Basic.java (original)
+++ projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Basic.java Mon Oct 22 16:31:59 2012
@@ -47,6 +47,10 @@
 	public Attribute getPhysicalEnvironment();
 	public boolean getDeviceEnabled() throws ZigBeeHAException;
 	public Attribute getAlarmMask();
+	/**
+	 * @since 0.7.0
+	 */
+	public Attribute getDisableLocalConfig();
 	
 	public void resetToFactoryDefault() throws ZigBeeHAException;
 

Modified: projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/BasicImpl.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/BasicImpl.java (original)
+++ projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/BasicImpl.java Mon Oct 22 16:31:59 2012
@@ -55,6 +55,7 @@
 	private Attribute physicalEnviroment;
 	private Attribute deviceEnabled;
 	private Attribute alarmMask;
+	private Attribute disableLocalConfig;
 	
 	public BasicImpl(ZigBeeDevice zbDevice){
 		basicCluster = new BasicCluster(zbDevice);
@@ -70,8 +71,13 @@
 		physicalEnviroment = basicCluster.getAttributePhysicalEnvironment();
 		deviceEnabled = basicCluster.getAttributeDeviceEnabled();
 		alarmMask = basicCluster.getAttributeAlarmMask();
+		disableLocalConfig = basicCluster.getAttributeDisableLocalConfig();
 	}
 
+	public Attribute getDisableLocalConfig() {
+		return disableLocalConfig;
+	}
+	
 	public Attribute getAlarmMask() {
 		return alarmMask;
 	}

Modified: projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/Basic.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/Basic.java (original)
+++ projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/Basic.java Mon Oct 22 16:31:59 2012
@@ -59,6 +59,12 @@
 	public Attribute getAttributePhysicalEnvironment();
 	public Attribute getAttributeDeviceEnabled();
 	public Attribute getAttributeAlarmMask();
+
+	/**
+	 * 
+	 * @since 0.7.1
+	 */
+	public Attribute getAttributeDisableLocalConfig();
 	
 		
 	

Modified: projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/attribute/Attributes.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/attribute/Attributes.java (original)
+++ projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/attribute/Attributes.java Mon Oct 22 16:31:59 2012
@@ -136,6 +136,15 @@
 	.setZigBeeType(ZigBeeType.Bitmap8bit)
 	.setWritable(true);
 	
+	final static public   AttributeDescriptor DISABLE_LOCAL_CONFIG = new AbstractAttribute()
+	.setId(0x0014)
+	.setName("DisableLocalConfig")
+	.setReportable(false)
+	.setType(ZigBeeType.Bitmap8bit.getJavaClass())
+	.setZigBeeType(ZigBeeType.Bitmap8bit)
+	.setWritable(true);
+
+	
 	final static public   AttributeDescriptor IDENTIFY_TIME = new AbstractAttribute()
 	.setId(0x0000)
 	.setName("IdentifyTime")

Modified: projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/BasicCluster.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/BasicCluster.java (original)
+++ projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/BasicCluster.java Mon Oct 22 16:31:59 2012
@@ -56,6 +56,7 @@
 	private final AttributeImpl physicalEnvironment;
 	private final AttributeImpl deviceEnabled;
 	private final AttributeImpl alarmMask;
+	private final AttributeImpl disableLocalConfig;
 	
 	private final Attribute[] attributes;
 	
@@ -73,9 +74,10 @@
 		physicalEnvironment = new AttributeImpl(zbDevice,this,Attributes.PHYSICAL_ENVIRONMENT);
 		deviceEnabled = new AttributeImpl(zbDevice,this,Attributes.DEVICE_ENABLED);
 		alarmMask = new AttributeImpl(zbDevice,this,Attributes.ALARM_MASK);
+		disableLocalConfig = new AttributeImpl(zbDevice,this,Attributes.DISABLE_LOCAL_CONFIG);
 		attributes = new AttributeImpl[]{zclVersion, applicationVersion, stackVersion,
 				hwVersion, manufacturerName, modelIdentifier, dateCode, powerSource,
-				locationDescription, physicalEnvironment, deviceEnabled, alarmMask};
+				locationDescription, physicalEnvironment, deviceEnabled, alarmMask, disableLocalConfig};
 	}
 	
 	private static EmptyPayloadCommand CMD_RESET_TO_FACTORY_DEFAULT = new EmptyPayloadCommand()
@@ -147,6 +149,10 @@
 		return powerSource;
 	}
 
+	public Attribute getAttributeDisableLocalConfig() {
+		return disableLocalConfig;
+	}
+	
 	public DefaultResponse resetToFactoryDefault() throws ZigBeeClusterException{
 		enableDefaultResponse();
 		Response response = invoke(CMD_RESET_TO_FACTORY_DEFAULT);