[zb4osgi-changeset] [scm] ZigBee 4 OSGi repository change: r609 - in /projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general: alarms/ groups/ level_control/

[scm-notify at zb4osgi.aaloa.org]

Author: stefano.lenzi
Date: Sat Jan 26 15:30:42 2013
New Revision: 609

Log:
Reverted to the last valid version before the merge which delete all the bug fixes ( refs #174 )


Modified:
    projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/alarms/ResetAlarmCommand.java
    projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/AddGroupIfIdentyfingCommand.java
    projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/GetGroupMembershipCommand.java
    projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/level_control/StepCommand.java

Modified: projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/alarms/ResetAlarmCommand.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/alarms/ResetAlarmCommand.java (original)
+++ projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/alarms/ResetAlarmCommand.java Sat Jan 26 15:30:42 2013
@@ -22,10 +22,9 @@
 
 package it.cnr.isti.zigbee.zcl.library.impl.general.alarms;
 
-import it.cnr.isti.zigbee.zcl.library.api.core.ZBSerializer;
 import it.cnr.isti.zigbee.zcl.library.api.general.Alarms;
 import it.cnr.isti.zigbee.zcl.library.impl.core.AbstractCommand;
-import it.cnr.isti.zigbee.zcl.library.impl.core.DefaultSerializer;
+import it.cnr.isti.zigbee.zcl.library.impl.core.ByteArrayOutputStreamSerializer;
 /**
  * 
  * @author <a href="mailto:stefano.lenzi at isti.cnr.it">Stefano "Kismet" Lenzi</a>
@@ -46,10 +45,10 @@
 	
 	public byte[] getPayload(){	
 		if( payload == null){			
-			payload = new byte[2];
-			ZBSerializer serializer = new DefaultSerializer(payload,0);
+			ByteArrayOutputStreamSerializer serializer = new ByteArrayOutputStreamSerializer();
 			serializer.append_byte(clusterId);		
 			serializer.append_short(attributeId);		
+			payload = serializer.getPayload();
 		}
 		return payload;
 	}    

Modified: projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/AddGroupIfIdentyfingCommand.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/AddGroupIfIdentyfingCommand.java (original)
+++ projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/AddGroupIfIdentyfingCommand.java Sat Jan 26 15:30:42 2013
@@ -25,7 +25,11 @@
 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.DefaultSerializer;
+import it.cnr.isti.zigbee.zcl.library.impl.core.ByteArrayOutputStreamSerializer;
+import it.cnr.isti.zigbee.zcl.library.impl.core.ZigBeeType;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 /**
  * 
  * @author <a href="mailto:stefano.lenzi at isti.cnr.it">Stefano "Kismet" Lenzi</a>
@@ -40,15 +44,21 @@
 	
 	public AddGroupIfIdentyfingCommand(int groupId, String name){
 		super(Groups.ADD_GROUP_IF_IDENTIFYING_ID);
+		this.groupId = groupId;
+		this.name = name;
 	}
 	
 	public byte[] getPayload(){	
 		if( payload == null){			
-			payload = new byte[2 + name.length()];
-			ZBSerializer serializer = new DefaultSerializer(payload,0);
+			ByteArrayOutputStream bos = new ByteArrayOutputStream();
+			ZBSerializer serializer = new ByteArrayOutputStreamSerializer(bos);
 			serializer.append_short((short)groupId);
-			//TODO use the serializer.appendObject(Object, ZigBeeType)
-			serializer.appendObject(name);
+			serializer.appendZigBeeType(name, ZigBeeType.CharacterString);
+			payload = serializer.getPayload();
+			try {
+				bos.close();
+			} catch (IOException ignored) {				
+			}
 		}
 		return payload;
 	}

Modified: projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/GetGroupMembershipCommand.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/GetGroupMembershipCommand.java (original)
+++ projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/GetGroupMembershipCommand.java Sat Jan 26 15:30:42 2013
@@ -44,8 +44,9 @@
 	
 	public byte[] getPayload(){	
 		if( payload == null){			
-			payload = new byte[groupList.length * 2];
+			payload = new byte[groupList.length * 2 + 1];
 			ZBSerializer serializer = new DefaultSerializer(payload,0);
+			serializer.append_byte((byte) groupList.length);
 			for (int i = 0; i < groupList.length; i++) {
 				serializer.append_short((short)groupList[i]);
 			}

Modified: projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/level_control/StepCommand.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/level_control/StepCommand.java (original)
+++ projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/level_control/StepCommand.java Sat Jan 26 15:30:42 2013
@@ -25,6 +25,7 @@
 import it.cnr.isti.zigbee.zcl.library.api.core.ZBSerializer;
 import it.cnr.isti.zigbee.zcl.library.api.general.LevelControl;
 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;
 /**
  * 
@@ -55,11 +56,11 @@
 
 	public byte[] getPayload(){	
 		if( payload == null){
-			payload = new byte[3];
-			ZBSerializer serializer = new DefaultSerializer(payload,0);
+			ByteArrayOutputStreamSerializer serializer = new ByteArrayOutputStreamSerializer();
 			serializer.append_byte((byte)mode);
 			serializer.append_byte((byte)step);
 			serializer.append_short((short)time); 
+			payload = serializer.getPayload();
 		}
 		return payload;
 	}