[zb4osgi-changeset] [scm] ZigBee 4 OSGi repository change: r620 - 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/ zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_ace/
scm-notify at zb4osgi.aaloa.org
scm-notify at zb4osgi.aaloa.org
Thu Jan 31 20:47:35 CET 2013
Author: stefano.lenzi
Date: Thu Jan 31 20:47:35 2013
New Revision: 620
Log:
Fixing type in OnOffTransitionTime ( refs #163 )
Modified:
projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/LevelControl.java
projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/LevelControlImpl.java
projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/LevelControl.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/LevelControlCluster.java
projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_ace/ArmResponseImpl.java
projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_ace/ZoneIDMapResponseImpl.java
projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_ace/ZoneInformationResponseImpl.java
Modified: projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/LevelControl.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/LevelControl.java (original)
+++ projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/LevelControl.java Thu Jan 31 20:47:35 2013
@@ -39,7 +39,7 @@
public Attribute getCurrentLevel();
public Attribute getRemainingTime();
- public Attribute getOnOffTransactionTime();
+ public Attribute getOnOffTransitionTime();
public Attribute getOnLevel();
/**
Modified: projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/LevelControlImpl.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/LevelControlImpl.java (original)
+++ projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/LevelControlImpl.java Thu Jan 31 20:47:35 2013
@@ -55,7 +55,7 @@
levelControlCluster = new LevelControlCluster(zbDevice);
currentLevel = levelControlCluster.getAttributeCurrentLevel();
remainingTime = levelControlCluster.getAttributeRemainingTime();
- onOffTransitionTime = levelControlCluster.getAttributeOnOffTransactionTime();
+ onOffTransitionTime = levelControlCluster.getAttributeOnOffTransitionTime();
onLevel = levelControlCluster.getAttributeOnLevel();
eventBridge = new CurrentLevelBridgeListeners(Activator.getConfiguration(),currentLevel, this);
}
@@ -69,7 +69,7 @@
return onLevel;
}
- public Attribute getOnOffTransactionTime() {
+ public Attribute getOnOffTransitionTime() {
return onOffTransitionTime;
}
Modified: projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/LevelControl.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/LevelControl.java (original)
+++ projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/LevelControl.java Thu Jan 31 20:47:35 2013
@@ -56,7 +56,7 @@
public Attribute getAttributeCurrentLevel();
public Attribute getAttributeRemainingTime();
- public Attribute getAttributeOnOffTransactionTime();
+ public Attribute getAttributeOnOffTransitionTime();
public Attribute getAttributeOnLevel();
public Response moveToLevel(short level, int time) throws ZigBeeClusterException;
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 Jan 31 20:47:35 2013
@@ -480,9 +480,9 @@
.setZigBeeType(ZigBeeType.UnsignedInteger16bit)
.setWritable(false);
- final static public AttributeDescriptor ON_OFF_TRANSATION_TIME = new AbstractAttribute()
+ final static public AttributeDescriptor ON_OFF_TRANSITION_TIME = new AbstractAttribute()
.setId(0x0010)
- .setName("OnOffTRansationTime")
+ .setName("OnOffTransitionTime")
.setReportable(false)
.setType(Integer.class)
.setZigBeeType(ZigBeeType.UnsignedInteger16bit)
Modified: projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/LevelControlCluster.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/LevelControlCluster.java (original)
+++ projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/LevelControlCluster.java Thu Jan 31 20:47:35 2013
@@ -71,7 +71,7 @@
super(zbDevice);
currentLevel = new AttributeImpl(zbDevice,this,Attributes.CURRENT_LEVEL);
remainingTime = new AttributeImpl(zbDevice,this,Attributes.REMAINING_TIME);
- onOffTransactionTime = new AttributeImpl(zbDevice,this,Attributes.ON_OFF_TRANSATION_TIME);
+ onOffTransactionTime = new AttributeImpl(zbDevice,this,Attributes.ON_OFF_TRANSITION_TIME);
onLevel = new AttributeImpl(zbDevice,this,Attributes.ON_LEVEL);
attributes = new AttributeImpl[]{currentLevel, remainingTime, onOffTransactionTime, onLevel};
}
@@ -99,7 +99,7 @@
return onLevel;
}
- public Attribute getAttributeOnOffTransactionTime() {
+ public Attribute getAttributeOnOffTransitionTime() {
return onOffTransactionTime;
}
Modified: projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_ace/ArmResponseImpl.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_ace/ArmResponseImpl.java (original)
+++ projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_ace/ArmResponseImpl.java Thu Jan 31 20:47:35 2013
@@ -14,7 +14,7 @@
public ArmResponseImpl(Response response) throws ZigBeeClusterException {
super(response);
- ResponseImpl.checkGeneralCommandFrame(response, ID);
+ ResponseImpl.checkSpecificCommandFrame(response, ID);
ZBDeserializer deserializer = new DefaultDeserializer(getPayload(),0);
armNotification = deserializer.read_byte();
Modified: projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_ace/ZoneIDMapResponseImpl.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_ace/ZoneIDMapResponseImpl.java (original)
+++ projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_ace/ZoneIDMapResponseImpl.java Thu Jan 31 20:47:35 2013
@@ -16,7 +16,7 @@
public ZoneIDMapResponseImpl(Response response) throws ZigBeeClusterException{
super(response);
- ResponseImpl.checkGeneralCommandFrame(response, ID);
+ ResponseImpl.checkSpecificCommandFrame(response, ID);
ZBDeserializer deserializer = new DefaultDeserializer(getPayload(),0);
Modified: projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_ace/ZoneInformationResponseImpl.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_ace/ZoneInformationResponseImpl.java (original)
+++ projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_ace/ZoneInformationResponseImpl.java Thu Jan 31 20:47:35 2013
@@ -16,7 +16,7 @@
public ZoneInformationResponseImpl(Response response) throws ZigBeeClusterException {
super(response);
- ResponseImpl.checkGeneralCommandFrame(response, ID);
+ ResponseImpl.checkSpecificCommandFrame(response, ID);
ZBDeserializer deserializer = new DefaultDeserializer(getPayload(),0);
zoneID = deserializer.read_int();
More information about the Commit
mailing list