[zb4osgi-changeset] [scm] ZigBee 4 OSGi repository change: r806 - in /projects/zb4osgi/sandbox/giancarlo.riolo: zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/factory/ 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.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/ zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/clusters/api/ zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/HVAC/ zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/closures/ zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/core/ 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/api/measureament_sensing/ zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/smart_energy/ zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/attribute/ zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/
scm-notify at zb4osgi.aaloa.org
scm-notify at zb4osgi.aaloa.org
Wed Sep 18 16:05:26 CEST 2013
Author: giancarlo.riolo
Date: Wed Sep 18 16:05:26 2013
New Revision: 806
Log:
task #218. Recognize all clusters definied by HA profile.
Added:
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/AnalogInput.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/ColorControl.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/DoorLock.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/FanControl.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/FlowMeasurement.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/IlluminanceLevelSensing.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Metering.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/PressureMeasurement.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/PumpConfigurationAndControl.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/ShadeConfiguration.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Thermostat.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/ThermostatUserInterfaceConfiguration.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/WindowCovering.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/AnalogInputImpl.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ColorControlImpl.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/DoorLockImpl.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/FanControlImpl.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/FlowMeasurementImpl.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/IlluminanceLevelSensingImpl.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/MeteringImpl.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/PressureMeasurementImpl.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/PumpConfigurationAndControlImpl.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ShadeConfigurationImpl.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ThermostatImpl.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ThermostatUserInterfaceConfigurationImpl.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/WindowCoveringImpl.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/HVAC/
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/HVAC/FanControl.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/HVAC/PumpConfigurationAndControl.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/HVAC/Thermostat.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/HVAC/ThermostatUserInterfaceConfiguration.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/closures/
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/closures/DoorLock.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/closures/ShadeConfiguration.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/closures/WindowCovering.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/AnalogInput.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/FlowMeasurement.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/IlluminanceLevelSensing.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/PressureMeasurement.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/smart_energy/
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/smart_energy/Metering.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/AnalogInputCluster.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/DoorLockCluster.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/FanControlCluster.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/FlowMeasurementCluster.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/IlluminanceLevelSensingCluster.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/MeteringCluster.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/PressureMeasurementCluster.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/PumpConfigurationAndControlCluster.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/ShadeConfigurationCluster.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/ThermostatCluster.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/ThermostatUserInterfaceConfigurationCluster.java (with props)
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/WindowCoveringCluster.java (with props)
Modified:
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/factory/HAClustersFactory.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/HAProfile.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/clusters/api/Clusters.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/core/ZigBeeType.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/attribute/Attributes.java
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/factory/HAClustersFactory.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/factory/HAClustersFactory.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/factory/HAClustersFactory.java Wed Sep 18 16:05:26 2013
@@ -23,24 +23,37 @@
package it.cnr.isti.zigbee.ha.cluster.factory;
import it.cnr.isti.zigbee.ha.cluster.impl.AlarmsImpl;
+import it.cnr.isti.zigbee.ha.cluster.impl.AnalogInputImpl;
import it.cnr.isti.zigbee.ha.cluster.impl.BasicImpl;
import it.cnr.isti.zigbee.ha.cluster.impl.BinaryInputImpl;
+import it.cnr.isti.zigbee.ha.cluster.impl.ColorControlImpl;
import it.cnr.isti.zigbee.ha.cluster.impl.DeviceTemperatureConfigurationImpl;
+import it.cnr.isti.zigbee.ha.cluster.impl.DoorLockImpl;
+import it.cnr.isti.zigbee.ha.cluster.impl.FanControlImpl;
+import it.cnr.isti.zigbee.ha.cluster.impl.FlowMeasurementImpl;
import it.cnr.isti.zigbee.ha.cluster.impl.GroupsImpl;
import it.cnr.isti.zigbee.ha.cluster.impl.IASACEImpl;
import it.cnr.isti.zigbee.ha.cluster.impl.IASWDImpl;
import it.cnr.isti.zigbee.ha.cluster.impl.IASZoneImpl;
import it.cnr.isti.zigbee.ha.cluster.impl.IdentifyImpl;
+import it.cnr.isti.zigbee.ha.cluster.impl.IlluminanceLevelSensingImpl;
import it.cnr.isti.zigbee.ha.cluster.impl.IlluminanceMeasurementImpl;
import it.cnr.isti.zigbee.ha.cluster.impl.LevelControlImpl;
+import it.cnr.isti.zigbee.ha.cluster.impl.MeteringImpl;
import it.cnr.isti.zigbee.ha.cluster.impl.OccupancySensingImpl;
import it.cnr.isti.zigbee.ha.cluster.impl.OnOffImpl;
import it.cnr.isti.zigbee.ha.cluster.impl.OnOffSwitchConfigurationImpl;
import it.cnr.isti.zigbee.ha.cluster.impl.PowerConfigurationImpl;
+import it.cnr.isti.zigbee.ha.cluster.impl.PressureMeasurementImpl;
+import it.cnr.isti.zigbee.ha.cluster.impl.PumpConfigurationAndControlImpl;
import it.cnr.isti.zigbee.ha.cluster.impl.RelativeHumidityMeasurementImpl;
import it.cnr.isti.zigbee.ha.cluster.impl.ScenesImpl;
+import it.cnr.isti.zigbee.ha.cluster.impl.ShadeConfigurationImpl;
import it.cnr.isti.zigbee.ha.cluster.impl.TemperatureMeasurementImpl;
+import it.cnr.isti.zigbee.ha.cluster.impl.ThermostatImpl;
+import it.cnr.isti.zigbee.ha.cluster.impl.ThermostatUserInterfaceConfigurationImpl;
import it.cnr.isti.zigbee.ha.cluster.impl.TimeImpl;
+import it.cnr.isti.zigbee.ha.cluster.impl.WindowCoveringImpl;
import it.cnr.isti.zigbee.ha.driver.core.ClusterFactoryBase;
import it.cnr.isti.zigbee.ha.driver.core.HAProfile;
@@ -49,6 +62,7 @@
/**
* @author <a href="mailto:stefano.lenzi at isti.cnr.it">Stefano "Kismet" Lenzi</a>
* @author <a href="mailto:francesco.furfari at isti.cnr.it">Francesco Furfari</a>
+ * @author <a href="mailto:giancarlo.riolo at isti.cnr.it">§Giancarlo Riolo</a>
*
* @version $LastChangedRevision$ ($LastChangedDate$)
* @since 0.1.0
@@ -66,23 +80,40 @@
final static String ONOFF_KEY = HAProfile.ID + ":"+ HAProfile.ON_OFF;
final static String ON_OFF_SWITCH_CONFIGURATION_KEY = HAProfile.ID + ":"+ HAProfile.ON_OFF_SWITCH_CONFIGURATION;
final static String LEVEL_CONTROL_KEY = HAProfile.ID + ":"+ HAProfile.LEVEL_CONTROL;
- final static String ALARMS_KEY = HAProfile.ID + ":"+ HAProfile.ALARMS;
- final static String TIME_KEY = HAProfile.ID + ":"+ HAProfile.TIME;
- final static String BINARY_INPUT_KEY = HAProfile.ID + ":"+ HAProfile.BINARY_INPUT;
-
- // final static String RSSI_LOCATION
- final static String COMMISSIONING_KEY = HAProfile.ID + ":"+ HAProfile.COMMISSIONING;
-
+ final static String ALARMS_KEY = HAProfile.ID + ":"+ HAProfile.ALARMS;
+ final static String BINARY_INPUT_KEY = HAProfile.ID + ":"+ HAProfile.BINARY_INPUT;
+
+ //Smart Energy
+ final static String METERING_KEY = HAProfile.ID + ":"+ HAProfile.METERING;
+
//Measurement and Sensing
+ final static String ILLUMINANCE_LEVEL_SENSING_KEY = HAProfile.ID + ":"+ HAProfile.ILLUMINANCE_LEVEL_SENSING; // new
final static String ILLUMINANCE_MEASUREMENT_KEY = HAProfile.ID + ":"+ HAProfile.ILLUMINANCE_MEASUREMENT; // new
final static String TEMPERATURE_MEASUREMENT_KEY = HAProfile.ID + ":"+ HAProfile.TEMPERATURE_MEASUREMENT;
+ final static String PRESSURE_MEASUREMENT_KEY = HAProfile.ID + ":"+ HAProfile.PRESSURE_MEASUREMENT;
+ final static String FLOW_MEASUREMENT_KEY = HAProfile.ID + ":"+ HAProfile.FLOW_MEASUREMENT;
final static String RELATIVE_HUMIDITY_MEASUREMENT_KEY = HAProfile.ID + ":"+ HAProfile.RELATIVE_HUMIDITY_MEASUREMENT;
final static String OCCUPANCY_SENSING_KEY = HAProfile.ID + ":"+ HAProfile.OCCUPANCY_SENSING;
-
//Security and Safety
final static String IAS_ZONE_KEY = HAProfile.ID + ":"+ HAProfile.IAS_ZONE;
final static String IAS_WD_KEY = HAProfile.ID + ":"+ HAProfile.IAS_WD;
final static String IAS_ACE_KEY = HAProfile.ID + ":"+ HAProfile.IAS_ACE;
+ //fuori profilo HA
+ final static String TIME_KEY = HAProfile.ID + ":"+ HAProfile.TIME;
+ final static String COMMISSIONING_KEY = HAProfile.ID + ":"+ HAProfile.COMMISSIONING;
+ final static String ANALOG_INPUT_KEY = HAProfile.ID + ":"+ HAProfile.ANALOG_INPUT;
+
+ //HVAC
+ private static final String THERMOSTAT_USER_INTERFACE_CONFIGURATION_KEY = HAProfile.ID + ":"+ HAProfile.THERMOSTAT_USER_INTERFACE_CONFIGURATION;
+ private static final String FAN_CONTROL_KEY = HAProfile.ID + ":"+ HAProfile.FAN_CONTROL;
+ private static final String THERMOSTAT_KEY = HAProfile.ID + ":"+ HAProfile.THERMOSTAT;
+ private static final String PUMP_CONFIGURATION_AND_CONTROL_KEY = HAProfile.ID + ":"+ HAProfile.PUMP_CONFIGURATION_AND_CONTROL;
+ //Closures
+ private static final String SHADE_CONFIGURATION_KEY = HAProfile.ID + ":"+ HAProfile.SHADE_CONFIGURATION;
+ private static final String DOOR_LOCK_KEY = HAProfile.ID + ":"+ HAProfile.DOOR_LOCK;
+ private static final String WINDOW_COVERING_KEY = HAProfile.ID + ":"+ HAProfile.WINDOW_COVERING;
+ //Lightening
+ private static final String COLOR_CONTROL_KEY = HAProfile.ID + ":"+ HAProfile.COLOR_CONTROL;
public HAClustersFactory(BundleContext ctx){
super(ctx);
@@ -97,22 +128,48 @@
addCluster(ONOFF_KEY, OnOffImpl.class);
addCluster(ON_OFF_SWITCH_CONFIGURATION_KEY, OnOffSwitchConfigurationImpl.class);
addCluster(LEVEL_CONTROL_KEY, LevelControlImpl.class);
- addCluster(ALARMS_KEY, AlarmsImpl.class);
+ addCluster(ALARMS_KEY, AlarmsImpl.class);
+ addCluster(BINARY_INPUT_KEY, BinaryInputImpl.class);
+
+ //Smart Energy
+ addCluster(METERING_KEY, MeteringImpl.class);
+
+ //fuori profilo HA
+ addCluster(ANALOG_INPUT_KEY, AnalogInputImpl.class);
+ addCluster(COMMISSIONING_KEY, TimeImpl.class); // new
addCluster(TIME_KEY, TimeImpl.class);
- addCluster(BINARY_INPUT_KEY, BinaryInputImpl.class);
-
- addCluster(COMMISSIONING_KEY, TimeImpl.class); // new
+
//Measurement and Sensing
addCluster(ILLUMINANCE_MEASUREMENT_KEY, IlluminanceMeasurementImpl.class); // new
addCluster(TEMPERATURE_MEASUREMENT_KEY, TemperatureMeasurementImpl.class);
addCluster(RELATIVE_HUMIDITY_MEASUREMENT_KEY, RelativeHumidityMeasurementImpl.class);
addCluster(OCCUPANCY_SENSING_KEY, OccupancySensingImpl.class);
+ addCluster(PRESSURE_MEASUREMENT_KEY, PressureMeasurementImpl.class);
+ addCluster(FLOW_MEASUREMENT_KEY, FlowMeasurementImpl.class);
+ addCluster(ILLUMINANCE_LEVEL_SENSING_KEY, IlluminanceLevelSensingImpl.class);
//Security and Safety
addCluster(IAS_ZONE_KEY, IASZoneImpl.class);
addCluster(IAS_WD_KEY, IASWDImpl.class);
addCluster(IAS_ACE_KEY, IASACEImpl.class);
+
+ //HVAC
+ addCluster(PUMP_CONFIGURATION_AND_CONTROL_KEY, PumpConfigurationAndControlImpl.class);
+ addCluster(THERMOSTAT_KEY, ThermostatImpl.class);
+ addCluster(FAN_CONTROL_KEY, FanControlImpl.class);
+ addCluster(THERMOSTAT_USER_INTERFACE_CONFIGURATION_KEY, ThermostatUserInterfaceConfigurationImpl.class);
+
+ //Closures
+ addCluster(SHADE_CONFIGURATION_KEY, ShadeConfigurationImpl.class);
+ addCluster(DOOR_LOCK_KEY, DoorLockImpl.class);
+ addCluster(WINDOW_COVERING_KEY, WindowCoveringImpl.class);
+
+
+ //Lighting
+ addCluster(COLOR_CONTROL_KEY, ColorControlImpl.class);
+
+
}
}
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/AnalogInput.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/AnalogInput.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/AnalogInput.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,51 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.glue.general;
+
+import it.cnr.isti.zigbee.ha.cluster.glue.Cluster;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.general.groups.AddGroupResponse;
+import it.cnr.isti.zigbee.zcl.library.api.general.groups.GetGroupMembershipResponse;
+import it.cnr.isti.zigbee.zcl.library.api.general.groups.RemoveGroupResponse;
+import it.cnr.isti.zigbee.zcl.library.api.general.groups.ViewGroupResponse;
+import it.cnr.isti.zigbee.zcl.library.impl.core.AttributeImpl;
+
+
+public interface AnalogInput extends Cluster{
+
+
+
+ public String getDescription() throws ZigBeeHAException;
+ public Float getMaxPresentValue() throws ZigBeeHAException;
+ public Float getMinPresentValue() throws ZigBeeHAException;
+ public boolean getOutOfService() throws ZigBeeHAException;
+ public Float getPresentValue() throws ZigBeeHAException;
+ public int getReliability() throws ZigBeeHAException;
+ public float getResolution() throws ZigBeeHAException;
+ public int getStatusFlags() throws ZigBeeHAException;
+ public int getEngineeringUnits() throws ZigBeeHAException;
+ public long getApplicationType() throws ZigBeeHAException;
+
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/AnalogInput.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/ColorControl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/ColorControl.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/ColorControl.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,34 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.glue.general;
+
+import it.cnr.isti.zigbee.ha.cluster.glue.Cluster;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+
+
+
+public interface ColorControl extends Cluster {
+
+ public String getDescription() throws ZigBeeHAException;
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/ColorControl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/DoorLock.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/DoorLock.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/DoorLock.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,34 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.glue.general;
+
+import it.cnr.isti.zigbee.ha.cluster.glue.Cluster;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+
+
+
+public interface DoorLock extends Cluster {
+
+ public String getDescription() throws ZigBeeHAException;
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/DoorLock.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/FanControl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/FanControl.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/FanControl.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,34 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.glue.general;
+
+import it.cnr.isti.zigbee.ha.cluster.glue.Cluster;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+
+
+
+public interface FanControl extends Cluster {
+
+ public String getDescription() throws ZigBeeHAException;
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/FanControl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/FlowMeasurement.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/FlowMeasurement.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/FlowMeasurement.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,34 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.glue.general;
+
+import it.cnr.isti.zigbee.ha.cluster.glue.Cluster;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+
+
+
+public interface FlowMeasurement extends Cluster {
+
+ public String getDescription() throws ZigBeeHAException;
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/FlowMeasurement.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/IlluminanceLevelSensing.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/IlluminanceLevelSensing.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/IlluminanceLevelSensing.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,34 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.glue.general;
+
+import it.cnr.isti.zigbee.ha.cluster.glue.Cluster;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+
+
+
+public interface IlluminanceLevelSensing extends Cluster {
+
+ public String getDescription() throws ZigBeeHAException;
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/IlluminanceLevelSensing.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Metering.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Metering.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Metering.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,34 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.glue.general;
+
+import it.cnr.isti.zigbee.ha.cluster.glue.Cluster;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+
+
+
+public interface Metering extends Cluster {
+
+ public String getDescription() throws ZigBeeHAException;
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Metering.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/PressureMeasurement.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/PressureMeasurement.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/PressureMeasurement.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,33 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.glue.general;
+
+import it.cnr.isti.zigbee.ha.cluster.glue.Cluster;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+
+
+public interface PressureMeasurement extends Cluster {
+
+ public String getDescription() throws ZigBeeHAException;
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/PressureMeasurement.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/PumpConfigurationAndControl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/PumpConfigurationAndControl.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/PumpConfigurationAndControl.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,34 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.glue.general;
+
+import it.cnr.isti.zigbee.ha.cluster.glue.Cluster;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+
+
+
+public interface PumpConfigurationAndControl extends Cluster {
+
+ public String getDescription() throws ZigBeeHAException;
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/PumpConfigurationAndControl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/ShadeConfiguration.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/ShadeConfiguration.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/ShadeConfiguration.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,34 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.glue.general;
+
+import it.cnr.isti.zigbee.ha.cluster.glue.Cluster;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+
+
+
+public interface ShadeConfiguration extends Cluster {
+
+ public String getDescription() throws ZigBeeHAException;
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/ShadeConfiguration.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Thermostat.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Thermostat.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Thermostat.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,34 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.glue.general;
+
+import it.cnr.isti.zigbee.ha.cluster.glue.Cluster;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+
+
+
+public interface Thermostat extends Cluster {
+
+ public String getDescription() throws ZigBeeHAException;
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Thermostat.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/ThermostatUserInterfaceConfiguration.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/ThermostatUserInterfaceConfiguration.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/ThermostatUserInterfaceConfiguration.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,34 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.glue.general;
+
+import it.cnr.isti.zigbee.ha.cluster.glue.Cluster;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+
+
+
+public interface ThermostatUserInterfaceConfiguration extends Cluster {
+
+ public String getDescription() throws ZigBeeHAException;
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/ThermostatUserInterfaceConfiguration.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/WindowCovering.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/WindowCovering.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/WindowCovering.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,34 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.glue.general;
+
+import it.cnr.isti.zigbee.ha.cluster.glue.Cluster;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+
+
+
+public interface WindowCovering extends Cluster {
+
+ public String getDescription() throws ZigBeeHAException;
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/WindowCovering.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/AnalogInputImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/AnalogInputImpl.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/AnalogInputImpl.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,179 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.impl;
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.Activator;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.AnalogInput;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.event.PresentValueListener;
+import it.cnr.isti.zigbee.ha.cluster.impl.event.PresentValueBridgeListeners;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.Subscription;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
+import it.cnr.isti.zigbee.zcl.library.impl.general.AnalogInputCluster;
+
+
+
+
+public class AnalogInputImpl implements AnalogInput {
+ private final Attribute presentValue;
+ private final Attribute outOfService;
+ private final Attribute statusFlags;
+ private AnalogInputCluster analogInputCluster;
+ private PresentValueBridgeListeners eventBridge;
+
+ public AnalogInputImpl(ZigBeeDevice zbDevice){
+ analogInputCluster = new AnalogInputCluster(zbDevice);
+ presentValue = analogInputCluster.getAttributePresentValue();
+ outOfService = analogInputCluster.getAttributeOutOfService();
+ statusFlags = analogInputCluster.getAttributeStatusFlags();
+ eventBridge = new PresentValueBridgeListeners(Activator.getConfiguration(), presentValue, this);
+ }
+
+
+ public boolean subscribe(PresentValueListener listener) {
+ return eventBridge.subscribe(listener);
+ }
+
+ public boolean unsubscribe(PresentValueListener listener) {
+ return eventBridge.unsubscribe(listener);
+ }
+
+
+ public Subscription[] getActiveSubscriptions() {
+ return analogInputCluster.getActiveSubscriptions();
+ }
+
+ public int getId() {
+ return analogInputCluster.getId();
+ }
+
+ public String getName() {
+ return analogInputCluster.getName();
+ }
+
+
+
+ public Attribute getAttribute(int id) {
+ Attribute[] attributes = analogInputCluster.getAvailableAttributes();
+ for (int i = 0; i < attributes.length; i++) {
+ if( attributes[i].getId() == id )
+ return attributes[i];
+ }
+ return null;
+ }
+
+ public Attribute[] getAttributes() {
+ return analogInputCluster.getAvailableAttributes();
+ }
+
+
+ public String getDescription() throws ZigBeeHAException {
+ try {
+ return (String) analogInputCluster.getAttributeDescription().getValue();
+ } catch (ZigBeeClusterException e) {
+ throw new ZigBeeHAException(e);
+ }
+ }
+ public int getReliability() throws ZigBeeHAException {
+ try {
+ return (Integer) analogInputCluster.getAttributeReliability().getValue();
+ } catch (ZigBeeClusterException e) {
+ throw new ZigBeeHAException(e);
+ }
+ }
+
+
+ public long getApplicationType() throws ZigBeeHAException {
+ try {
+ return (Long) analogInputCluster.getAttributeApplicationType().getValue();
+ } catch (ZigBeeClusterException e) {
+ throw new ZigBeeHAException(e);
+ }
+ }
+
+
+ public boolean getOutOfService() throws ZigBeeHAException {
+ try {
+ return (Boolean) analogInputCluster.getAttributeOutOfService().getValue();
+ } catch (ZigBeeClusterException e) {
+ throw new ZigBeeHAException(e);
+ }
+ }
+
+
+ public Float getPresentValue() throws ZigBeeHAException {
+ try {
+ return (Float) analogInputCluster.getAttributePresentValue().getValue();
+ } catch (ZigBeeClusterException e) {
+ throw new ZigBeeHAException(e);
+ }
+ }
+
+
+ public int getStatusFlags() throws ZigBeeHAException {
+ try {
+ return (Integer) analogInputCluster.getAttributeStatusFlags().getValue();
+ } catch (ZigBeeClusterException e) {
+ throw new ZigBeeHAException(e);
+ }
+ }
+
+
+ public Float getMaxPresentValue() throws ZigBeeHAException {
+ try {
+ return (Float) analogInputCluster.getAttributeMaxPresentValue().getValue();
+ } catch (ZigBeeClusterException e) {
+ throw new ZigBeeHAException(e);
+ }
+ }
+
+
+ public Float getMinPresentValue() throws ZigBeeHAException {
+ try {
+ return (Float) analogInputCluster.getAttributeMinPresentValue().getValue();
+ } catch (ZigBeeClusterException e) {
+ throw new ZigBeeHAException(e);
+ }
+ }
+
+
+ public float getResolution() throws ZigBeeHAException {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+
+ public int getEngineeringUnits() throws ZigBeeHAException {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+
+
+
+
+
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/AnalogInputImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ColorControlImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ColorControlImpl.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ColorControlImpl.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,82 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.impl;
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Basic;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Metering;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.Subscription;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
+import it.cnr.isti.zigbee.zcl.library.impl.general.AnalogInputCluster;
+import it.cnr.isti.zigbee.zcl.library.impl.general.ColorControlCluster;
+import it.cnr.isti.zigbee.zcl.library.impl.general.MeteringCluster;
+
+
+public class ColorControlImpl implements Metering{
+
+ private ColorControlCluster colorControlCluster;
+
+
+ public ColorControlImpl(ZigBeeDevice zbDevice){
+ colorControlCluster = new ColorControlCluster(zbDevice);
+
+ }
+
+ public int getId() {
+
+ return colorControlCluster.getId();
+ }
+
+ public String getName() {
+
+ return colorControlCluster.getName();
+ }
+
+ public Subscription[] getActiveSubscriptions() {
+ return colorControlCluster.getActiveSubscriptions();
+ }
+
+ public Attribute[] getAttributes() {
+
+ return colorControlCluster.getAvailableAttributes();
+ }
+
+ public Attribute getAttribute(int id) {
+ Attribute[] attributes = colorControlCluster.getAvailableAttributes();
+ for (int i = 0; i < attributes.length; i++) {
+ if( attributes[i].getId() == id )
+ return attributes[i];
+ }
+ return null;
+ }
+
+ public String getDescription() throws ZigBeeHAException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ColorControlImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/DoorLockImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/DoorLockImpl.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/DoorLockImpl.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,85 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.impl;
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Basic;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.DoorLock;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Metering;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.Subscription;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
+import it.cnr.isti.zigbee.zcl.library.impl.general.AnalogInputCluster;
+import it.cnr.isti.zigbee.zcl.library.impl.general.DoorLockCluster;
+import it.cnr.isti.zigbee.zcl.library.impl.general.MeteringCluster;
+
+
+public class DoorLockImpl implements DoorLock{
+
+ private DoorLockCluster doorLockCluster;
+
+
+ public DoorLockImpl(ZigBeeDevice zbDevice){
+ doorLockCluster = new DoorLockCluster(zbDevice);
+
+ }
+
+ public int getId() {
+
+ return doorLockCluster.getId();
+ }
+
+ public String getName() {
+
+ return doorLockCluster.getName();
+ }
+
+ public Subscription[] getActiveSubscriptions() {
+ return doorLockCluster.getActiveSubscriptions();
+ }
+
+ public Attribute[] getAttributes() {
+
+ return doorLockCluster.getAvailableAttributes();
+ }
+
+ public Attribute getAttribute(int id) {
+ Attribute[] attributes = doorLockCluster.getAvailableAttributes();
+ for (int i = 0; i < attributes.length; i++) {
+ if( attributes[i].getId() == id )
+ return attributes[i];
+ }
+ return null;
+ }
+
+ public String getDescription() throws ZigBeeHAException {
+ try {
+ return (String) doorLockCluster.getAttributeDescription().getValue();
+ } catch (ZigBeeClusterException e) {
+ throw new ZigBeeHAException(e);
+ }
+ }
+
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/DoorLockImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/FanControlImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/FanControlImpl.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/FanControlImpl.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,85 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.impl;
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Basic;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.FanControl;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Metering;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.Subscription;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
+import it.cnr.isti.zigbee.zcl.library.impl.general.AnalogInputCluster;
+import it.cnr.isti.zigbee.zcl.library.impl.general.FanControlCluster;
+import it.cnr.isti.zigbee.zcl.library.impl.general.MeteringCluster;
+
+
+public class FanControlImpl implements FanControl{
+
+ private FanControlCluster fanControlCluster;
+
+
+ public FanControlImpl(ZigBeeDevice zbDevice){
+ fanControlCluster = new FanControlCluster(zbDevice);
+
+ }
+
+ public int getId() {
+
+ return fanControlCluster.getId();
+ }
+
+ public String getName() {
+
+ return fanControlCluster.getName();
+ }
+
+ public Subscription[] getActiveSubscriptions() {
+ return fanControlCluster.getActiveSubscriptions();
+ }
+
+ public Attribute[] getAttributes() {
+
+ return fanControlCluster.getAvailableAttributes();
+ }
+
+ public Attribute getAttribute(int id) {
+ Attribute[] attributes = fanControlCluster.getAvailableAttributes();
+ for (int i = 0; i < attributes.length; i++) {
+ if( attributes[i].getId() == id )
+ return attributes[i];
+ }
+ return null;
+ }
+
+ public String getDescription() throws ZigBeeHAException {
+ try {
+ return (String) fanControlCluster.getAttributeDescription().getValue();
+ } catch (ZigBeeClusterException e) {
+ throw new ZigBeeHAException(e);
+ }
+ }
+
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/FanControlImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/FlowMeasurementImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/FlowMeasurementImpl.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/FlowMeasurementImpl.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,92 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.impl;
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Basic;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.FlowMeasurement;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Metering;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.Subscription;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
+import it.cnr.isti.zigbee.zcl.library.impl.general.AnalogInputCluster;
+import it.cnr.isti.zigbee.zcl.library.impl.general.FlowMeasurementCluster;
+import it.cnr.isti.zigbee.zcl.library.impl.general.MeteringCluster;
+
+
+/**
+ * @version $LastChangedRevision: 799 $ ($LastChangedDate: 2013-08-06 18:00:05 +0200 (mar, 06 ago 2013) $)
+ * @since 0.1.0
+ *
+ */
+public class FlowMeasurementImpl implements FlowMeasurement{
+
+ private FlowMeasurementCluster flowMeasurementCluster;
+
+
+ public FlowMeasurementImpl(ZigBeeDevice zbDevice){
+ flowMeasurementCluster = new FlowMeasurementCluster(zbDevice);
+
+ }
+
+ public int getId() {
+
+ return flowMeasurementCluster.getId();
+ }
+
+ public String getName() {
+
+ return flowMeasurementCluster.getName();
+ }
+
+ public Subscription[] getActiveSubscriptions() {
+ return flowMeasurementCluster.getActiveSubscriptions();
+ }
+
+ public Attribute[] getAttributes() {
+
+ return flowMeasurementCluster.getAvailableAttributes();
+ }
+
+ public Attribute getAttribute(int id) {
+ Attribute[] attributes = flowMeasurementCluster.getAvailableAttributes();
+ for (int i = 0; i < attributes.length; i++) {
+ if( attributes[i].getId() == id )
+ return attributes[i];
+ }
+ return null;
+ }
+
+ public String getDescription() throws ZigBeeHAException {
+ try {
+ return (String) flowMeasurementCluster.getAttributeDescription().getValue();
+ } catch (ZigBeeClusterException e) {
+ throw new ZigBeeHAException(e);
+ }
+ }
+
+
+
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/FlowMeasurementImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/IlluminanceLevelSensingImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/IlluminanceLevelSensingImpl.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/IlluminanceLevelSensingImpl.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,92 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.impl;
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Basic;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.IlluminanceLevelSensing;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Metering;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.Subscription;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
+import it.cnr.isti.zigbee.zcl.library.impl.general.AnalogInputCluster;
+import it.cnr.isti.zigbee.zcl.library.impl.general.IlluminanceLevelSensingCluster;
+import it.cnr.isti.zigbee.zcl.library.impl.general.MeteringCluster;
+
+
+/**
+ * @version $LastChangedRevision: 799 $ ($LastChangedDate: 2013-08-06 18:00:05 +0200 (mar, 06 ago 2013) $)
+ * @since 0.1.0
+ *
+ */
+public class IlluminanceLevelSensingImpl implements IlluminanceLevelSensing{
+
+ private IlluminanceLevelSensingCluster illuminanceLevelSensingCluster;
+
+
+ public IlluminanceLevelSensingImpl(ZigBeeDevice zbDevice){
+ illuminanceLevelSensingCluster = new IlluminanceLevelSensingCluster(zbDevice);
+
+ }
+
+ public int getId() {
+
+ return illuminanceLevelSensingCluster.getId();
+ }
+
+ public String getName() {
+
+ return illuminanceLevelSensingCluster.getName();
+ }
+
+ public Subscription[] getActiveSubscriptions() {
+ return illuminanceLevelSensingCluster.getActiveSubscriptions();
+ }
+
+ public Attribute[] getAttributes() {
+
+ return illuminanceLevelSensingCluster.getAvailableAttributes();
+ }
+
+ public Attribute getAttribute(int id) {
+ Attribute[] attributes = illuminanceLevelSensingCluster.getAvailableAttributes();
+ for (int i = 0; i < attributes.length; i++) {
+ if( attributes[i].getId() == id )
+ return attributes[i];
+ }
+ return null;
+ }
+
+ public String getDescription() throws ZigBeeHAException {
+ try {
+ return (String) illuminanceLevelSensingCluster.getAttributeDescription().getValue();
+ } catch (ZigBeeClusterException e) {
+ throw new ZigBeeHAException(e);
+ }
+ }
+
+
+
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/IlluminanceLevelSensingImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/MeteringImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/MeteringImpl.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/MeteringImpl.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,83 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.impl;
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Basic;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Metering;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.Subscription;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
+import it.cnr.isti.zigbee.zcl.library.impl.general.AnalogInputCluster;
+import it.cnr.isti.zigbee.zcl.library.impl.general.MeteringCluster;
+
+
+public class MeteringImpl implements Metering{
+
+ private MeteringCluster meteringCluster;
+
+
+ public MeteringImpl(ZigBeeDevice zbDevice){
+ meteringCluster = new MeteringCluster(zbDevice);
+
+ }
+
+ public int getId() {
+
+ return meteringCluster.getId();
+ }
+
+ public String getName() {
+
+ return meteringCluster.getName();
+ }
+
+ public Subscription[] getActiveSubscriptions() {
+ return meteringCluster.getActiveSubscriptions();
+ }
+
+ public Attribute[] getAttributes() {
+
+ return meteringCluster.getAvailableAttributes();
+ }
+
+ public Attribute getAttribute(int id) {
+ Attribute[] attributes = meteringCluster.getAvailableAttributes();
+ for (int i = 0; i < attributes.length; i++) {
+ if( attributes[i].getId() == id )
+ return attributes[i];
+ }
+ return null;
+ }
+
+ public String getDescription() throws ZigBeeHAException {
+ try {
+ return (String) meteringCluster.getAttributeDescription().getValue();
+ } catch (ZigBeeClusterException e) {
+ throw new ZigBeeHAException(e);
+ }
+ }
+
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/MeteringImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/PressureMeasurementImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/PressureMeasurementImpl.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/PressureMeasurementImpl.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,84 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.impl;
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.PressureMeasurement;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.Subscription;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
+import it.cnr.isti.zigbee.zcl.library.impl.general.PressureMeasurementCluster;
+
+
+/**
+ * @version $LastChangedRevision: 799 $ ($LastChangedDate: 2013-08-06 18:00:05 +0200 (mar, 06 ago 2013) $)
+ * @since 0.1.0
+ *
+ */
+public class PressureMeasurementImpl implements PressureMeasurement{
+
+ private PressureMeasurementCluster pressureMeasurementCluster;
+
+
+ public PressureMeasurementImpl(ZigBeeDevice zbDevice){
+ pressureMeasurementCluster = new PressureMeasurementCluster(zbDevice);
+
+ }
+
+ public int getId() {
+
+ return pressureMeasurementCluster.getId();
+ }
+
+ public String getName() {
+
+ return pressureMeasurementCluster.getName();
+ }
+
+ public Subscription[] getActiveSubscriptions() {
+ return pressureMeasurementCluster.getActiveSubscriptions();
+ }
+
+ public Attribute[] getAttributes() {
+
+ return pressureMeasurementCluster.getAvailableAttributes();
+ }
+
+ public Attribute getAttribute(int id) {
+ Attribute[] attributes = pressureMeasurementCluster.getAvailableAttributes();
+ for (int i = 0; i < attributes.length; i++) {
+ if( attributes[i].getId() == id )
+ return attributes[i];
+ }
+ return null;
+ }
+
+ public String getDescription() throws ZigBeeHAException {
+ try {
+ return (String) pressureMeasurementCluster.getAttributeDescription().getValue();
+ } catch (ZigBeeClusterException e) {
+ throw new ZigBeeHAException(e);
+ }
+ }
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/PressureMeasurementImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/PumpConfigurationAndControlImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/PumpConfigurationAndControlImpl.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/PumpConfigurationAndControlImpl.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,85 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.impl;
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Basic;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Metering;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.PumpConfigurationAndControl;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.Subscription;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
+import it.cnr.isti.zigbee.zcl.library.impl.general.AnalogInputCluster;
+import it.cnr.isti.zigbee.zcl.library.impl.general.MeteringCluster;
+import it.cnr.isti.zigbee.zcl.library.impl.general.PumpConfigurationAndControlCluster;
+
+
+public class PumpConfigurationAndControlImpl implements PumpConfigurationAndControl{
+
+ private PumpConfigurationAndControlCluster pumpConfigurationAndControlCluster;
+
+
+ public PumpConfigurationAndControlImpl(ZigBeeDevice zbDevice){
+ pumpConfigurationAndControlCluster = new PumpConfigurationAndControlCluster(zbDevice);
+
+ }
+
+ public int getId() {
+
+ return pumpConfigurationAndControlCluster.getId();
+ }
+
+ public String getName() {
+
+ return pumpConfigurationAndControlCluster.getName();
+ }
+
+ public Subscription[] getActiveSubscriptions() {
+ return pumpConfigurationAndControlCluster.getActiveSubscriptions();
+ }
+
+ public Attribute[] getAttributes() {
+
+ return pumpConfigurationAndControlCluster.getAvailableAttributes();
+ }
+
+ public Attribute getAttribute(int id) {
+ Attribute[] attributes = pumpConfigurationAndControlCluster.getAvailableAttributes();
+ for (int i = 0; i < attributes.length; i++) {
+ if( attributes[i].getId() == id )
+ return attributes[i];
+ }
+ return null;
+ }
+
+ public String getDescription() throws ZigBeeHAException {
+ try {
+ return (String) pumpConfigurationAndControlCluster.getAttributeDescription().getValue();
+ } catch (ZigBeeClusterException e) {
+ throw new ZigBeeHAException(e);
+ }
+ }
+
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/PumpConfigurationAndControlImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ShadeConfigurationImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ShadeConfigurationImpl.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ShadeConfigurationImpl.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,85 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.impl;
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Basic;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Metering;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.ShadeConfiguration;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.Subscription;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
+import it.cnr.isti.zigbee.zcl.library.impl.general.AnalogInputCluster;
+import it.cnr.isti.zigbee.zcl.library.impl.general.MeteringCluster;
+import it.cnr.isti.zigbee.zcl.library.impl.general.ShadeConfigurationCluster;
+
+
+public class ShadeConfigurationImpl implements ShadeConfiguration{
+
+ private ShadeConfigurationCluster shadeConfigurationCluster;
+
+
+ public ShadeConfigurationImpl(ZigBeeDevice zbDevice){
+ shadeConfigurationCluster = new ShadeConfigurationCluster(zbDevice);
+
+ }
+
+ public int getId() {
+
+ return shadeConfigurationCluster.getId();
+ }
+
+ public String getName() {
+
+ return shadeConfigurationCluster.getName();
+ }
+
+ public Subscription[] getActiveSubscriptions() {
+ return shadeConfigurationCluster.getActiveSubscriptions();
+ }
+
+ public Attribute[] getAttributes() {
+
+ return shadeConfigurationCluster.getAvailableAttributes();
+ }
+
+ public Attribute getAttribute(int id) {
+ Attribute[] attributes = shadeConfigurationCluster.getAvailableAttributes();
+ for (int i = 0; i < attributes.length; i++) {
+ if( attributes[i].getId() == id )
+ return attributes[i];
+ }
+ return null;
+ }
+
+ public String getDescription() throws ZigBeeHAException {
+ try {
+ return (String) shadeConfigurationCluster.getAttributeDescription().getValue();
+ } catch (ZigBeeClusterException e) {
+ throw new ZigBeeHAException(e);
+ }
+ }
+
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ShadeConfigurationImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ThermostatImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ThermostatImpl.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ThermostatImpl.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,85 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.impl;
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Basic;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Metering;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Thermostat;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.Subscription;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
+import it.cnr.isti.zigbee.zcl.library.impl.general.AnalogInputCluster;
+import it.cnr.isti.zigbee.zcl.library.impl.general.MeteringCluster;
+import it.cnr.isti.zigbee.zcl.library.impl.general.ThermostatCluster;
+
+
+public class ThermostatImpl implements Thermostat{
+
+ private ThermostatCluster thermostatCluster;
+
+
+ public ThermostatImpl(ZigBeeDevice zbDevice){
+ thermostatCluster = new ThermostatCluster(zbDevice);
+
+ }
+
+ public int getId() {
+
+ return thermostatCluster.getId();
+ }
+
+ public String getName() {
+
+ return thermostatCluster.getName();
+ }
+
+ public Subscription[] getActiveSubscriptions() {
+ return thermostatCluster.getActiveSubscriptions();
+ }
+
+ public Attribute[] getAttributes() {
+
+ return thermostatCluster.getAvailableAttributes();
+ }
+
+ public Attribute getAttribute(int id) {
+ Attribute[] attributes = thermostatCluster.getAvailableAttributes();
+ for (int i = 0; i < attributes.length; i++) {
+ if( attributes[i].getId() == id )
+ return attributes[i];
+ }
+ return null;
+ }
+
+ public String getDescription() throws ZigBeeHAException {
+ try {
+ return (String) thermostatCluster.getAttributeDescription().getValue();
+ } catch (ZigBeeClusterException e) {
+ throw new ZigBeeHAException(e);
+ }
+ }
+
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ThermostatImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ThermostatUserInterfaceConfigurationImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ThermostatUserInterfaceConfigurationImpl.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ThermostatUserInterfaceConfigurationImpl.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,85 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.impl;
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Basic;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Metering;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.ThermostatUserInterfaceConfiguration;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.Subscription;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
+import it.cnr.isti.zigbee.zcl.library.impl.general.AnalogInputCluster;
+import it.cnr.isti.zigbee.zcl.library.impl.general.MeteringCluster;
+import it.cnr.isti.zigbee.zcl.library.impl.general.ThermostatUserInterfaceConfigurationCluster;
+
+
+public class ThermostatUserInterfaceConfigurationImpl implements ThermostatUserInterfaceConfiguration{
+
+ private ThermostatUserInterfaceConfigurationCluster thermostatUserInterfaceConfigurationCluster;
+
+
+ public ThermostatUserInterfaceConfigurationImpl(ZigBeeDevice zbDevice){
+ thermostatUserInterfaceConfigurationCluster = new ThermostatUserInterfaceConfigurationCluster(zbDevice);
+
+ }
+
+ public int getId() {
+
+ return thermostatUserInterfaceConfigurationCluster.getId();
+ }
+
+ public String getName() {
+
+ return thermostatUserInterfaceConfigurationCluster.getName();
+ }
+
+ public Subscription[] getActiveSubscriptions() {
+ return thermostatUserInterfaceConfigurationCluster.getActiveSubscriptions();
+ }
+
+ public Attribute[] getAttributes() {
+
+ return thermostatUserInterfaceConfigurationCluster.getAvailableAttributes();
+ }
+
+ public Attribute getAttribute(int id) {
+ Attribute[] attributes = thermostatUserInterfaceConfigurationCluster.getAvailableAttributes();
+ for (int i = 0; i < attributes.length; i++) {
+ if( attributes[i].getId() == id )
+ return attributes[i];
+ }
+ return null;
+ }
+
+ public String getDescription() throws ZigBeeHAException {
+ try {
+ return (String) thermostatUserInterfaceConfigurationCluster.getAttributeDescription().getValue();
+ } catch (ZigBeeClusterException e) {
+ throw new ZigBeeHAException(e);
+ }
+ }
+
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ThermostatUserInterfaceConfigurationImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/WindowCoveringImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/WindowCoveringImpl.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/WindowCoveringImpl.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,81 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.ha.cluster.impl;
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.WindowCovering;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.Subscription;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
+import it.cnr.isti.zigbee.zcl.library.impl.general.WindowCoveringCluster;
+
+
+public class WindowCoveringImpl implements WindowCovering{
+
+ private WindowCoveringCluster windowCovering;
+
+
+ public WindowCoveringImpl(ZigBeeDevice zbDevice){
+ windowCovering = new WindowCoveringCluster(zbDevice);
+
+ }
+
+ public int getId() {
+
+ return windowCovering.getId();
+ }
+
+ public String getName() {
+
+ return windowCovering.getName();
+ }
+
+ public Subscription[] getActiveSubscriptions() {
+ return windowCovering.getActiveSubscriptions();
+ }
+
+ public Attribute[] getAttributes() {
+
+ return windowCovering.getAvailableAttributes();
+ }
+
+ public Attribute getAttribute(int id) {
+ Attribute[] attributes = windowCovering.getAvailableAttributes();
+ for (int i = 0; i < attributes.length; i++) {
+ if( attributes[i].getId() == id )
+ return attributes[i];
+ }
+ return null;
+ }
+
+ public String getDescription() throws ZigBeeHAException {
+ try {
+ return (String) windowCovering.getAttributeDescription().getValue();
+ } catch (ZigBeeClusterException e) {
+ throw new ZigBeeHAException(e);
+ }
+ }
+
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/WindowCoveringImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/HAProfile.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/HAProfile.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/HAProfile.java Wed Sep 18 16:05:26 2013
@@ -21,6 +21,7 @@
*/
package it.cnr.isti.zigbee.ha.driver.core;
+
import it.cnr.isti.zigbee.ha.device.api.generic.LevelControlSwitch;
import it.cnr.isti.zigbee.ha.device.api.generic.MainsPowerOutlet;
@@ -37,7 +38,15 @@
import it.cnr.isti.zigbee.ha.device.api.security_safety.IASControlAndIndicatingEquipment;
import it.cnr.isti.zigbee.ha.device.api.security_safety.IAS_Warning;
import it.cnr.isti.zigbee.ha.device.api.security_safety.IAS_Zone;
+import it.cnr.isti.zigbee.zcl.library.api.HVAC.FanControl;
+import it.cnr.isti.zigbee.zcl.library.api.HVAC.PumpConfigurationAndControl;
+import it.cnr.isti.zigbee.zcl.library.api.HVAC.Thermostat;
+import it.cnr.isti.zigbee.zcl.library.api.HVAC.ThermostatUserInterfaceConfiguration;
+import it.cnr.isti.zigbee.zcl.library.api.closures.DoorLock;
+import it.cnr.isti.zigbee.zcl.library.api.closures.ShadeConfiguration;
+import it.cnr.isti.zigbee.zcl.library.api.closures.WindowCovering;
import it.cnr.isti.zigbee.zcl.library.api.general.Alarms;
+import it.cnr.isti.zigbee.zcl.library.api.general.AnalogInput;
import it.cnr.isti.zigbee.zcl.library.api.general.Basic;
import it.cnr.isti.zigbee.zcl.library.api.general.Commissioning;
import it.cnr.isti.zigbee.zcl.library.api.general.DeviceTemperatureConfiguration;
@@ -51,18 +60,23 @@
import it.cnr.isti.zigbee.zcl.library.api.general.Time;
import it.cnr.isti.zigbee.zcl.library.api.general.BinaryInput;
import it.cnr.isti.zigbee.zcl.library.api.lighting.ColorControl;
+import it.cnr.isti.zigbee.zcl.library.api.measureament_sensing.FlowMeasurement;
+import it.cnr.isti.zigbee.zcl.library.api.measureament_sensing.IlluminanceLevelSensing;
import it.cnr.isti.zigbee.zcl.library.api.measureament_sensing.IlluminanceMeasurement;
import it.cnr.isti.zigbee.zcl.library.api.measureament_sensing.OccupancySensing;
+import it.cnr.isti.zigbee.zcl.library.api.measureament_sensing.PressureMeasurement;
import it.cnr.isti.zigbee.zcl.library.api.measureament_sensing.RelativeHumidityMeasurement;
import it.cnr.isti.zigbee.zcl.library.api.measureament_sensing.TemperatureMeasurement;
import it.cnr.isti.zigbee.zcl.library.api.security_safety.IASACE;
import it.cnr.isti.zigbee.zcl.library.api.security_safety.IASWD;
import it.cnr.isti.zigbee.zcl.library.api.security_safety.IASZone;
+import it.cnr.isti.zigbee.zcl.library.api.smart_energy.Metering;
/**
* @author <a href="mailto:stefano.lenzi at isti.cnr.it">Stefano "Kismet" Lenzi</a>
* @author <a href="mailto:francesco.furfari at isti.cnr.it">Francesco Furfari</a>
+ * @author <a href="mailto:giancarlo.riolo at isti.cnr.it">Giancarlo Riolo</a>
* @author <a href="mailto:h.alink1 at chello.nl">Han Alink</a>
*
* @version $LastChangedRevision$ ($LastChangedDate$)
@@ -71,192 +85,258 @@
*/
public class HAProfile {
- public static final int ID = 260;
-
- //CLUSTERS
- //Generic
- public static final int BASIC = Basic.ID;
- public static final int POWER_CONFIGURATION = PowerConfiguration.ID;
- public static final int DEVICE_TEMPERATURE_CONFIGURATION = DeviceTemperatureConfiguration.ID;
- public static final int IDENTIFY = Identify.ID;
- public static final int GROUPS = Groups.ID;
- public static final int SCENES = Scenes.ID;
- public static final int ON_OFF = OnOff.ID;
- public static final int TIME = Time.ID;
- public static final int ON_OFF_SWITCH_CONFIGURATION = OnOffSwitchConfiguration.ID;
- public static final int LEVEL_CONTROL = LevelControl.ID;
- public static final int ALARMS = Alarms.ID;
- public static final int BINARY_INPUT = BinaryInput.ID;
- //public static final int RSSI_LOCATION // 0X000b
- public static final int COMMISSIONING = Commissioning.ID; // TODO
- // Closures
- //public static final int SHADE_CONFIGURATION // 0x0100
-
- // HVAC
- //public static final int PUMP_CONFIGURATION_AND_CONTROL // 0x0200
- //public static final int THERMOSTAT // 0x0201
- //public static final int FAN_CONTROL // 0x0202
- //public static final int DEHUMIDIFICATION_CONTROL // 0x0203
- //public static final int THERMOSTAT_USER_INTERFACE_CONFIGURATION // 0x0204
-
- // Lighting
- public static final int COLOR_CONTROL = ColorControl.ID; // 0x0300
- //public static final int BALLAST_CONFIGURATION // 0x0301
-
- //Measureament & Sensing
- public static final int ILLUMINANCE_MEASUREMENT = IlluminanceMeasurement.ID; // new
- //public static final int ILLUMINANCE_LEVEL_SENSING // 0x0401
- public static final int TEMPERATURE_MEASUREMENT = TemperatureMeasurement.ID;
- //public static final int PRESSURE_MEASUREMENT // 0x0403
- //public static final int FLOW_MEASUREMENT // 0x0404
- public static final int RELATIVE_HUMIDITY_MEASUREMENT = RelativeHumidityMeasurement.ID;
- public static final int OCCUPANCY_SENSING = OccupancySensing.ID;
-
- // Security & Safety
- public static final int IAS_ZONE = IASZone.ID; // TODO
- public static final int IAS_ACE = IASACE.ID; // 0x0501
- public static final int IAS_WD = IASWD.ID; // TODO
-
- // devices
- // GENERIC 0x0000 - 0x00FF
- public static final int ONOFF_SWITCH = OnOffSwitch.DEVICE_ID;
- public static final int LEVELCONTROL = LevelControlSwitch.DEVICE_ID;
- public static final int ONOFF_OUTPUT = OnOffOutput.DEVICE_ID;
- public static final int MAINS_POWER_OUTLET = MainsPowerOutlet.DEVICE_ID;
- public static final int SIMPLE_SENSOR = SimpleSensor.DEVICE_ID;
- // LIGHTNING 0x0100 - 0x1FF
- public static final int ONOFF_LIGHT = OnOffLight.DEVICE_ID;
- public static final int DIMMABLE_LIGHT = DimmableLight.DEVICE_ID;
- public static final int ONOFF_LIGHT_SWITCH = OnOffLightSwitch.DEVICE_ID;
- public static final int LIGHT_SENSOR = LightSensor.DEVICE_ID;
- public static final int OCCUPANCY_SENSOR = OccupancySensor.DEVICE_ID;
- // HVAC - 0x0300 - 0x3FF
- public static final int TEMPERATURE_SENSOR = TemperatureSensor.DEVICE_ID;
- public static final int PUMP = Pump.DEVICE_ID;
- // Intruder Alarm Systems 0x0400 - 0xFFFF
- public static final int IAS_CONTROL_INDICATING_EQUIPMENT = IASControlAndIndicatingEquipment.DEVICE_ID;
- public static final int IASZONE = IAS_Zone.DEVICE_ID;
- public static final int IAS_WARNING_DEVICE = IAS_Warning.DEVICE_ID;
-
- public String getDeviceName(String deviceID){
-
- try{
- String id = Integer.toHexString((Integer.parseInt(deviceID)));
-
- if(id.equals(Integer.toHexString(HAProfile.ONOFF_SWITCH)))
- return OnOffSwitch.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.LEVELCONTROL)))
- return LevelControlSwitch.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.ONOFF_OUTPUT)))
- return OnOffOutput.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.MAINS_POWER_OUTLET)))
- return MainsPowerOutlet.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.SIMPLE_SENSOR)))
- return SimpleSensor.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.ONOFF_LIGHT)))
- return OnOffLight.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.DIMMABLE_LIGHT)))
- return DimmableLight.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.ONOFF_LIGHT_SWITCH)))
- return OnOffLightSwitch.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.LIGHT_SENSOR)))
- return LightSensor.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.OCCUPANCY_SENSOR)))
- return OccupancySensor.NAME;
-
- else if(id.equals(Integer.toHexString(HAProfile.TEMPERATURE_SENSOR)))
- return TemperatureSensor.NAME;
-
- else if(id.equals(Integer.toHexString(HAProfile.IAS_CONTROL_INDICATING_EQUIPMENT)))
- return IASControlAndIndicatingEquipment.NAME;
-
- else if(id.equals(Integer.toHexString(HAProfile.IASZONE)))
- return IAS_Zone.NAME;
-
- else return null;
- }
- catch(Exception ex){
- return null;
- }
- }
-
- public String getClusterName(String clusterID){
-
- try{
- String id = Integer.toHexString((Integer.parseInt(clusterID)));
-
- if(id.equals(Integer.toHexString(HAProfile.BASIC)))
- return Basic.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.POWER_CONFIGURATION)))
- return PowerConfiguration.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.DEVICE_TEMPERATURE_CONFIGURATION)))
- return DeviceTemperatureConfiguration.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.IDENTIFY)))
- return Identify.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.GROUPS)))
- return Groups.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.SCENES)))
- return Scenes.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.ON_OFF)))
- return OnOff.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.ON_OFF_SWITCH_CONFIGURATION)))
- return OnOffSwitchConfiguration.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.LEVEL_CONTROL)))
- return LevelControl.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.ALARMS)))
- return Alarms.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.TIME)))
- return Time.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.BINARY_INPUT)))
- return BinaryInput.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.COMMISSIONING)))
- return Commissioning.NAME;
-
- else if(id.equals(Integer.toHexString(HAProfile.COLOR_CONTROL)))
- return ColorControl.NAME;
-
- else if(id.equals(Integer.toHexString(HAProfile.ILLUMINANCE_MEASUREMENT)))
- return IlluminanceMeasurement.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.TEMPERATURE_MEASUREMENT)))
- return TemperatureMeasurement.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.RELATIVE_HUMIDITY_MEASUREMENT)))
- return RelativeHumidityMeasurement.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.OCCUPANCY_SENSING)))
- return OccupancySensing.NAME;
-
- else if(id.equals(Integer.toHexString(HAProfile.IAS_ZONE)))
- return IASZone.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.IAS_ACE)))
- return IASACE.NAME;
- else if(id.equals(Integer.toHexString(HAProfile.IAS_WD)))
- return IASWD.NAME;
-
- else return null;
- }
- catch(Exception ex){
- return null;
- }
- }
-
- public String getCategoryDeviceName(String deviceID){
-
- try{
- String id = Integer.toHexString((Integer.parseInt(deviceID)));
- if(id.startsWith("0"))
- return "Generic";
- else if(id.startsWith("1"))
- return "Lighting";
- else if(id.startsWith("2"))
- return "Closures";
- else if(id.startsWith("3"))
- return "HVAC";
- else if(id.startsWith("4"))
- return "IAS";
- else
- return null;
- }
- catch(Exception ex){
- return null;
- }
- }
+ public static final int ID = 260;
+
+ //CLUSTERS
+ //Generic
+ public static final int BASIC = Basic.ID;
+ public static final int POWER_CONFIGURATION = PowerConfiguration.ID;
+ public static final int DEVICE_TEMPERATURE_CONFIGURATION = DeviceTemperatureConfiguration.ID;
+ public static final int IDENTIFY = Identify.ID;
+ public static final int GROUPS = Groups.ID;
+ public static final int SCENES = Scenes.ID;
+ public static final int ON_OFF = OnOff.ID;
+ public static final int ON_OFF_SWITCH_CONFIGURATION = OnOffSwitchConfiguration.ID;
+ public static final int LEVEL_CONTROL = LevelControl.ID;
+ public static final int ALARMS = Alarms.ID;
+ public static final int BINARY_INPUT = BinaryInput.ID;
+ //fuori specifica
+ public static final int TIME = Time.ID;
+ public static final int ANALOG_INPUT = AnalogInput.ID;
+ public static final int COMMISSIONING = Commissioning.ID;
+ //Smart Energy
+ public static final int METERING = Metering.ID;
+ //Closures
+ public static final int SHADE_CONFIGURATION = ShadeConfiguration.ID;
+ public static final int DOOR_LOCK = DoorLock.ID;
+ public static final int WINDOW_COVERING = WindowCovering.ID;
+ //HVAC
+ public static final int PUMP_CONFIGURATION_AND_CONTROL = PumpConfigurationAndControl.ID;
+ public static final int THERMOSTAT = Thermostat.ID;
+ public static final int FAN_CONTROL = FanControl.ID;
+ public static final int THERMOSTAT_USER_INTERFACE_CONFIGURATION = ThermostatUserInterfaceConfiguration.ID;
+ // Lighting
+ public static final int COLOR_CONTROL = ColorControl.ID;
+ //Measureament & Sensing
+ public static final int PRESSURE_MEASUREMENT = PressureMeasurement.ID;
+ public static final int ILLUMINANCE_MEASUREMENT = IlluminanceMeasurement.ID;
+ public static final int ILLUMINANCE_LEVEL_SENSING= IlluminanceLevelSensing.ID;
+ public static final int TEMPERATURE_MEASUREMENT = TemperatureMeasurement.ID;
+ public static final int FLOW_MEASUREMENT = FlowMeasurement.ID;
+ public static final int RELATIVE_HUMIDITY_MEASUREMENT = RelativeHumidityMeasurement.ID;
+ public static final int OCCUPANCY_SENSING = OccupancySensing.ID;
+ // Security & Safety
+ public static final int IAS_ZONE = IASZone.ID;
+ public static final int IAS_ACE = IASACE.ID;
+ public static final int IAS_WD = IASWD.ID;
+
+ // devices
+ // GENERIC 0x0000 - 0x00FF
+ public static final int ONOFF_SWITCH = OnOffSwitch.DEVICE_ID;
+ public static final int LEVELCONTROL = LevelControlSwitch.DEVICE_ID;
+ public static final int ONOFF_OUTPUT = OnOffOutput.DEVICE_ID;
+ public static final int MAINS_POWER_OUTLET = MainsPowerOutlet.DEVICE_ID;
+ public static final int SIMPLE_SENSOR = SimpleSensor.DEVICE_ID;
+ // LIGHTNING 0x0100 - 0x1FF
+ public static final int ONOFF_LIGHT = OnOffLight.DEVICE_ID;
+ public static final int DIMMABLE_LIGHT = DimmableLight.DEVICE_ID;
+ public static final int ONOFF_LIGHT_SWITCH = OnOffLightSwitch.DEVICE_ID;
+ public static final int LIGHT_SENSOR = LightSensor.DEVICE_ID;
+ public static final int OCCUPANCY_SENSOR = OccupancySensor.DEVICE_ID;
+ // HVAC - 0x0300 - 0x3FF
+ public static final int TEMPERATURE_SENSOR = TemperatureSensor.DEVICE_ID;
+ public static final int PUMP = Pump.DEVICE_ID;
+ // Intruder Alarm Systems 0x0400 - 0xFFFF
+ public static final int IAS_CONTROL_INDICATING_EQUIPMENT = IASControlAndIndicatingEquipment.DEVICE_ID;
+ public static final int IASZONE = IAS_Zone.DEVICE_ID;
+ public static final int IAS_WARNING_DEVICE = IAS_Warning.DEVICE_ID;
+
+
+/* legacy??
+ public String getDeviceName(String deviceID){
+
+ try{
+
+
+ int id = Integer.parseInt(deviceID);
+ switch (id) {
+ case HAProfile.ONOFF_SWITCH:
+ return OnOffSwitch.NAME;
+ break;
+ case HAProfile.LEVELCONTROL:
+ return OnOffSwitch.NAME;
+ break;
+ case HAProfile.ONOFF_OUTPUT:
+ return OnOffSwitch.NAME;
+ break;
+ case HAProfile.MAINS_POWER_OUTLET:
+ return OnOffSwitch.NAME;
+ break;
+ case HAProfile.SIMPLE_SENSOR:
+ return OnOffSwitch.NAME;
+ break;
+ case HAProfile.ONOFF_LIGHT:
+ return OnOffSwitch.NAME;
+ break;
+ case HAProfile.DIMMABLE_LIGHT:
+ return OnOffSwitch.NAME;
+ break;
+ case HAProfile.ONOFF_LIGHT_SWITCH:
+ return OnOffSwitch.NAME;
+ break;
+ case HAProfile.LIGHT_SENSOR:
+ return OnOffSwitch.NAME;
+ break;
+ case HAProfile.OCCUPANCY_SENSOR:
+ return OnOffSwitch.NAME;
+ break;
+ case HAProfile.TEMPERATURE_SENSOR:
+ return OnOffSwitch.NAME;
+ break;
+ case HAProfile.IAS_CONTROL_INDICATING_EQUIPMENT:
+ return OnOffSwitch.NAME;
+ break;
+ case HAProfile.temperature_sensor:
+ return OnOffSwitch.NAME;
+ break;
+ case HAProfile.TEMPERATURE_SENSOR:
+ return OnOffSwitch.NAME;
+ break;
+ case HAProfile.TEMPERATURE_SENSOR:
+ return OnOffSwitch.NAME;
+ break;
+
+ default:
+ break;
+ }
+
+
+
+
+
+
+
+
+ // String id = Integer.toHexString((Integer.parseInt(deviceID)));
+
+ if(id.equals(Integer.toHexString(HAProfile.ONOFF_SWITCH)))
+ return OnOffSwitch.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.LEVELCONTROL)))
+ return LevelControlSwitch.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.ONOFF_OUTPUT)))
+ return OnOffOutput.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.MAINS_POWER_OUTLET)))
+ return MainsPowerOutlet.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.SIMPLE_SENSOR)))
+ return SimpleSensor.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.ONOFF_LIGHT)))
+ return OnOffLight.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.DIMMABLE_LIGHT)))
+ return DimmableLight.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.ONOFF_LIGHT_SWITCH)))
+ return OnOffLightSwitch.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.LIGHT_SENSOR)))
+ return LightSensor.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.OCCUPANCY_SENSOR)))
+ return OccupancySensor.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.TEMPERATURE_SENSOR)))
+ return TemperatureSensor.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.IAS_CONTROL_INDICATING_EQUIPMENT)))
+ return IASControlAndIndicatingEquipment.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.PRESSURE_MEASUREMENT)))
+ return PressureMeasurement.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.FLOW_MEASUREMENT)))
+ return FlowMeasurement.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.ILLUMINANCE_LEVEL_SENSING)))
+ return IlluminanceLevelSensing.NAME;
+
+
+
+ else return null;
+ }
+ catch(Exception ex){
+ return null;
+ }
+ }
+
+ public String getClusterName(String clusterID){
+
+ try{
+ String id = Integer.toHexString((Integer.parseInt(clusterID)));
+
+ if(id.equals(Integer.toHexString(HAProfile.BASIC)))
+ return Basic.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.POWER_CONFIGURATION)))
+ return PowerConfiguration.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.DEVICE_TEMPERATURE_CONFIGURATION)))
+ return DeviceTemperatureConfiguration.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.IDENTIFY)))
+ return Identify.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.GROUPS)))
+ return Groups.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.SCENES)))
+ return Scenes.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.ON_OFF)))
+ return OnOff.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.ON_OFF_SWITCH_CONFIGURATION)))
+ return OnOffSwitchConfiguration.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.LEVEL_CONTROL)))
+ return LevelControl.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.ALARMS)))
+ return Alarms.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.TIME)))
+ return Time.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.BINARY_INPUT)))
+ return BinaryInput.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.COMMISSIONING)))
+ return Commissioning.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.COLOR_CONTROL)))
+ return ColorControl.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.ILLUMINANCE_MEASUREMENT)))
+ return IlluminanceMeasurement.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.TEMPERATURE_MEASUREMENT)))
+ return TemperatureMeasurement.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.RELATIVE_HUMIDITY_MEASUREMENT)))
+ return RelativeHumidityMeasurement.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.OCCUPANCY_SENSING)))
+ return OccupancySensing.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.IAS_ZONE)))
+ return IASZone.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.IAS_ACE)))
+ return IASACE.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.IAS_WD)))
+ return IASWD.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.ANALOG_INPUT)))
+ return AnalogInput.NAME;
+ else if(id.equals(Integer.toHexString(HAProfile.METERING)))
+ return Metering.NAME;
+
+ else return null;
+ }
+ catch(Exception ex){
+ return null;
+ }
+ }
+
+ public String getCategoryDeviceName(String deviceID){
+
+ try{
+ String id = Integer.toHexString((Integer.parseInt(deviceID)));
+ if(id.startsWith("0"))
+ return "Generic";
+ else if(id.startsWith("1"))
+ return "Lighting";
+ else if(id.startsWith("2"))
+ return "Closures";
+ else if(id.startsWith("3"))
+ return "HVAC";
+ else if(id.startsWith("4"))
+ return "IAS";
+ else
+ return null;
+ }
+ catch(Exception ex){
+ return null;
+ }
+ }*/
}
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/clusters/api/Clusters.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/clusters/api/Clusters.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/clusters/api/Clusters.java Wed Sep 18 16:05:26 2013
@@ -22,6 +22,7 @@
package it.cnr.isti.zigbee.zcl.clusters.api;
import it.cnr.isti.zigbee.zcl.library.api.general.Alarms;
+import it.cnr.isti.zigbee.zcl.library.api.general.AnalogInput;
import it.cnr.isti.zigbee.zcl.library.api.general.Basic;
import it.cnr.isti.zigbee.zcl.library.api.general.Commissioning;
import it.cnr.isti.zigbee.zcl.library.api.general.DeviceTemperatureConfiguration;
@@ -42,10 +43,12 @@
import it.cnr.isti.zigbee.zcl.library.api.security_safety.IASACE;
import it.cnr.isti.zigbee.zcl.library.api.security_safety.IASWD;
import it.cnr.isti.zigbee.zcl.library.api.security_safety.IASZone;
+import it.cnr.isti.zigbee.zcl.library.api.smart_energy.Metering;
/**
*
* @author <a href="mailto:manlio.bacco at isti.cnr.it">Manlio Bacco</a>
+ * @author <a href="mailto:giancarlo.riolo at isti.cnr.it">Giancarlo Riolo</a>
* @version $LastChangedRevision$ ($LastChangedDate$)
* @since 0.8.0
*
@@ -76,19 +79,40 @@
public static final String IAS_ACE = "1281";
public static final String IAS_WD = "1282";
public static final String IAS_ZONE = "1280";
+
+ public static final String ANALOG_INPUT = "12";
+ public static final String METERING = "1794";
- public static final String[][] cluster_impl = {new String[]{ALARMS, Alarms.class.getName()}, new String[]{BASIC, Basic.class.getName()},
- new String[]{COMMISSIONING, Commissioning.class.getName()}, new String[]{DEVICE_TEMPERATURE_CONFIGURATION, DeviceTemperatureConfiguration.class.getName()},
- new String[]{GROUPS, Groups.class.getName()}, new String[]{IDENTIFY, Identify.class.getName()}, new String[]{LEVEL_CONTROL, LevelControl.class.getName()},
- new String[]{ON_OFF, OnOff.class.getName()}, new String[]{ON_OFF_SWITCH_CONFIGURATION, OnOffSwitchConfiguration.class.getName()},
- new String[]{POWER_CONFIGURATION, PowerConfiguration.class.getName()}, new String[]{RSSI_LOCATION, RSSILocation.class.getName()},
- new String[]{SCENES, Scenes.class.getName()}, new String[]{TIME, Time.class.getName()},
+ public static final String[][] cluster_impl = {
+ new String[]{ALARMS, Alarms.class.getName()},
+ new String[]{BASIC, Basic.class.getName()},
+ new String[]{COMMISSIONING, Commissioning.class.getName()},
+ new String[]{DEVICE_TEMPERATURE_CONFIGURATION, DeviceTemperatureConfiguration.class.getName()},
+ new String[]{GROUPS, Groups.class.getName()},
+ new String[]{IDENTIFY, Identify.class.getName()},
+ new String[]{LEVEL_CONTROL, LevelControl.class.getName()},
+ new String[]{ON_OFF, OnOff.class.getName()},
+ new String[]{ON_OFF_SWITCH_CONFIGURATION, OnOffSwitchConfiguration.class.getName()},
+ new String[]{POWER_CONFIGURATION, PowerConfiguration.class.getName()},
+ new String[]{RSSI_LOCATION, RSSILocation.class.getName()},
+ new String[]{SCENES, Scenes.class.getName()},
+ new String[]{TIME, Time.class.getName()},
new String[]{COLOR_CONTROL, ColorControl.class.getName()},
- new String[]{ILLUMINANCE_MEASUREMENT, IlluminanceMeasurement.class.getName()}, new String[]{OCCUPANCY_SENSING, OccupancySensing.class.getName()},
+ new String[]{ILLUMINANCE_MEASUREMENT, IlluminanceMeasurement.class.getName()},
+ new String[]{OCCUPANCY_SENSING, OccupancySensing.class.getName()},
new String[]{RELATIVE_HUMIDITY_MEASUREMENT, RelativeHumidityMeasurement.class.getName()},
new String[]{TEMPERATURE_MEASUREMENT, TemperatureMeasurement.class.getName()},
- new String[]{IAS_ACE, IASACE.class.getName()},new String[]{IAS_WD, IASWD.class.getName()},new String[]{IAS_ZONE, IASZone.class.getName()}};
+ new String[]{IAS_ACE, IASACE.class.getName()},
+ new String[]{IAS_WD, IASWD.class.getName()},
+ new String[]{IAS_ZONE, IASZone.class.getName()},
+
+
+ new String[]{ANALOG_INPUT, AnalogInput.class.getName()},
+ new String[]{METERING, Metering.class.getName()},
+ };
+
+
}
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/HVAC/FanControl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/HVAC/FanControl.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/HVAC/FanControl.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,43 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.api.HVAC;
+
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZCLCluster;
+
+
+/**
+ * This class represent the <b>Fan Control</b> Cluster as defined by the document:<br>
+ * <i>ZigBee Cluster Library</i> public release version 075123r01ZB
+ *
+ */
+
+public interface FanControl extends ZCLCluster {
+
+ public static final short ID = 0x0202;
+ static final String NAME = "Fan Control";
+ static final String DESCRIPTION = "blablabla";
+
+ public Attribute getAttributeDescription();
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/HVAC/FanControl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/HVAC/PumpConfigurationAndControl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/HVAC/PumpConfigurationAndControl.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/HVAC/PumpConfigurationAndControl.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,43 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.api.HVAC;
+
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZCLCluster;
+
+
+/**
+ * This class represent the <b>Pump Configuration And Control</b> Cluster as defined by the document:<br>
+ * <i>ZigBee Cluster Library</i> public release version 075123r01ZB
+ *
+ */
+
+public interface PumpConfigurationAndControl extends ZCLCluster {
+
+ public static final short ID = 0x0200;
+ static final String NAME = "Pump Configuration And Control";
+ static final String DESCRIPTION = "blablabla";
+
+ public Attribute getAttributeDescription();
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/HVAC/PumpConfigurationAndControl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/HVAC/Thermostat.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/HVAC/Thermostat.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/HVAC/Thermostat.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,43 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.api.HVAC;
+
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZCLCluster;
+
+
+/**
+ * This class represent the <b>Thermostat</b> Cluster as defined by the document:<br>
+ * <i>ZigBee Cluster Library</i> public release version 075123r01ZB
+ *
+ */
+
+public interface Thermostat extends ZCLCluster {
+
+ public static final short ID = 0x0201;
+ static final String NAME = "Thermostat";
+ static final String DESCRIPTION = "blablabla";
+
+ public Attribute getAttributeDescription();
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/HVAC/Thermostat.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/HVAC/ThermostatUserInterfaceConfiguration.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/HVAC/ThermostatUserInterfaceConfiguration.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/HVAC/ThermostatUserInterfaceConfiguration.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,43 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.api.HVAC;
+
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZCLCluster;
+
+
+/**
+ * This class represent the <b>Pump Configuration And Control</b> Cluster as defined by the document:<br>
+ * <i>ZigBee Cluster Library</i> public release version 075123r01ZB
+ *
+ */
+
+public interface ThermostatUserInterfaceConfiguration extends ZCLCluster {
+
+ public static final short ID = 0x0204;
+ static final String NAME = "Pump Configuration And Control";
+ static final String DESCRIPTION = "blablabla";
+
+ public Attribute getAttributeDescription();
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/HVAC/ThermostatUserInterfaceConfiguration.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/closures/DoorLock.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/closures/DoorLock.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/closures/DoorLock.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,43 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.api.closures;
+
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZCLCluster;
+
+
+/**
+ * This class represent the <b>Door Lock</b> Cluster as defined by the document:<br>
+ * <i>ZigBee Cluster Library</i> public release version 075123r01ZB
+ *
+ */
+
+public interface DoorLock extends ZCLCluster {
+
+ public static final short ID = 0x101;
+ static final String NAME = "Door Lock";
+ static final String DESCRIPTION = "blablabla";
+
+ public Attribute getAttributeDescription();
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/closures/DoorLock.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/closures/ShadeConfiguration.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/closures/ShadeConfiguration.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/closures/ShadeConfiguration.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,43 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.api.closures;
+
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZCLCluster;
+
+
+/**
+ * This class represent the <b>Shade Configuration</b> Cluster as defined by the document:<br>
+ * <i>ZigBee Cluster Library</i> public release version 075123r01ZB
+ *
+ */
+
+public interface ShadeConfiguration extends ZCLCluster {
+
+ public static final short ID = 0x100;
+ static final String NAME = "Shade Configuration";
+ static final String DESCRIPTION = "blablabla";
+
+ public Attribute getAttributeDescription();
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/closures/ShadeConfiguration.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/closures/WindowCovering.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/closures/WindowCovering.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/closures/WindowCovering.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,43 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.api.closures;
+
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZCLCluster;
+
+
+/**
+ * This class represent the <b>Window Covering</b> Cluster as defined by the document:<br>
+ * <i>ZigBee Cluster Library</i> public release version 075123r01ZB
+ *
+ */
+
+public interface WindowCovering extends ZCLCluster {
+
+ public static final short ID = 0x102;
+ static final String NAME = "Window Covering";
+ static final String DESCRIPTION = "blablabla";
+
+ public Attribute getAttributeDescription();
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/closures/WindowCovering.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/core/ZigBeeType.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/core/ZigBeeType.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/core/ZigBeeType.java Wed Sep 18 16:05:26 2013
@@ -28,6 +28,7 @@
*
* @author <a href="mailto:stefano.lenzi at isti.cnr.it">Stefano "Kismet" Lenzi</a>
* @author <a href="mailto:francesco.furfari at isti.cnr.it">Francesco Furfari</a>
+ * @author <a href="mailto:giancarlo.riolo at isti.cnr.it">Giancarlo Riolo</a>
* @version $LastChangedRevision$ ($LastChangedDate$)
*
*/
@@ -58,7 +59,11 @@
SignedInteger8bit(0x28, 1, true, Integer.class),
SignedInteger16bit(0x29, 2, true, Integer.class),
SignedInteger24bit(0x2a, 3, true, Integer.class),
- SignedInteger32bit(0x2b, 4, true, Integer.class);
+ SignedInteger32bit(0x2b, 4, true, Integer.class),
+ SemiPrecision(0x38, 2, true, Short.class),
+ SinglePrecision(0x39, 4, true, Float.class),
+ DoublePrecision(0x3a, 8, true, Double.class);
+
static Hashtable<Byte, ZigBeeType> MAP;
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/AnalogInput.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/AnalogInput.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/AnalogInput.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,54 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.api.general;
+
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.Response;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZCLCluster;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
+
+/**
+ * This class represent the <b>Groups</b> Cluster as defined by the document:<br>
+ * <i>ZigBee Cluster Library</i> public release version 075123r01ZB
+ *
+ */
+
+public interface AnalogInput extends ZCLCluster {
+
+ public static final short ID = 0x000C;
+ static final String NAME = "AnalogInput";
+ static final String DESCRIPTION = "An interface for reading the value of an analog measurement and accessing various characteristics of that measurement.";
+
+
+ public Attribute getAttributeDescription();
+ public Attribute getAttributeMaxPresentValue();
+ public Attribute getAttributeMinPresentValue();
+ public Attribute getAttributeOutOfService();
+ public Attribute getAttributePresentValue();
+ public Attribute getAttributeReliability();
+ public Attribute getAttributeResolution();
+ public Attribute getAttributeStatusFlags();
+ public Attribute getAttributeEngineeringUnits();
+ public Attribute getAttributeApplicationType();
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/AnalogInput.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/FlowMeasurement.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/FlowMeasurement.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/FlowMeasurement.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,43 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.api.measureament_sensing;
+
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZCLCluster;
+
+
+/**
+ * This class represent the <b>Flow Measurement</b> Cluster as defined by the document:<br>
+ * <i>ZigBee Cluster Library</i> public release version 075123r01ZB
+ *
+ */
+
+public interface FlowMeasurement extends ZCLCluster {
+
+ public static final short ID = 0x0404;
+ static final String NAME = "Flow Measurement";
+ static final String DESCRIPTION = "blablabla";
+
+ public Attribute getAttributeDescription();
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/FlowMeasurement.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/IlluminanceLevelSensing.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/IlluminanceLevelSensing.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/IlluminanceLevelSensing.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,44 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.api.measureament_sensing;
+
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.Response;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZCLCluster;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
+
+/**
+ * This class represent the <b>Illuminance Level Sensing</b> Cluster as defined by the document:<br>
+ * <i>ZigBee Cluster Library</i> public release version 075123r01ZB
+ *
+ */
+
+public interface IlluminanceLevelSensing extends ZCLCluster {
+
+ public static final short ID = 0x0401;
+ static final String NAME = "Illuminance Level Sensing";
+ static final String DESCRIPTION = "blablabla";
+
+ public Attribute getAttributeDescription();
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/IlluminanceLevelSensing.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/PressureMeasurement.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/PressureMeasurement.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/PressureMeasurement.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,45 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.api.measureament_sensing;
+
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.Response;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZCLCluster;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
+
+/**
+ * This class represent the <b>Metering</b> Cluster as defined by the document:<br>
+ * <i>ZigBee Cluster Library</i> public release version 075123r01ZB
+ *
+ */
+
+public interface PressureMeasurement extends ZCLCluster {
+
+ public static final short ID = 0x0403;
+ static final String NAME = "Pressure Measurement";
+ static final String DESCRIPTION = "Attributes and commands for configuring the measurement"
+ + " of pressure, and reporting pressure measurements";
+
+ public Attribute getAttributeDescription();
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/PressureMeasurement.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/smart_energy/Metering.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/smart_energy/Metering.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/smart_energy/Metering.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,44 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.api.smart_energy;
+
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.Response;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZCLCluster;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
+
+/**
+ * This class represent the <b>Metering</b> Cluster as defined by the document:<br>
+ * <i>ZigBee Cluster Library</i> public release version 075123r01ZB
+ *
+ */
+
+public interface Metering extends ZCLCluster {
+
+ public static final short ID = 0x0702;
+ static final String NAME = "Metering";
+ static final String DESCRIPTION = "Mechanism to retrieve usage information from Electric, Gas, Water and potentially metering devices";
+
+ public Attribute getAttributeDescription();
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/smart_energy/Metering.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/attribute/Attributes.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/attribute/Attributes.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/attribute/Attributes.java Wed Sep 18 16:05:26 2013
@@ -29,6 +29,7 @@
* @author <a href="mailto:francesco.furfari at isti.cnr.it">Francesco Furfari</a>
* @author <a href="mailto:manlio.bacco at isti.cnr.it">Manlio Bacco</a>
* @author <a href="mailto:h.alink1 at chello.nl">Han Alink</a>
+ * @author <a href="mailto:giancarlo.riolo at isti.cnr.it">Giancarlo Riolo</a>
* @version $LastChangedRevision$ ($LastChangedDate$)
*/
public class Attributes {
@@ -894,4 +895,33 @@
.setReportable(false)
.setZigBeeType(ZigBeeType.CharacterString)
.setWritable(true);
+
+ public static final AttributeDescriptor MAX_PRESENT_VALUE = new AbstractAttribute()
+ .setId(0x0041)
+ .setName("MaxPresentValue")
+ .setReportable(false)
+ .setZigBeeType(ZigBeeType.SinglePrecision)
+ .setWritable(true);
+
+ public static final AttributeDescriptor MIN_PRESENT_VALUE= new AbstractAttribute()
+ .setId(0x0045)
+ .setName("MinPresentValue")
+ .setReportable(false)
+ .setZigBeeType(ZigBeeType.SinglePrecision)
+ .setWritable(true);
+
+ public static final AttributeDescriptor RESOLUTION = new AbstractAttribute()
+ .setId(0x006A)
+ .setName("Resolution")
+ .setReportable(false)
+ .setZigBeeType(ZigBeeType.SinglePrecision)
+ .setWritable(true);
+
+ public static final AttributeDescriptor ENGINEERING_UNITS = new AbstractAttribute()
+ .setId(0x0075)
+ .setName("EngineeringUnits")
+ .setReportable(false)
+ .setZigBeeType(ZigBeeType.Enumeration16bit)
+ .setWritable(true);
+
}
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/AnalogInputCluster.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/AnalogInputCluster.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/AnalogInputCluster.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,140 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.general;
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.core.Response;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
+import it.cnr.isti.zigbee.zcl.library.api.general.AnalogInput;
+import it.cnr.isti.zigbee.zcl.library.api.general.Scenes;
+import it.cnr.isti.zigbee.zcl.library.impl.attribute.Attributes;
+import it.cnr.isti.zigbee.zcl.library.impl.core.AttributeImpl;
+import it.cnr.isti.zigbee.zcl.library.impl.core.ZCLClusterBase;
+
+
+public class AnalogInputCluster extends ZCLClusterBase implements AnalogInput {
+
+
+
+
+
+ private final AttributeImpl description;
+ private final AttributeImpl maxPresentValue;
+ private final AttributeImpl minPresentValue;
+ private final AttributeImpl outOfService;
+ private final AttributeImpl presentValue;
+ private final AttributeImpl reliability;
+ private final AttributeImpl resolution;
+ private final AttributeImpl statusFlags;
+ private final AttributeImpl engineeringUnits;
+ private final AttributeImpl applicationType;
+
+ private final Attribute[] attributes;
+
+ public AnalogInputCluster(ZigBeeDevice zbDevice){
+ super(zbDevice);
+
+ description = new AttributeImpl(zbDevice,this,Attributes.DESCRIPTION);
+ maxPresentValue = new AttributeImpl(zbDevice,this,Attributes.MAX_PRESENT_VALUE);
+ minPresentValue = new AttributeImpl(zbDevice,this,Attributes.MIN_PRESENT_VALUE);
+ outOfService = new AttributeImpl(zbDevice,this,Attributes.OUT_OF_SERVICE);
+ presentValue = new AttributeImpl(zbDevice,this,Attributes.PRESENT_VALUE);
+ reliability = new AttributeImpl(zbDevice,this,Attributes.RELIABILITY);
+ resolution = new AttributeImpl(zbDevice,this,Attributes.RESOLUTION);
+ statusFlags = new AttributeImpl(zbDevice,this,Attributes.STATUS_FLAGS);
+ engineeringUnits = new AttributeImpl(zbDevice,this,Attributes.ENGINEERING_UNITS);
+ applicationType = new AttributeImpl(zbDevice,this,Attributes.APPLICATION_TYPE);
+
+
+ attributes = new AttributeImpl[]{description,maxPresentValue,minPresentValue,outOfService,
+ presentValue,reliability,resolution,statusFlags,engineeringUnits,applicationType
+ };
+ }
+
+ @Override
+ public short getId() {
+ return AnalogInput.ID;
+ }
+
+ @Override
+ public String getName() {
+ return AnalogInput.NAME;
+ }
+
+ @Override
+ public Attribute[] getStandardAttributes() {
+ return attributes;
+ }
+
+
+
+ public Attribute getAttributeDescription() {
+ return description;
+ }
+
+ public Attribute getAttributeMaxPresentValue() {
+ return maxPresentValue;
+ }
+
+ public Attribute getAttributeMinPresentValue() {
+ return minPresentValue;
+ }
+
+ public Attribute getAttributeOutOfService() {
+ return outOfService;
+ }
+
+ public Attribute getAttributePresentValue() {
+ return presentValue;
+ }
+
+ public Attribute getAttributeReliability() {
+ return reliability;
+ }
+
+ public Attribute getAttributeResolution() {
+ return resolution;
+ }
+ public Attribute getAttributeStatusFlags() {
+ return statusFlags;
+ }
+
+
+ public Attribute getAttributeEngineeringUnits() {
+ return engineeringUnits;
+ }
+
+ public Attribute getAttributeApplicationType() {
+ return applicationType;
+ }
+
+
+
+
+
+
+
+
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/AnalogInputCluster.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/DoorLockCluster.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/DoorLockCluster.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/DoorLockCluster.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,78 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.general;
+
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.zcl.library.api.closures.DoorLock;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.impl.attribute.Attributes;
+import it.cnr.isti.zigbee.zcl.library.impl.core.AttributeImpl;
+import it.cnr.isti.zigbee.zcl.library.impl.core.ZCLClusterBase;
+
+
+public class DoorLockCluster extends ZCLClusterBase implements DoorLock {
+
+
+
+ private static AttributeImpl description;
+ private final Attribute[] attributes;
+
+ public DoorLockCluster(ZigBeeDevice zbDevice){
+ super(zbDevice);
+
+
+
+ description = new AttributeImpl(zbDevice,this,Attributes.DESCRIPTION);
+
+ attributes = new AttributeImpl[]{description};
+ }
+
+
+
+ @Override
+ public short getId() {
+ return DoorLock.ID;
+ }
+
+ @Override
+ public String getName() {
+ return DoorLock.NAME;
+ }
+
+ @Override
+ public Attribute[] getStandardAttributes() {
+ return attributes;
+ }
+
+
+
+ public Attribute getAttributeDescription() {
+ return description;
+ }
+
+
+
+
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/DoorLockCluster.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/FanControlCluster.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/FanControlCluster.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/FanControlCluster.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,78 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.general;
+
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.zcl.library.api.HVAC.FanControl;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.impl.attribute.Attributes;
+import it.cnr.isti.zigbee.zcl.library.impl.core.AttributeImpl;
+import it.cnr.isti.zigbee.zcl.library.impl.core.ZCLClusterBase;
+
+
+public class FanControlCluster extends ZCLClusterBase implements FanControl {
+
+
+
+ private static AttributeImpl description;
+ private final Attribute[] attributes;
+
+ public FanControlCluster(ZigBeeDevice zbDevice){
+ super(zbDevice);
+
+
+
+ description = new AttributeImpl(zbDevice,this,Attributes.DESCRIPTION);
+
+ attributes = new AttributeImpl[]{description};
+ }
+
+
+
+ @Override
+ public short getId() {
+ return FanControl.ID;
+ }
+
+ @Override
+ public String getName() {
+ return FanControl.NAME;
+ }
+
+ @Override
+ public Attribute[] getStandardAttributes() {
+ return attributes;
+ }
+
+
+
+ public Attribute getAttributeDescription() {
+ return description;
+ }
+
+
+
+
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/FanControlCluster.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/FlowMeasurementCluster.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/FlowMeasurementCluster.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/FlowMeasurementCluster.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,78 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.general;
+
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.measureament_sensing.FlowMeasurement;
+import it.cnr.isti.zigbee.zcl.library.impl.attribute.Attributes;
+import it.cnr.isti.zigbee.zcl.library.impl.core.AttributeImpl;
+import it.cnr.isti.zigbee.zcl.library.impl.core.ZCLClusterBase;
+
+
+public class FlowMeasurementCluster extends ZCLClusterBase implements FlowMeasurement {
+
+
+
+ private static AttributeImpl description;
+ private final Attribute[] attributes;
+
+ public FlowMeasurementCluster(ZigBeeDevice zbDevice){
+ super(zbDevice);
+
+
+
+ description = new AttributeImpl(zbDevice,this,Attributes.DESCRIPTION);
+
+ attributes = new AttributeImpl[]{description};
+ }
+
+
+
+ @Override
+ public short getId() {
+ return FlowMeasurement.ID;
+ }
+
+ @Override
+ public String getName() {
+ return FlowMeasurement.NAME;
+ }
+
+ @Override
+ public Attribute[] getStandardAttributes() {
+ return attributes;
+ }
+
+
+
+ public Attribute getAttributeDescription() {
+ return description;
+ }
+
+
+
+
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/FlowMeasurementCluster.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/IlluminanceLevelSensingCluster.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/IlluminanceLevelSensingCluster.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/IlluminanceLevelSensingCluster.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,77 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.general;
+
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.measureament_sensing.IlluminanceLevelSensing;
+import it.cnr.isti.zigbee.zcl.library.impl.attribute.Attributes;
+import it.cnr.isti.zigbee.zcl.library.impl.core.AttributeImpl;
+import it.cnr.isti.zigbee.zcl.library.impl.core.ZCLClusterBase;
+
+
+public class IlluminanceLevelSensingCluster extends ZCLClusterBase implements IlluminanceLevelSensing {
+
+
+
+ private static AttributeImpl description;
+ private final Attribute[] attributes;
+
+ public IlluminanceLevelSensingCluster(ZigBeeDevice zbDevice){
+ super(zbDevice);
+
+
+
+ description = new AttributeImpl(zbDevice,this,Attributes.DESCRIPTION);
+ attributes = new AttributeImpl[]{description};
+ }
+
+
+
+ @Override
+ public short getId() {
+ return IlluminanceLevelSensing.ID;
+ }
+
+ @Override
+ public String getName() {
+ return IlluminanceLevelSensing.NAME;
+ }
+
+ @Override
+ public Attribute[] getStandardAttributes() {
+ return attributes;
+ }
+
+
+
+ public Attribute getAttributeDescription() {
+ return description;
+ }
+
+
+
+
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/IlluminanceLevelSensingCluster.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/MeteringCluster.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/MeteringCluster.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/MeteringCluster.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,78 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.general;
+
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.smart_energy.Metering;
+import it.cnr.isti.zigbee.zcl.library.impl.attribute.Attributes;
+import it.cnr.isti.zigbee.zcl.library.impl.core.AttributeImpl;
+import it.cnr.isti.zigbee.zcl.library.impl.core.ZCLClusterBase;
+
+
+public class MeteringCluster extends ZCLClusterBase implements Metering {
+
+
+
+ private static AttributeImpl description;
+ private final Attribute[] attributes;
+
+ public MeteringCluster(ZigBeeDevice zbDevice){
+ super(zbDevice);
+
+
+
+ description = new AttributeImpl(zbDevice,this,Attributes.DESCRIPTION);
+
+ attributes = new AttributeImpl[]{description};
+ }
+
+
+
+ @Override
+ public short getId() {
+ return Metering.ID;
+ }
+
+ @Override
+ public String getName() {
+ return Metering.NAME;
+ }
+
+ @Override
+ public Attribute[] getStandardAttributes() {
+ return attributes;
+ }
+
+
+
+ public Attribute getAttributeDescription() {
+ return description;
+ }
+
+
+
+
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/MeteringCluster.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/PressureMeasurementCluster.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/PressureMeasurementCluster.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/PressureMeasurementCluster.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,77 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.general;
+
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.api.measureament_sensing.PressureMeasurement;
+import it.cnr.isti.zigbee.zcl.library.impl.attribute.Attributes;
+import it.cnr.isti.zigbee.zcl.library.impl.core.AttributeImpl;
+import it.cnr.isti.zigbee.zcl.library.impl.core.ZCLClusterBase;
+
+
+public class PressureMeasurementCluster extends ZCLClusterBase implements PressureMeasurement {
+
+
+ private static AttributeImpl description;
+ private final Attribute[] attributes;
+
+ public PressureMeasurementCluster(ZigBeeDevice zbDevice){
+ super(zbDevice);
+
+
+
+ description = new AttributeImpl(zbDevice,this,Attributes.DESCRIPTION);
+
+ attributes = new AttributeImpl[]{description};
+ }
+
+
+
+ @Override
+ public short getId() {
+ return PressureMeasurement.ID;
+ }
+
+ @Override
+ public String getName() {
+ return PressureMeasurement.NAME;
+ }
+
+ @Override
+ public Attribute[] getStandardAttributes() {
+ return attributes;
+ }
+
+
+
+ public Attribute getAttributeDescription() {
+ return description;
+ }
+
+
+
+
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/PressureMeasurementCluster.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/PumpConfigurationAndControlCluster.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/PumpConfigurationAndControlCluster.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/PumpConfigurationAndControlCluster.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,78 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.general;
+
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.zcl.library.api.HVAC.PumpConfigurationAndControl;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.impl.attribute.Attributes;
+import it.cnr.isti.zigbee.zcl.library.impl.core.AttributeImpl;
+import it.cnr.isti.zigbee.zcl.library.impl.core.ZCLClusterBase;
+
+
+public class PumpConfigurationAndControlCluster extends ZCLClusterBase implements PumpConfigurationAndControl {
+
+
+
+ private static AttributeImpl description;
+ private final Attribute[] attributes;
+
+ public PumpConfigurationAndControlCluster(ZigBeeDevice zbDevice){
+ super(zbDevice);
+
+
+
+ description = new AttributeImpl(zbDevice,this,Attributes.DESCRIPTION);
+
+ attributes = new AttributeImpl[]{description};
+ }
+
+
+
+ @Override
+ public short getId() {
+ return PumpConfigurationAndControl.ID;
+ }
+
+ @Override
+ public String getName() {
+ return PumpConfigurationAndControl.NAME;
+ }
+
+ @Override
+ public Attribute[] getStandardAttributes() {
+ return attributes;
+ }
+
+
+
+ public Attribute getAttributeDescription() {
+ return description;
+ }
+
+
+
+
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/PumpConfigurationAndControlCluster.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/ShadeConfigurationCluster.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/ShadeConfigurationCluster.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/ShadeConfigurationCluster.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,78 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.general;
+
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.zcl.library.api.closures.ShadeConfiguration;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.impl.attribute.Attributes;
+import it.cnr.isti.zigbee.zcl.library.impl.core.AttributeImpl;
+import it.cnr.isti.zigbee.zcl.library.impl.core.ZCLClusterBase;
+
+
+public class ShadeConfigurationCluster extends ZCLClusterBase implements ShadeConfiguration {
+
+
+
+ private static AttributeImpl description;
+ private final Attribute[] attributes;
+
+ public ShadeConfigurationCluster(ZigBeeDevice zbDevice){
+ super(zbDevice);
+
+
+
+ description = new AttributeImpl(zbDevice,this,Attributes.DESCRIPTION);
+
+ attributes = new AttributeImpl[]{description};
+ }
+
+
+
+ @Override
+ public short getId() {
+ return ShadeConfiguration.ID;
+ }
+
+ @Override
+ public String getName() {
+ return ShadeConfiguration.NAME;
+ }
+
+ @Override
+ public Attribute[] getStandardAttributes() {
+ return attributes;
+ }
+
+
+
+ public Attribute getAttributeDescription() {
+ return description;
+ }
+
+
+
+
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/ShadeConfigurationCluster.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/ThermostatCluster.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/ThermostatCluster.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/ThermostatCluster.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,78 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.general;
+
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.zcl.library.api.HVAC.Thermostat;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.impl.attribute.Attributes;
+import it.cnr.isti.zigbee.zcl.library.impl.core.AttributeImpl;
+import it.cnr.isti.zigbee.zcl.library.impl.core.ZCLClusterBase;
+
+
+public class ThermostatCluster extends ZCLClusterBase implements Thermostat {
+
+
+
+ private static AttributeImpl description;
+ private final Attribute[] attributes;
+
+ public ThermostatCluster(ZigBeeDevice zbDevice){
+ super(zbDevice);
+
+
+
+ description = new AttributeImpl(zbDevice,this,Attributes.DESCRIPTION);
+
+ attributes = new AttributeImpl[]{description};
+ }
+
+
+
+ @Override
+ public short getId() {
+ return Thermostat.ID;
+ }
+
+ @Override
+ public String getName() {
+ return Thermostat.NAME;
+ }
+
+ @Override
+ public Attribute[] getStandardAttributes() {
+ return attributes;
+ }
+
+
+
+ public Attribute getAttributeDescription() {
+ return description;
+ }
+
+
+
+
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/ThermostatCluster.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/ThermostatUserInterfaceConfigurationCluster.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/ThermostatUserInterfaceConfigurationCluster.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/ThermostatUserInterfaceConfigurationCluster.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,77 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.general;
+
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.zcl.library.api.HVAC.ThermostatUserInterfaceConfiguration;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.impl.attribute.Attributes;
+import it.cnr.isti.zigbee.zcl.library.impl.core.AttributeImpl;
+import it.cnr.isti.zigbee.zcl.library.impl.core.ZCLClusterBase;
+
+public class ThermostatUserInterfaceConfigurationCluster extends ZCLClusterBase implements ThermostatUserInterfaceConfiguration {
+
+
+
+ private static AttributeImpl description;
+ private final Attribute[] attributes;
+
+ public ThermostatUserInterfaceConfigurationCluster(ZigBeeDevice zbDevice){
+ super(zbDevice);
+
+
+
+ description = new AttributeImpl(zbDevice,this,Attributes.DESCRIPTION);
+
+ attributes = new AttributeImpl[]{description};
+ }
+
+
+
+ @Override
+ public short getId() {
+ return ThermostatUserInterfaceConfiguration.ID;
+ }
+
+ @Override
+ public String getName() {
+ return ThermostatUserInterfaceConfiguration.NAME;
+ }
+
+ @Override
+ public Attribute[] getStandardAttributes() {
+ return attributes;
+ }
+
+
+
+ public Attribute getAttributeDescription() {
+ return description;
+ }
+
+
+
+
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/ThermostatUserInterfaceConfigurationCluster.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/WindowCoveringCluster.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/WindowCoveringCluster.java (added)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/WindowCoveringCluster.java Wed Sep 18 16:05:26 2013
@@ -1,0 +1,78 @@
+/*
+ Copyright 2008-2013 CNR-ISTI, http://isti.cnr.it
+ Institute of Information Science and Technologies
+ of the Italian National Research Council
+
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.general;
+
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.zcl.library.api.closures.WindowCovering;
+import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
+import it.cnr.isti.zigbee.zcl.library.impl.attribute.Attributes;
+import it.cnr.isti.zigbee.zcl.library.impl.core.AttributeImpl;
+import it.cnr.isti.zigbee.zcl.library.impl.core.ZCLClusterBase;
+
+
+public class WindowCoveringCluster extends ZCLClusterBase implements WindowCovering {
+
+
+
+ private static AttributeImpl description;
+ private final Attribute[] attributes;
+
+ public WindowCoveringCluster(ZigBeeDevice zbDevice){
+ super(zbDevice);
+
+
+
+ description = new AttributeImpl(zbDevice,this,Attributes.DESCRIPTION);
+
+ attributes = new AttributeImpl[]{description};
+ }
+
+
+
+ @Override
+ public short getId() {
+ return WindowCovering.ID;
+ }
+
+ @Override
+ public String getName() {
+ return WindowCovering.NAME;
+ }
+
+ @Override
+ public Attribute[] getStandardAttributes() {
+ return attributes;
+ }
+
+
+
+ public Attribute getAttributeDescription() {
+ return description;
+ }
+
+
+
+
+
+}
Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/WindowCoveringCluster.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
More information about the Commit
mailing list