projects
/
iot2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Completing ZigbeeTest with doorlock test
[iot2.git]
/
benchmarks
/
other
/
ZigbeeTest
/
MultipurposeSensor.java
diff --git
a/benchmarks/other/ZigbeeTest/MultipurposeSensor.java
b/benchmarks/other/ZigbeeTest/MultipurposeSensor.java
index 0243091ededf3cabdbf26eed52bd406ed1ae7e8e..a21155fcd3e8423361efe013a16320b54dddb5f2 100644
(file)
--- a/
benchmarks/other/ZigbeeTest/MultipurposeSensor.java
+++ b/
benchmarks/other/ZigbeeTest/MultipurposeSensor.java
@@
-38,8
+38,6
@@
public class MultipurposeSensor implements IoTZigbeeCallback, SmartthingsSensor
private List < SmartthingsSensorCallback > callbackList = new CopyOnWriteArrayList < SmartthingsSensorCallback > ();
private List < SmartthingsSensorCallback > callbackList = new CopyOnWriteArrayList < SmartthingsSensorCallback > ();
- private int sensorId = 0;
-
@config private IoTSet<IoTDeviceAddress> devUdpAddress;
@config private IoTSet<IoTZigbeeAddress> devZigbeeAddress;
@config private IoTSet<IoTDeviceAddress> devUdpAddress;
@config private IoTSet<IoTZigbeeAddress> devZigbeeAddress;
@@
-138,18
+136,6
@@
public class MultipurposeSensor implements IoTZigbeeCallback, SmartthingsSensor
}
}
}
}
- public void setId(int id) {
-
- sensorId = id;
-
- }
-
- public int getId() {
-
- return sensorId;
-
- }
-
public int getValue() {
int tmp = 0;
public int getValue() {
int tmp = 0;
@@
-212,7
+198,7
@@
public class MultipurposeSensor implements IoTZigbeeCallback, SmartthingsSensor
gettingLatestDataMutex.release();
try {
for (SmartthingsSensorCallback cb : callbackList) {
gettingLatestDataMutex.release();
try {
for (SmartthingsSensorCallback cb : callbackList) {
- cb.newReadingAvailable(this.get
Id(), this.get
Value(), this.isActiveValue());
+ cb.newReadingAvailable(this.getValue(), this.isActiveValue());
}
} catch (Exception e) {
e.printStackTrace();
}
} catch (Exception e) {
e.printStackTrace();