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

[scm-notify at zb4osgi.aaloa.org]

Author: manlio.bacco
Date: Mon Sep 24 17:59:28 2012
New Revision: 488

Log:
new clusters

Modified:
    projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/measureament_sensing/OccupacySensingCluster.java
    projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/measureament_sensing/RelativeHumidityMeasurementCluster.java
    projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/measureament_sensing/TemperatureMeasurementCluster.java

Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/measureament_sensing/OccupacySensingCluster.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/measureament_sensing/OccupacySensingCluster.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/measureament_sensing/OccupacySensingCluster.java Mon Sep 24 17:59:28 2012
@@ -47,17 +47,19 @@
 	private final AttributeImpl ultraSonicOccupiedToUnoccupiedDelay;
 	private final AttributeImpl ultraSonicUnoccupiedToOccupiedDelay;
 	
-	
 	private final Attribute[] attributes;
 
 	public OccupacySensingCluster(ZigBeeDevice zbDevice){
+		
 		super(zbDevice);
+		
 		occupancy = new AttributeImpl(zbDevice,this,Attributes.OCCUPANCY);
 		occupancySensorType = new AttributeImpl(zbDevice,this,Attributes.OCCUPANCY_SENSOR_TYPE);
 		pirOccupiedToUnoccupiedDelay = new AttributeImpl(zbDevice,this,Attributes.PIR_OCCUPIED_TO_UNOCCUPIED_DELAY);
 		pirUnoccupiedToOccupiedDelay = new AttributeImpl(zbDevice,this,Attributes.PIR_UNOCCUPIED_TO_OCCUPIED_DELAY);
 		ultraSonicOccupiedToUnoccupiedDelay = new AttributeImpl(zbDevice,this,Attributes.ULTRA_SONIC_OCCUPIED_TO_UNOCCUPIED_DELAY);
 		ultraSonicUnoccupiedToOccupiedDelay = new AttributeImpl(zbDevice,this,Attributes.ULTRA_SONIC_UNOCCUPIED_TO_OCCUPIED_DELAY);
+		
 		attributes = new AttributeImpl[]{occupancy,occupancySensorType,pirOccupiedToUnoccupiedDelay,
 				pirUnoccupiedToOccupiedDelay,ultraSonicOccupiedToUnoccupiedDelay,ultraSonicUnoccupiedToOccupiedDelay};
 	}
@@ -100,5 +102,4 @@
 	public Attribute getAttributeUltraSonicUnoccupiedToOccupiedDelay() {
 		return ultraSonicUnoccupiedToOccupiedDelay;
 	}
-
-}
+}

Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/measureament_sensing/RelativeHumidityMeasurementCluster.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/measureament_sensing/RelativeHumidityMeasurementCluster.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/measureament_sensing/RelativeHumidityMeasurementCluster.java Mon Sep 24 17:59:28 2012
@@ -18,7 +18,7 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-*/
+ */
 
 package it.cnr.isti.zigbee.zcl.library.impl.measureament_sensing;
 
@@ -44,28 +44,29 @@
 	private final AttributeImpl minMeasuredValue;
 	private final AttributeImpl maxMeasuredValue;
 	private final AttributeImpl tolerance;
-	
+
 	private final Attribute[] attributes;
 
 	public RelativeHumidityMeasurementCluster(ZigBeeDevice zbDevice){
+
+		super(zbDevice);
 		
-		super(zbDevice);
 		measuredValue = new AttributeImpl(zbDevice,this,Attributes.MEASURED_VALUE_UNSIGNED_16_BIT);
 		minMeasuredValue = new AttributeImpl(zbDevice,this,Attributes.MIN_MEASURED_VALUE_UNSIGNED_16_BIT);
 		maxMeasuredValue = new AttributeImpl(zbDevice,this,Attributes.MAX_MEASURED_VALUE_UNSIGNED_16_BIT);
 		tolerance = new AttributeImpl(zbDevice,this,Attributes.TOLERANCE);
-		
+
 		attributes = new AttributeImpl[]{measuredValue, minMeasuredValue, maxMeasuredValue, tolerance};	
 	}
-	
+
 	@Override
 	public short getId() {
-		return ID;
+		return RelativeHumidityMeasurement.ID;
 	}
 
 	@Override
 	public String getName() {
-		return NAME;
+		return RelativeHumidityMeasurement.NAME;
 	}
 
 	@Override

Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/measureament_sensing/TemperatureMeasurementCluster.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/measureament_sensing/TemperatureMeasurementCluster.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/measureament_sensing/TemperatureMeasurementCluster.java Mon Sep 24 17:59:28 2012
@@ -48,11 +48,14 @@
 	private final Attribute[] attributes;
 
 	public TemperatureMeasurementCluster(ZigBeeDevice zbDevice){
+		
 		super(zbDevice);
+		
 		measuredValue = new AttributeImpl(zbDevice,this,Attributes.MEASURED_VALUE_SIGNED_16_BIT);
 		minMeasuredValue = new AttributeImpl(zbDevice,this,Attributes.MIN_MEASURED_VALUE_SIGNED_16_BIT);
 		maxMeasuredValue = new AttributeImpl(zbDevice,this,Attributes.MAX_MEASURED_VALUE_SIGNED_16_BIT);
 		tolerance = new AttributeImpl(zbDevice,this,Attributes.TOLERANCE);
+		
 		attributes = new AttributeImpl[]{measuredValue, minMeasuredValue, maxMeasuredValue, tolerance};	
 	}
 	
@@ -86,5 +89,4 @@
 	public Attribute getAttributeTolerance() {
 		return tolerance;
 	}
-
-}
+}