[zb4osgi-changeset] [scm] ZigBee 4 OSGi repository change: r475 - /projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/
scm-notify at zb4osgi.aaloa.org
scm-notify at zb4osgi.aaloa.org
Mon Sep 24 17:48:12 CEST 2012
Author: manlio.bacco
Date: Mon Sep 24 17:48:12 2012
New Revision: 475
Log:
new devices
minor fixes
Modified:
projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/ColorDimmableLight.java
projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/LightSensor.java
projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/OccupancySensor.java
projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/OnOffLight.java
projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/OnOffLightSwitch.java
Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/ColorDimmableLight.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/ColorDimmableLight.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/ColorDimmableLight.java Mon Sep 24 17:48:12 2012
@@ -85,7 +85,7 @@
*
* @return the {@link OccupacySensing} cluster object if implemented by the device, otherwise <code>null</code>
*/
- public abstract OccupacySensing getOccupacySensing();
+ public OccupacySensing getOccupacySensing();
/**
* Access method for the <b>Mandatory</b> cluster: {@link ColorControl}
Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/LightSensor.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/LightSensor.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/LightSensor.java Mon Sep 24 17:48:12 2012
@@ -1,5 +1,6 @@
package it.cnr.isti.zigbee.ha.device.api.lighting;
+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.driver.ArraysUtil;
import it.cnr.isti.zigbee.ha.driver.core.HADevice;
@@ -13,9 +14,12 @@
HAProfile.ILLUMINANCE_MEASUREMENT
});
public static final int[] OPTIONAL = ArraysUtil.append(HADevice.OPTIONAL, new int[]{
+ HAProfile.GROUPS
});
public static final int[] STANDARD = ArraysUtil.append(MANDATORY, OPTIONAL);
public static final int[] CUSTOM = {};
public IlluminanceMeasurement getIlluminanceMeasurement();
+
+ public Groups getGroups();
}
Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/OccupancySensor.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/OccupancySensor.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/OccupancySensor.java Mon Sep 24 17:48:12 2012
@@ -18,10 +18,11 @@
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.api.lighting;
+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.driver.ArraysUtil;
import it.cnr.isti.zigbee.ha.driver.core.HADevice;
@@ -39,22 +40,25 @@
*
*/
public interface OccupancySensor extends HADevice{
-
+
public static final int DEVICE_ID = 0x0107;
public static final String NAME = "Occupancy Sensor";
-
+
public static final int[] MANDATORY = ArraysUtil.append(HADevice.MANDATORY, new int[]{
- HAProfile.BASIC,HAProfile.IDENTIFY,HAProfile.OCCUPANCY_SENSING
+ HAProfile.OCCUPANCY_SENSING
});
- public static final int[] OPTIONAL = HADevice.OPTIONAL;
+ public static final int[] OPTIONAL = ArraysUtil.append(HADevice.OPTIONAL, new int[]{
+ HAProfile.GROUPS
+ });
public static final int[] STANDARD = ArraysUtil.append(MANDATORY, OPTIONAL);
public static final int[] CUSTOM = {};
-
+
/**
* Access method for the <b>Mandatory</b> cluster: {@link OccupacySensing}
*
* @return the {@link OccupacySensing} cluster implemented by the device
*/
public OccupacySensing getOccupacySensing();
-
+
+ public Groups getGroups();
}
Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/OnOffLight.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/OnOffLight.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/OnOffLight.java Mon Sep 24 17:48:12 2012
@@ -84,5 +84,4 @@
* @return the {@link OccupacySensing} cluster object if implemented by the device, otherwise <code>null</code>
*/
public OccupacySensing getOccupacySensing();
-
-}
+}
Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/OnOffLightSwitch.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/OnOffLightSwitch.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/OnOffLightSwitch.java Mon Sep 24 17:48:12 2012
@@ -22,7 +22,11 @@
package it.cnr.isti.zigbee.ha.device.api.lighting;
+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.driver.ArraysUtil;
import it.cnr.isti.zigbee.ha.driver.core.HADevice;
import it.cnr.isti.zigbee.ha.driver.core.HAProfile;
@@ -42,12 +46,11 @@
public static final int DEVICE_ID = 0x0103;
public static final String NAME = "OnOff Light Switch";
public static final int[] MANDATORY = ArraysUtil.append(HADevice.MANDATORY, new int[]{
- HAProfile.ON_OFF_SWITCH_CONFIGURATION
+ HAProfile.ON_OFF_SWITCH_CONFIGURATION, HAProfile.ON_OFF, HAProfile.SCENES, HAProfile.GROUPS, HAProfile.IDENTIFY
});
public static final int[] OPTIONAL = HADevice.OPTIONAL;
public static final int[] STANDARD = ArraysUtil.append(MANDATORY, OPTIONAL);
public static final int[] CUSTOM = {};
-
/**
* Access method for the <b>Mandatory</b> cluster: {@link OnOffSwitchConfiguration}
@@ -56,4 +59,11 @@
*/
public OnOffSwitchConfiguration getOnOffSwitchConfiguration();
+ public OnOff getOnOff();
+
+ public Scenes getScenes();
+
+ public Groups getGroups();
+
+ public Identify getIdentify();
}
More information about the Commit
mailing list