[zb4osgi-changeset] [scm] ZigBee 4 OSGi repository change: r532 - 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/general/ zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/ zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/scenes/
scm-notify at zb4osgi.aaloa.org
scm-notify at zb4osgi.aaloa.org
Fri Oct 19 17:19:16 CEST 2012
Author: stefano.lenzi
Date: Fri Oct 19 17:19:16 2012
New Revision: 532
Log:
Added parameter GroupName to the AddGroup command of the Groups cluster ( refs #133 )
Updated Scenes interface and implementaion in ZigBee Home Automation Driver to reflect the updated of ZigBee Cluster Library ( refs #135 )
Modified:
projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Groups.java
projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Scenes.java
projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/GroupsImpl.java
projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ScenesImpl.java
projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/Groups.java
projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/GroupsCluster.java
projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/AddGroupCommand.java
projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/scenes/RemoveAllScenesCommand.java
Modified: projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Groups.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Groups.java (original)
+++ projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Groups.java Fri Oct 19 17:19:16 2012
@@ -39,7 +39,7 @@
*/
public interface Groups extends Cluster{
- public AddGroupResponse addGroup(int groupId) throws ZigBeeHAException;
+ public AddGroupResponse addGroup(int groupId,String name) throws ZigBeeHAException;
public void addGroupIfIdentifying(int groupId, String name) throws ZigBeeHAException;
Modified: projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Scenes.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Scenes.java (original)
+++ projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Scenes.java Fri Oct 19 17:19:16 2012
@@ -47,7 +47,7 @@
public void recallScene(int groupId, short sceneId) throws ZigBeeHAException;
- public RemoveAllScenesResponse removeAllScene() throws ZigBeeHAException;
+ public RemoveAllScenesResponse removeAllScene(int groupId) throws ZigBeeHAException;
public RemoveSceneResponse removeScene(int groupId, short sceneId) throws ZigBeeHAException;
Modified: projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/GroupsImpl.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/GroupsImpl.java (original)
+++ projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/GroupsImpl.java Fri Oct 19 17:19:16 2012
@@ -54,9 +54,9 @@
nameSupport = groupCluster.getAttributeNameSupport();
}
- public AddGroupResponse addGroup(int groupId) throws ZigBeeHAException{
+ public AddGroupResponse addGroup(int groupId, String name) throws ZigBeeHAException{
try {
- AddGroupResponse response = (AddGroupResponse)groupCluster.addGroup(groupId);
+ AddGroupResponse response = (AddGroupResponse)groupCluster.addGroup(groupId, name);
return response;
} catch (ZigBeeClusterException e) {
throw new ZigBeeHAException(e);
Modified: projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ScenesImpl.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ScenesImpl.java (original)
+++ projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ScenesImpl.java Fri Oct 19 17:19:16 2012
@@ -116,9 +116,9 @@
}
- public RemoveAllScenesResponse removeAllScene() throws ZigBeeHAException{
+ public RemoveAllScenesResponse removeAllScene(int groupId) throws ZigBeeHAException{
try {
- RemoveAllScenesResponse response = (RemoveAllScenesResponse)scenesCluster.removeAllScenes();
+ RemoveAllScenesResponse response = (RemoveAllScenesResponse)scenesCluster.removeAllScenes(groupId);
return response;
} catch (ZigBeeClusterException e) {
throw new ZigBeeHAException(e);
Modified: projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/Groups.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/Groups.java (original)
+++ projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/Groups.java Fri Oct 19 17:19:16 2012
@@ -53,7 +53,7 @@
public Attribute getAttributeNameSupport();
- public Response addGroup(int groupId) throws ZigBeeClusterException;
+ public Response addGroup(int groupId, String name) throws ZigBeeClusterException;
public Response viewGroup(int groupId) throws ZigBeeClusterException;
public Response getGroupMembership(int[] groupList) throws ZigBeeClusterException;
public Response removeGroup(int groupId) throws ZigBeeClusterException;
Modified: projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/GroupsCluster.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/GroupsCluster.java (original)
+++ projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/GroupsCluster.java Fri Oct 19 17:19:16 2012
@@ -82,8 +82,8 @@
return attributes;
}
- public Response addGroup(int groupId) throws ZigBeeClusterException{
- AddGroupCommand addGroupCmd = new AddGroupCommand(groupId);
+ public Response addGroup(int groupId, String name) throws ZigBeeClusterException{
+ AddGroupCommand addGroupCmd = new AddGroupCommand(groupId, name);
Response response = invoke(addGroupCmd);
return new AddGroupResponseImpl(response);
}
Modified: projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/AddGroupCommand.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/AddGroupCommand.java (original)
+++ projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/AddGroupCommand.java Fri Oct 19 17:19:16 2012
@@ -25,7 +25,9 @@
import it.cnr.isti.zigbee.zcl.library.api.core.ZBSerializer;
import it.cnr.isti.zigbee.zcl.library.api.general.Groups;
import it.cnr.isti.zigbee.zcl.library.impl.core.AbstractCommand;
+import it.cnr.isti.zigbee.zcl.library.impl.core.ByteArrayOutputStreamSerializer;
import it.cnr.isti.zigbee.zcl.library.impl.core.DefaultSerializer;
+import it.cnr.isti.zigbee.zcl.library.impl.core.ZigBeeType;
/**
@@ -38,17 +40,20 @@
public class AddGroupCommand extends AbstractCommand {
private int groupId;
+ private String name;
- public AddGroupCommand(int groupId){
+ public AddGroupCommand(int groupId, String name){
super(Groups.ADD_GROUP_ID);
this.groupId = groupId;
+ this.name = name;
}
public byte[] getPayload(){
if( payload == null){
- payload = new byte[2];
- ZBSerializer serializer = new DefaultSerializer(payload,0);
+ ZBSerializer serializer = new ByteArrayOutputStreamSerializer();
serializer.append_short((short)groupId);
+ serializer.appendZigBeeType(name, ZigBeeType.CharacterString);
+ payload = serializer.getPayload();
}
return payload;
}
Modified: projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/scenes/RemoveAllScenesCommand.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/scenes/RemoveAllScenesCommand.java (original)
+++ projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/scenes/RemoveAllScenesCommand.java Fri Oct 19 17:19:16 2012
@@ -43,7 +43,6 @@
public byte[] getPayload(){
if( payload == null){
- payload = new byte[3];
ZBSerializer serializer = new ByteArrayOutputStreamSerializer();
serializer.append_short((short)groupId);
payload = serializer.getPayload();
More information about the Commit
mailing list