[zb4osgi-changeset] [scm] ZigBee 4 OSGi repository change: r519 - 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
scm-notify at zb4osgi.aaloa.org
Thu Oct 18 13:09:02 CEST 2012
Author: stefano.lenzi
Date: Thu Oct 18 13:09:02 2012
New Revision: 519
Log:
Fixed typo of DateCode attribute of Basic cluster ( fixes #129 )
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 Thu Oct 18 13:09:02 2012
@@ -41,7 +41,7 @@
public Attribute getHWVersion();
public Attribute getManufacturerName();
public Attribute getModelIdentifier();
- public Attribute getDataCode();
+ public Attribute getDateCode();
public Attribute getPowerSource();
public String getLocationDescription() throws ZigBeeHAException;
public Attribute getPhysicalEnviroment();
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 Thu Oct 18 13:09:02 2012
@@ -49,7 +49,7 @@
private Attribute hwVersion;
private Attribute manufacturerName;
private Attribute modelIdentifier;
- private Attribute dataCode;
+ private Attribute dateCode;
private Attribute powerSource;
private Attribute locationDescription;
private Attribute physicalEnviroment;
@@ -64,7 +64,7 @@
hwVersion = basicCluster.getAttributeHWVersion();
manufacturerName = basicCluster.getAttributeManufacturerName();
modelIdentifier = basicCluster.getAttributeModelIdentifier();
- dataCode = basicCluster.getAttributeDataCode();
+ dateCode = basicCluster.getAttributeDateCode();
powerSource = basicCluster.getPowerSource();
locationDescription = basicCluster.getAttributeLocationDescription();
physicalEnviroment = basicCluster.getAttributePhysicalEnviroment();
@@ -80,8 +80,8 @@
return applicationVersion;
}
- public Attribute getDataCode() {
- return dataCode;
+ public Attribute getDateCode() {
+ return dateCode;
}
public boolean getDeviceEnabled() throws ZigBeeHAException{
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 Thu Oct 18 13:09:02 2012
@@ -52,7 +52,7 @@
public Attribute getAttributeHWVersion();
public Attribute getAttributeManufacturerName();
public Attribute getAttributeModelIdentifier();
- public Attribute getAttributeDataCode();
+ public Attribute getAttributeDateCode();
public Attribute getPowerSource();
public Attribute getAttributeLocationDescription();
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 Thu Oct 18 13:09:02 2012
@@ -89,9 +89,9 @@
.setZigBeeType(ZigBeeType.CharacterString)
.setWritable(false);
- final static public AttributeDescriptor DATA_CODE = new AbstractAttribute()
+ final static public AttributeDescriptor DATE_CODE = new AbstractAttribute()
.setId(0x0006)
- .setName("DataCode")
+ .setName("DateCode")
.setReportable(false)
.setType(String.class)
.setZigBeeType(ZigBeeType.CharacterString)
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 Thu Oct 18 13:09:02 2012
@@ -50,7 +50,7 @@
private final AttributeImpl hwVersion;
private final AttributeImpl manufacturerName;
private final AttributeImpl modelIdentifier;
- private final AttributeImpl dataCode;
+ private final AttributeImpl dateCode;
private final AttributeImpl powerSource;
private final AttributeImpl locationDescription;
@@ -68,14 +68,14 @@
hwVersion = new AttributeImpl(zbDevice,this,Attributes.HW_VERSION);
manufacturerName = new AttributeImpl(zbDevice,this,Attributes.MANUFACTURER_NAME);
modelIdentifier = new AttributeImpl(zbDevice,this,Attributes.MODEL_IDENTIFIER);
- dataCode = new AttributeImpl(zbDevice,this,Attributes.DATA_CODE);
+ dateCode = new AttributeImpl(zbDevice,this,Attributes.DATE_CODE);
powerSource = new AttributeImpl(zbDevice,this,Attributes.POWER_SOURCE);
locationDescription = new AttributeImpl(zbDevice,this,Attributes.LOCATION_DESCRIPTION);
physicalEnviroment = new AttributeImpl(zbDevice,this,Attributes.PHISICAL_ENVIROMENT);
deviceEnabled = new AttributeImpl(zbDevice,this,Attributes.DEVICE_ENABLED);
alarmMask = new AttributeImpl(zbDevice,this,Attributes.ALARM_MASK);
attributes = new AttributeImpl[]{zclVersion, applicationVersion, stackVersion,
- hwVersion, manufacturerName, modelIdentifier, dataCode, powerSource,
+ hwVersion, manufacturerName, modelIdentifier, dateCode, powerSource,
locationDescription, physicalEnviroment, deviceEnabled, alarmMask};
}
@@ -108,8 +108,8 @@
return alarmMask;
}
- public Attribute getAttributeDataCode() {
- return dataCode;
+ public Attribute getAttributeDateCode() {
+ return dateCode;
}
public Attribute getAttributeDeviceEnabled() {
More information about the Commit
mailing list