Perfecting 4th benchmark; adding needed MySQL config files; maturing Zigbee drivers

[iot2.git] / benchmarks / drivers / MultipurposeSensor / MultipurposeSensor.java

diff --git a/benchmarks/drivers/MultipurposeSensor/MultipurposeSensor.java b/benchmarks/drivers/MultipurposeSensor/MultipurposeSensor.java
index d2123e3fda6eaaa26ef471e288eef1b7e97b6f14..ae1aaf371759ec0ee1b654394778da93a017bbae 100644 (file)
--- a/benchmarks/drivers/MultipurposeSensor/MultipurposeSensor.java
+++ b/benchmarks/drivers/MultipurposeSensor/MultipurposeSensor.java
@@ -42,12 +42,14 @@ public class MultipurposeSensor implements IoTZigbeeCallback, SmartthingsSensor
 
        private int sensorId = 0;
 
-       @config private IoTSet<IoTDeviceAddress> devUdpAddress;
-       @config private IoTSet<IoTZigbeeAddress> devZigbeeAddress;
-
-       public MultipurposeSensor(IoTSet<IoTDeviceAddress> dSet, IoTSet<IoTZigbeeAddress> zigSet) {
-               //devUdpAddress = dSet;
-               //devZigbeeAddress = zigSet;
+       @config private IoTSet<IoTDeviceAddress> multipurposeSensorUdpAddress;
+       @config private IoTSet<IoTZigbeeAddress> multipurposeSensorZigbeeAddress;
+
+       //public MultipurposeSensor(IoTSet<IoTDeviceAddress> dSet, IoTSet<IoTZigbeeAddress> zigSet) {
+               //multipurposeSensorUdpAddress = dSet;
+               //multipurposeSensorZigbeeAddress = zigSet;
+       //}
+       public MultipurposeSensor() {
        }
 
        public void init() {
@@ -59,20 +61,20 @@ public class MultipurposeSensor implements IoTZigbeeCallback, SmartthingsSensor
                didAlreadyClose.set(false);
 
                try {
-                       Iterator itrUdp = devUdpAddress.iterator();
-                       Iterator itrZig = devZigbeeAddress.iterator();
+                       Iterator itrUdp = multipurposeSensorUdpAddress.iterator();
+                       Iterator itrZig = multipurposeSensorZigbeeAddress.iterator();
 
                        zigConnection = new IoTZigbee((IoTDeviceAddress)itrUdp.next(), (IoTZigbeeAddress)itrZig.next());
 
                        // DEBUG
                        System.out.println("DEBUG: Allocate iterators to print out addresses!");
-                       Iterator itrDebugUdp = devUdpAddress.iterator();
+                       Iterator itrDebugUdp = multipurposeSensorUdpAddress.iterator();
                        IoTDeviceAddress iotaddDebug = (IoTDeviceAddress)itrDebugUdp.next();
                        System.out.println("IP address: " + iotaddDebug.getCompleteAddress());
                        System.out.println("Source port: " + iotaddDebug.getSourcePortNumber());
                        System.out.println("Destination port: " + iotaddDebug.getDestinationPortNumber());
 
-                       Iterator itrDebugZig = devZigbeeAddress.iterator();
+                       Iterator itrDebugZig = multipurposeSensorZigbeeAddress.iterator();
                        IoTZigbeeAddress iotzbaddDebug = (IoTZigbeeAddress)itrDebugZig.next();
                        System.out.println("Zigbee address: " + iotzbaddDebug.getAddress());