[zb4osgi-changeset] [scm] ZigBee 4 OSGi repository change: r478 - /projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/
scm-notify at zb4osgi.aaloa.org
scm-notify at zb4osgi.aaloa.org
Mon Sep 24 17:49:12 CEST 2012
Author: manlio.bacco
Date: Mon Sep 24 17:49:12 2012
New Revision: 478
Log:
new devices implementation
minor fixes
Modified:
projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/GenericHADevice.java
projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/IASControlAndIndicatingEquipmentDevice.java
projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/IAS_ZoneDevice.java
projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/LightSensorDevice.java
projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OccupancySensorDevice.java
projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OnOffLightDevice.java
projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OnOffLightSwitchDevice.java
projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OnOffOutputDevice.java
projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OnOffSwitchDevice.java
projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/TemperatureSensorDevice.java
Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/GenericHADevice.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/GenericHADevice.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/GenericHADevice.java Mon Sep 24 17:49:12 2012
@@ -48,6 +48,7 @@
private int[] optional;
private int[] standard;
private int[] custom;
+
public GenericHADevice(BundleContext ctx,ZigBeeDevice zbDevice) throws ZigBeeHAException{
super(ctx,zbDevice);
Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/IASControlAndIndicatingEquipmentDevice.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/IASControlAndIndicatingEquipmentDevice.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/IASControlAndIndicatingEquipmentDevice.java Mon Sep 24 17:49:12 2012
@@ -1,7 +1,9 @@
package it.cnr.isti.zigbee.ha.device.impl;
import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Groups;
import it.cnr.isti.zigbee.ha.cluster.glue.general.Identify;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Scenes;
import it.cnr.isti.zigbee.ha.cluster.glue.security_safety.IASACE;
import it.cnr.isti.zigbee.ha.cluster.glue.security_safety.IASWD;
import it.cnr.isti.zigbee.ha.cluster.glue.security_safety.IASZone;
@@ -20,6 +22,8 @@
private IASZone iasZone;
private IASACE iasAce;
private IASWD iasWD;
+ private Scenes scenes;
+ private Groups groups;
public IASControlAndIndicatingEquipmentDevice(BundleContext ctx, ZigBeeDevice zbDevice) throws ZigBeeHAException {
@@ -29,6 +33,8 @@
iasZone = (IASZone) addCluster(HAProfile.IAS_ZONE);
identify = (Identify) addCluster(HAProfile.IDENTIFY);
iasWD = (IASWD) addCluster(HAProfile.IAS_WD);
+ scenes = (Scenes) addCluster(HAProfile.SCENES);
+ groups = (Groups) addCluster(HAProfile.GROUPS);
}
public IASACE getIASACE() {
@@ -72,4 +78,12 @@
return IASControlAndIndicatingEquipment.STANDARD;
}
};
+
+ public Scenes getScenes() {
+ return scenes;
+ }
+
+ public Groups getGroups() {
+ return groups;
+ }
}
Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/IAS_ZoneDevice.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/IAS_ZoneDevice.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/IAS_ZoneDevice.java Mon Sep 24 17:49:12 2012
@@ -13,23 +13,24 @@
public class IAS_ZoneDevice extends HADeviceBase implements IAS_Zone {
- private IASZone IASZone;
+ private IASZone iasZoneCluster;
public IAS_ZoneDevice(BundleContext ctx, ZigBeeDevice zbDevice) throws ZigBeeHAException {
+
+ super(ctx, zbDevice);
- super(ctx, zbDevice);
- IASZone = (IASZone) addCluster(HAProfile.IAS_ZONE);
+ iasZoneCluster = (IASZone) addCluster(HAProfile.IAS_ZONE);
}
public IASZone getIASZone() {
- return IASZone;
+ return iasZoneCluster;
}
@Override
public String getName() {
- return IASZone.getName();
+ return IAS_Zone.NAME;
}
@Override
@@ -55,6 +56,5 @@
public int[] getStandardClusters() {
return IAS_Zone.STANDARD;
}
-
};
}
Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/LightSensorDevice.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/LightSensorDevice.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/LightSensorDevice.java Mon Sep 24 17:49:12 2012
@@ -1,6 +1,7 @@
package it.cnr.isti.zigbee.ha.device.impl;
import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Groups;
import it.cnr.isti.zigbee.ha.cluster.glue.measureament_sensing.IlluminanceMeasurement;
import it.cnr.isti.zigbee.ha.device.api.lighting.LightSensor;
import it.cnr.isti.zigbee.ha.driver.core.HADeviceBase;
@@ -14,11 +15,14 @@
public class LightSensorDevice extends HADeviceBase implements LightSensor {
private IlluminanceMeasurement illuminanceMeasurement;
+ private Groups groups;
public LightSensorDevice(BundleContext ctx, ZigBeeDevice zbDevice) throws ZigBeeHAException {
super(ctx, zbDevice);
+
illuminanceMeasurement = (IlluminanceMeasurement) addCluster(HAProfile.ILLUMINANCE_MEASUREMENT);
+ groups = (Groups) addCluster(HAProfile.GROUPS);
}
public IlluminanceMeasurement getIlluminanceMeasurement() {
@@ -57,4 +61,8 @@
}
};
+
+ public Groups getGroups() {
+ return groups;
+ }
}
Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OccupancySensorDevice.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OccupancySensorDevice.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OccupancySensorDevice.java Mon Sep 24 17:49:12 2012
@@ -18,11 +18,12 @@
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.device.impl;
import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Groups;
import it.cnr.isti.zigbee.ha.cluster.glue.measureament_sensing.OccupacySensing;
import it.cnr.isti.zigbee.ha.device.api.lighting.OccupancySensor;
import it.cnr.isti.zigbee.ha.driver.core.HADeviceBase;
@@ -43,18 +44,21 @@
*
*/
public class OccupancySensorDevice extends HADeviceBase implements OccupancySensor {
-
+
private OccupacySensing occupancySensing;
-
+ private Groups groups;
+
public OccupancySensorDevice(BundleContext ctx,ZigBeeDevice zbDevice) throws ZigBeeHAException {
+
super(ctx,zbDevice);
+
occupancySensing = (OccupacySensing) addCluster(HAProfile.OCCUPANCY_SENSING);
+ groups = (Groups) addCluster(HAProfile.GROUPS);
}
public OccupacySensing getOccupacySensing() {
return occupancySensing;
}
-
@Override
public String getName() {
@@ -78,7 +82,6 @@
public int[] getStandardClusters() {
return OccupancySensor.STANDARD;
}
-
};
@Override
@@ -86,5 +89,7 @@
return DEVICE_DESCRIPTOR;
}
-
-}
+ public Groups getGroups() {
+ return groups;
+ }
+}
Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OnOffLightDevice.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OnOffLightDevice.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OnOffLightDevice.java Mon Sep 24 17:49:12 2012
@@ -18,7 +18,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-*/
+ */
package it.cnr.isti.zigbee.ha.device.impl;
@@ -45,12 +45,12 @@
*
*/
public class OnOffLightDevice extends HADeviceBase implements OnOffLight {
-
+
private OnOff onOff;
private Scenes scenes;
private Groups groups;
private OccupacySensing occupancySensing;
-
+
public OnOffLightDevice(BundleContext ctx,ZigBeeDevice zbDevice) throws ZigBeeHAException {
super(ctx,zbDevice);
onOff = (OnOff) addCluster(HAProfile.ON_OFF);
@@ -58,7 +58,6 @@
scenes = (Scenes) addCluster(HAProfile.SCENES);
occupancySensing = (OccupacySensing) addCluster(HAProfile.OCCUPANCY_SENSING);
}
-
public Groups getGroups() {
return groups;
@@ -75,8 +74,6 @@
public Scenes getScenes() {
return scenes;
}
-
-
@Override
public String getName() {
@@ -100,13 +97,11 @@
public int[] getStandardClusters() {
return OnOffLight.STANDARD;
}
-
+
};
@Override
public DeviceDescription getDescription() {
return DEVICE_DESCRIPTOR;
}
-
-
-}
+}
Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OnOffLightSwitchDevice.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OnOffLightSwitchDevice.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OnOffLightSwitchDevice.java Mon Sep 24 17:49:12 2012
@@ -18,15 +18,20 @@
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.device.impl;
import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Groups;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Identify;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.OnOff;
import it.cnr.isti.zigbee.ha.cluster.glue.general.OnOffSwitchConfiguration;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Scenes;
import it.cnr.isti.zigbee.ha.device.api.generic.OnOffSwitch;
import it.cnr.isti.zigbee.ha.device.api.lighting.OnOffLightSwitch;
import it.cnr.isti.zigbee.ha.driver.core.HADeviceBase;
+import it.cnr.isti.zigbee.ha.driver.core.HAProfile;
import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
import it.cnr.isti.zigbee.ha.driver.core.reflection.AbstractDeviceDescription;
import it.cnr.isti.zigbee.ha.driver.core.reflection.DeviceDescription;
@@ -42,11 +47,22 @@
*
*/
public class OnOffLightSwitchDevice extends HADeviceBase implements OnOffLightSwitch {
-
+
private OnOffSwitchConfiguration onOffSwitchConfiguration;
-
+ private OnOff onOff;
+ private Scenes scenes;
+ private Groups groups;
+ private Identify identify;
+
public OnOffLightSwitchDevice(BundleContext ctx,ZigBeeDevice zbDevice) throws ZigBeeHAException{
+
super(ctx,zbDevice);
+
+ onOffSwitchConfiguration = (OnOffSwitchConfiguration) addCluster(HAProfile.ON_OFF_SWITCH_CONFIGURATION);
+ onOff = (OnOff) addCluster(HAProfile.ON_OFF);
+ scenes = (Scenes) addCluster(HAProfile.SCENES);
+ groups = (Groups) addCluster(HAProfile.GROUPS);
+ identify = (Identify) addCluster(HAProfile.IDENTIFY);
}
final static DeviceDescription DEVICE_DESCRIPTOR = new AbstractDeviceDescription(){
@@ -65,10 +81,9 @@
public int[] getStandardClusters() {
return OnOffLightSwitch.STANDARD;
- }
-
+ }
};
-
+
@Override
public DeviceDescription getDescription() {
return DEVICE_DESCRIPTOR;
@@ -82,4 +97,16 @@
public OnOffSwitchConfiguration getOnOffSwitchConfiguration() {
return onOffSwitchConfiguration;
}
-}
+
+ public OnOff getOnOff() {
+ return onOff;
+ }
+
+ public Scenes getScenes() {
+ return scenes;
+ }
+
+ public Groups getGroups() {
+ return groups;
+ }
+}
Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OnOffOutputDevice.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OnOffOutputDevice.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OnOffOutputDevice.java Mon Sep 24 17:49:12 2012
@@ -58,7 +58,6 @@
scenes = (Scenes) addCluster(HAProfile.SCENES);
}
-
public Groups getGroups() {
return groups;
}
@@ -69,9 +68,7 @@
public Scenes getScenes() {
return scenes;
- }
-
-
+ }
@Override
public String getName() {
@@ -102,6 +99,4 @@
public DeviceDescription getDescription() {
return DEVICE_DESCRIPTOR;
}
-
-
-}
+}
Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OnOffSwitchDevice.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OnOffSwitchDevice.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OnOffSwitchDevice.java Mon Sep 24 17:49:12 2012
@@ -18,15 +18,19 @@
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.device.impl;
import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Groups;
import it.cnr.isti.zigbee.ha.cluster.glue.general.Identify;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.OnOff;
import it.cnr.isti.zigbee.ha.cluster.glue.general.OnOffSwitchConfiguration;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Scenes;
import it.cnr.isti.zigbee.ha.device.api.generic.OnOffSwitch;
import it.cnr.isti.zigbee.ha.driver.core.HADeviceBase;
+import it.cnr.isti.zigbee.ha.driver.core.HAProfile;
import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
import it.cnr.isti.zigbee.ha.driver.core.reflection.AbstractDeviceDescription;
import it.cnr.isti.zigbee.ha.driver.core.reflection.DeviceDescription;
@@ -42,11 +46,20 @@
*
*/
public class OnOffSwitchDevice extends HADeviceBase implements OnOffSwitch {
-
+
private OnOffSwitchConfiguration onOffSwitchConfiguration;
-
- public OnOffSwitchDevice(BundleContext ctx,ZigBeeDevice zbDevice) throws ZigBeeHAException{
- super(ctx,zbDevice);
+ private OnOff onOff;
+ private Scenes scenes;
+ private Groups groups;
+
+ public OnOffSwitchDevice(BundleContext ctx, ZigBeeDevice zbDevice) throws ZigBeeHAException{
+
+ super(ctx, zbDevice);
+
+ onOffSwitchConfiguration = (OnOffSwitchConfiguration) addCluster(HAProfile.ON_OFF_SWITCH_CONFIGURATION);
+ onOff = (OnOff) addCluster(HAProfile.ON_OFF);
+ scenes = (Scenes) addCluster(HAProfile.SCENES);
+ groups = (Groups) addCluster(HAProfile.GROUPS);
}
final static DeviceDescription DEVICE_DESCRIPTOR = new AbstractDeviceDescription(){
@@ -66,9 +79,8 @@
public int[] getStandardClusters() {
return OnOffSwitch.STANDARD;
}
-
};
-
+
@Override
public DeviceDescription getDescription() {
return DEVICE_DESCRIPTOR;
@@ -87,4 +99,15 @@
return identify;
}
-}
+ public OnOff getOnOff() {
+ return onOff;
+ }
+
+ public Scenes getScenes() {
+ return scenes;
+ }
+
+ public Groups getGroups() {
+ return groups;
+ }
+}
Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/TemperatureSensorDevice.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/TemperatureSensorDevice.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/TemperatureSensorDevice.java Mon Sep 24 17:49:12 2012
@@ -23,6 +23,7 @@
package it.cnr.isti.zigbee.ha.device.impl;
import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Groups;
import it.cnr.isti.zigbee.ha.cluster.glue.measureament_sensing.TemperatureMeasurement;
import it.cnr.isti.zigbee.ha.device.api.hvac.TemperatureSensor;
import it.cnr.isti.zigbee.ha.driver.core.HADeviceBase;
@@ -43,11 +44,15 @@
*/
public class TemperatureSensorDevice extends HADeviceBase implements TemperatureSensor {
- private final TemperatureMeasurement temperature;
+ private TemperatureMeasurement temperature;
+ private Groups groups;
public TemperatureSensorDevice(BundleContext ctx,ZigBeeDevice zbDevice) throws ZigBeeHAException {
+
super(ctx,zbDevice);
+
temperature = (TemperatureMeasurement) addCluster(HAProfile.TEMPERATURE_MEASUREMENT);
+ groups = (Groups) addCluster(HAProfile.GROUPS);
}
public String getName() {
@@ -82,4 +87,7 @@
return DEVICE_DESCRIPTOR;
}
-}
+ public Groups getGroups() {
+ return groups;
+ }
+}
More information about the Commit
mailing list