[zb4osgi-changeset] [scm] ZigBee 4 OSGi repository change: r490 - /projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_zone/

[scm-notify at zb4osgi.aaloa.org]

Author: manlio.bacco
Date: Mon Sep 24 18:00:12 2012
New Revision: 490

Log:
IAS Zone commands

Added:
    projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_zone/ZoneStatusChangeNotificationCommand.java   (with props)
    projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_zone/ZoneStatusNotificationChangeResponseImpl.java   (with props)
Modified:
    projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_zone/ZoneEnrollCommand.java
    projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_zone/ZoneEnrollResponseImpl.java

Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_zone/ZoneEnrollCommand.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_zone/ZoneEnrollCommand.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_zone/ZoneEnrollCommand.java Mon Sep 24 18:00:12 2012
@@ -7,10 +7,10 @@
 
 public class ZoneEnrollCommand extends AbstractCommand {
 
-	private byte zoneType;
-	private byte manufacterCode;
+	private short zoneType;
+	private int manufacterCode;
 
-	public ZoneEnrollCommand(byte zoneType, byte manufacturerCode) {
+	public ZoneEnrollCommand(short zoneType, int manufacturerCode) {
 
 		super(IASZone.ZONE_ENROLL_REQUEST);
 		this.zoneType = zoneType;
@@ -18,12 +18,14 @@
 	}
 
 	public byte[] getPayload(){	
-		if( payload == null){			
-			payload = new byte[3];
+		if( payload == null){		
+			int length = Short.SIZE + Integer.SIZE;
+			payload = new byte[length];
 			ZBSerializer serializer = new DefaultSerializer(payload,0);
 			serializer.append_byte((byte)zoneType);
-			serializer.append_byte((byte)manufacterCode);
+			serializer.append_short((short)manufacterCode);
 		}
+
 		return payload;
 	}
 }

Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_zone/ZoneEnrollResponseImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_zone/ZoneEnrollResponseImpl.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_zone/ZoneEnrollResponseImpl.java Mon Sep 24 18:00:12 2012
@@ -9,7 +9,7 @@
 
 public class ZoneEnrollResponseImpl extends ResponseImpl implements ZoneEnrollResponse {
 
-	private int enrollResponseCode;
+	private byte enrollResponseCode;
 	private int zoneID;
 
 	public ZoneEnrollResponseImpl(Response response) throws ZigBeeClusterException {
@@ -19,10 +19,10 @@
 		ResponseImpl.checkGeneralCommandFrame(response, ZoneEnrollResponse.ID);
 		ZBDeserializer deserializer = new DefaultDeserializer(getPayload(), 0);
 		enrollResponseCode = deserializer.read_byte();
-		zoneID = deserializer.read_byte();
+		zoneID = deserializer.read_int();
 	}
 
-	public int getEnrollResponseCode() {
+	public byte getEnrollResponseCode() {
 
 		return enrollResponseCode;
 	}

Added: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_zone/ZoneStatusChangeNotificationCommand.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_zone/ZoneStatusChangeNotificationCommand.java (added)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_zone/ZoneStatusChangeNotificationCommand.java Mon Sep 24 18:00:12 2012
@@ -1,0 +1,30 @@
+package it.cnr.isti.zigbee.zcl.library.impl.security_safety.ias_zone;
+
+import it.cnr.isti.zigbee.zcl.library.api.core.ZBSerializer;
+import it.cnr.isti.zigbee.zcl.library.api.security_safety.IASZone;
+import it.cnr.isti.zigbee.zcl.library.impl.core.AbstractCommand;
+import it.cnr.isti.zigbee.zcl.library.impl.core.DefaultSerializer;
+
+public class ZoneStatusChangeNotificationCommand extends AbstractCommand {
+
+	private short zoneStatus;
+	private byte extendedStatus;
+
+	public ZoneStatusChangeNotificationCommand(short zoneStatus, byte extendedStatus){
+
+		super(IASZone.ZONE_STATUS_CHANGE_NOTIFICATION);
+		this.zoneStatus = zoneStatus;
+		this.extendedStatus = extendedStatus;
+	}
+
+	public byte[] getPayload(){	
+		if( payload == null){			
+			payload = new byte[3];
+			ZBSerializer serializer = new DefaultSerializer(payload,0);
+			serializer.append_short(zoneStatus);
+			serializer.append_byte(extendedStatus);
+		}
+
+		return payload;
+	}
+}

Propchange: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_zone/ZoneStatusChangeNotificationCommand.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_zone/ZoneStatusNotificationChangeResponseImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_zone/ZoneStatusNotificationChangeResponseImpl.java (added)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_zone/ZoneStatusNotificationChangeResponseImpl.java Mon Sep 24 18:00:12 2012
@@ -1,0 +1,5 @@
+package it.cnr.isti.zigbee.zcl.library.impl.security_safety.ias_zone;
+
+public class ZoneStatusNotificationChangeResponseImpl {
+
+}

Propchange: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/security_safety/ias_zone/ZoneStatusNotificationChangeResponseImpl.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain