detected events bugfix
Former-commit-id: 6b223c4412b79acbebeb48352c73b6740222a189
This commit is contained in:
parent
45efb6120d
commit
b06c9c0234
2 changed files with 3 additions and 2 deletions
|
|
@ -114,8 +114,8 @@ public class ControllerManager implements HalSensorReportListener, HalEventRepor
|
||||||
logger.finest("Received report from sensor: "+ sensorData);
|
logger.finest("Received report from sensor: "+ sensorData);
|
||||||
}
|
}
|
||||||
else { // unknown sensor
|
else { // unknown sensor
|
||||||
|
logger.finest("Received report from unregistered sensor: "+ sensorData);
|
||||||
if(!detectedSensors.contains(sensorData)) {
|
if(!detectedSensors.contains(sensorData)) {
|
||||||
logger.finest("Received report from unregistered sensor: "+ sensorData);
|
|
||||||
detectedSensors.add(sensorData);
|
detectedSensors.add(sensorData);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -192,8 +192,8 @@ public class ControllerManager implements HalSensorReportListener, HalEventRepor
|
||||||
logger.finest("Received report from event: "+ eventData);
|
logger.finest("Received report from event: "+ eventData);
|
||||||
}
|
}
|
||||||
else { // unknown sensor
|
else { // unknown sensor
|
||||||
|
logger.info("Received report from unregistered event: "+ eventData);
|
||||||
if(!detectedEvents.contains(eventData)) {
|
if(!detectedEvents.contains(eventData)) {
|
||||||
logger.finest("Received report from unregistered event: "+ eventData);
|
|
||||||
detectedEvents.add(eventData);
|
detectedEvents.add(eventData);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -84,6 +84,7 @@ public class EventConfigHttpPage extends HalHttpPage {
|
||||||
tmpl.set("user", localUser);
|
tmpl.set("user", localUser);
|
||||||
tmpl.set("localEvent", Event.getLocalEvents(db));
|
tmpl.set("localEvent", Event.getLocalEvents(db));
|
||||||
tmpl.set("localEventConf", eventConfigurations);
|
tmpl.set("localEventConf", eventConfigurations);
|
||||||
|
tmpl.set("detectedEvents", ControllerManager.getInstance().getDetectedEvents());
|
||||||
|
|
||||||
|
|
||||||
tmpl.set("availableEvents", ControllerManager.getInstance().getAvailableEvents());
|
tmpl.set("availableEvents", ControllerManager.getInstance().getAvailableEvents());
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue