[zb4osgi-changeset] [scm] ZigBee 4 OSGi repository change: r473 - in /projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/generic: MainsPowerOutlet.java OnOffOutput.java OnOffSwitch.java

[scm-notify at zb4osgi.aaloa.org]

Author: manlio.bacco
Date: Mon Sep 24 17:47:09 2012
New Revision: 473

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/generic/MainsPowerOutlet.java
    projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/generic/OnOffOutput.java
    projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/generic/OnOffSwitch.java

Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/generic/MainsPowerOutlet.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/generic/MainsPowerOutlet.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/generic/MainsPowerOutlet.java Mon Sep 24 17:47:09 2012
@@ -30,4 +30,4 @@
 	public Scenes getScenes();
 	
 	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/generic/OnOffOutput.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/generic/OnOffOutput.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/generic/OnOffOutput.java Mon Sep 24 17:47:09 2012
@@ -47,7 +47,7 @@
 	public static final String NAME = "On/Off Output";
 	
 	public static final int[] MANDATORY = ArraysUtil.append(HADevice.MANDATORY, new int[]{
-		HAProfile.BASIC,HAProfile.IDENTIFY,HAProfile.ON_OFF,HAProfile.GROUPS,HAProfile.SCENES
+		HAProfile.ON_OFF,HAProfile.GROUPS,HAProfile.SCENES
 	});
 	public static final int[] OPTIONAL = HADevice.OPTIONAL;
 	public static final int[] STANDARD = ArraysUtil.append(MANDATORY, OPTIONAL);
@@ -73,5 +73,4 @@
 	 * @return the {@link Groups} cluster object
 	 */
 	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/generic/OnOffSwitch.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/generic/OnOffSwitch.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/generic/OnOffSwitch.java Mon Sep 24 17:47:09 2012
@@ -22,7 +22,10 @@
 
 package it.cnr.isti.zigbee.ha.device.api.generic;
 
+import it.cnr.isti.zigbee.ha.cluster.glue.general.Groups;
+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;
@@ -40,12 +43,11 @@
 	public static final int DEVICE_ID = 0x0000;
 	public static final String NAME = "OnOff 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 /* */
 	});
 	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} 
@@ -53,4 +55,10 @@
 	 * @return the {@link OnOffSwitchConfiguration} cluster object
 	 */
 	public OnOffSwitchConfiguration getOnOffSwitchConfiguration();
-}
+
+	public OnOff getOnOff();
+
+	public Scenes getScenes();
+
+	public Groups getGroups();
+}