[zb4osgi-changeset] [scm] ZigBee 4 OSGi repository change: r472 - /projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/

[scm-notify at zb4osgi.aaloa.org]

Author: manlio.bacco
Date: Mon Sep 24 17:46:48 2012
New Revision: 472

Log:
new clusters
minor fixes

Modified:
    projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/IASZoneImpl.java
    projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/IdentifyImpl.java
    projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/OccupacySensingImpl.java
    projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/RelativeHumidityMeasurementImpl.java

Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/IASZoneImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/IASZoneImpl.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/IASZoneImpl.java Mon Sep 24 17:46:48 2012
@@ -76,7 +76,7 @@
 		return iasCIEaddress;
 	}
 
-	public ZoneEnrollResponse ZoneEnrollRequest(byte zoneType, byte manufacturerCode) throws ZigBeeHAException {
+	public ZoneEnrollResponse zoneEnrollRequest(short zoneType,	int manufacturerCode) throws ZigBeeHAException {
 
 		try {
 			ZoneEnrollResponse response = (ZoneEnrollResponse) cluster.ZoneEnrollRequest(zoneType, manufacturerCode);

Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/IdentifyImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/IdentifyImpl.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/IdentifyImpl.java Mon Sep 24 17:46:48 2012
@@ -44,12 +44,10 @@
 public class IdentifyImpl implements Identify {
 	
 	private IdentifyCluster identifyCluster;
-	private Attribute identifyTime;
-	
+	private Attribute identifyTime;	
 	
 	public IdentifyImpl(ZigBeeDevice zbDevice){
-		identifyCluster = new IdentifyCluster(zbDevice);
-		
+		identifyCluster = new IdentifyCluster(zbDevice);		
 	}
 
 	public int IdentifyQuery() throws ZigBeeHAException{

Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/OccupacySensingImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/OccupacySensingImpl.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/OccupacySensingImpl.java Mon Sep 24 17:46:48 2012
@@ -55,12 +55,14 @@
 	public OccupacySensingImpl(ZigBeeDevice zbDevice){		
 		
 		occupacySensingCluster = new OccupacySensingCluster(zbDevice);
+		
 		occupancy = occupacySensingCluster.getAttributeOccupancy();
 		occupancySensorType = occupacySensingCluster.getAttributeOccupancySensorType();
 		pirOccupiedToUnoccupiedDelay = occupacySensingCluster.getAttributePIROccupiedToUnoccupiedDelay();
 		pirUnoccupiedToOccupiedDelay = occupacySensingCluster.getAttributePIRUnoccupiedToOccupiedDelay();
 		ultraSonicOccupiedToUnoccupiedDelay = occupacySensingCluster.getAttributeUltraSonicOccupiedToUnoccupiedDelay();
 		ultraSonicUnoccupiedToOccupiedDelay = occupacySensingCluster.getAttributeUltraSonicUnoccupiedToOccupiedDelay();
+		
 		eventBridge = new OccupancyBridgeListeners(Activator.getConfiguration(), occupancy, this);		
 	}
 
@@ -119,6 +121,5 @@
 
 	public Attribute[] getAttributes() {
 		return occupacySensingCluster.getAvailableAttributes();
-	}
-	
-}
+	}	
+}

Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/RelativeHumidityMeasurementImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/RelativeHumidityMeasurementImpl.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/RelativeHumidityMeasurementImpl.java Mon Sep 24 17:46:48 2012
@@ -120,6 +120,5 @@
 
 	public boolean unsubscribe(ToleranceListener listener) {
 		return toleranceBridge.unsubscribe(listener);
-	}
-	
-}
+	}	
+}