Merge "sdt.smartkettle: update to new sdt api." into dev
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/SmarterKettle.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/SmarterKettle.java
index 9f7e008..79e531e 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/SmarterKettle.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/SmarterKettle.java
@@ -7,8 +7,6 @@
*******************************************************************************/
package org.eclipse.om2m.sdt.home.smarterkettle;
-import java.awt.KeyboardFocusManager;
-import java.nio.channels.NonWritableChannelException;
import java.util.List;
import org.eclipse.om2m.sdt.Domain;
@@ -16,27 +14,18 @@
import org.eclipse.om2m.sdt.datapoints.FloatDataPoint;
import org.eclipse.om2m.sdt.datapoints.IntegerDataPoint;
import org.eclipse.om2m.sdt.datapoints.StringDataPoint;
-import org.eclipse.om2m.sdt.exceptions.AccessException;
import org.eclipse.om2m.sdt.exceptions.ActionException;
import org.eclipse.om2m.sdt.exceptions.DataPointException;
import org.eclipse.om2m.sdt.home.actions.Toggle;
import org.eclipse.om2m.sdt.home.devices.Kettle;
import org.eclipse.om2m.sdt.home.driver.Utils;
import org.eclipse.om2m.sdt.home.modules.BinarySwitch;
-import org.eclipse.om2m.sdt.home.modules.Boiling;
-import org.eclipse.om2m.sdt.home.modules.Brewing;
import org.eclipse.om2m.sdt.home.modules.FaultDetection;
-import org.eclipse.om2m.sdt.home.modules.Grinder;
-import org.eclipse.om2m.sdt.home.modules.KeepWarm;
-import org.eclipse.om2m.sdt.home.modules.Level;
import org.eclipse.om2m.sdt.home.modules.Temperature;
-import org.eclipse.om2m.sdt.home.smarterkettle.communication.SmarterKettleCommands;
import org.eclipse.om2m.sdt.home.smarterkettle.communication.SmarterKettleCommunication;
-import org.eclipse.om2m.sdt.home.smarterkettle.communication.SmarterKettleStatus;
+import org.eclipse.om2m.sdt.home.types.DatapointType;
import org.eclipse.om2m.sdt.home.types.DeviceType;
-import org.eclipse.om2m.sdt.home.types.LevelType;
import org.eclipse.om2m.sdt.home.types.TasteStrength;
-import org.omg.CORBA.PRIVATE_MEMBER;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
@@ -97,7 +86,7 @@
- BinarySwitch binarySwitch = new BinarySwitch("BinarySwitch" + getId(), domain, new BooleanDataPoint("powerState"){
+ BinarySwitch binarySwitch = new BinarySwitch("BinarySwitch" + getId(), domain, new BooleanDataPoint(DatapointType.powerState){
@Override
protected Boolean doGetValue() throws DataPointException {
@@ -150,19 +139,23 @@
private void addFaultDetection() {
FaultDetection faultDetection = new FaultDetection("FaultDetection_" + getId(), domain,
- new BooleanDataPoint("status") {
+ new BooleanDataPoint(DatapointType.status) {
@Override
public Boolean doGetValue() throws DataPointException {
smarterKettle.checkStatus();
return smarterKettle.getFaultDetection();
}
- }, new IntegerDataPoint("code") {
+ });
+
+ faultDetection.setCode(new IntegerDataPoint(DatapointType.code) {
@Override
protected Integer doGetValue() throws DataPointException {
return smarterKettle.getCode();
}
- }, new StringDataPoint("description") {
+ });
+
+ faultDetection.setDescription(new StringDataPoint(DatapointType.description) {
@Override
protected String doGetValue() throws DataPointException {
@@ -183,7 +176,7 @@
private void addTemperature(){
System.out.println("Dodawanie moduĊu temperatury...");
- Temperature temperature = new Temperature("Temperature_" + getId(), domain, new FloatDataPoint("currentTemperature") {
+ Temperature temperature = new Temperature("Temperature_" + getId(), domain, new FloatDataPoint(DatapointType.currentTemperature) {
@Override
protected Float doGetValue() throws DataPointException {
@@ -192,7 +185,9 @@
- }, new FloatDataPoint("targetTemperature") {
+ });
+
+ temperature.setTargetTemperature(new FloatDataPoint(DatapointType.targetTemperature) {
@Override
protected Float doGetValue() throws DataPointException {
@@ -206,13 +201,17 @@
}
- }, new StringDataPoint("unit") {
+ });
+
+ temperature.setUnit(new StringDataPoint(DatapointType.unit) {
@Override
protected String doGetValue() throws DataPointException {
return null;
}
- }, new FloatDataPoint("minValue") {
+ });
+
+ temperature.setMinValue(new FloatDataPoint(DatapointType.minValue) {
@Override
protected Float doGetValue() throws DataPointException {
@@ -220,13 +219,17 @@
}
- }, new FloatDataPoint("maxValue") {
+ });
+
+ temperature.setMaxValue(new FloatDataPoint(DatapointType.maxValue) {
@Override
protected Float doGetValue() throws DataPointException {
return (float)smarterKettle.kettleStatus.getMaxTemperature();
}
- }, new FloatDataPoint("stepValue") {
+ });
+
+ temperature.setStepValue(new FloatDataPoint(DatapointType.stepValue) {
@Override
protected Float doGetValue() throws DataPointException {
