ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Improved toString and added trigger on change option

Browse source
This commit is contained in:
Ziver Koc 2017-03-13 18:08:07 +01:00
parent b5024a063d
commit fddaa34c30
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/se/hal/trigger/EventTrigger.java
View file

@ -27,6 +27,8 @@ public class EventTrigger implements HalTrigger,
@Configurator.Configurable("Event Device ID") @Configurator.Configurable("Event Device ID")
private int eventId = -1; private int eventId = -1;
@Configurator.Configurable("Trigger only on change")
private boolean triggerOnChange = true;
@Configurator.Configurable("Data to compare to") @Configurator.Configurable("Data to compare to")
private double expectedData; private double expectedData;
@ -58,7 +60,8 @@ public class EventTrigger implements HalTrigger,
public void receivedReport(Event device) { public void receivedReport(Event device) {
receivedData = device.getDeviceData(); receivedData = device.getDeviceData();
// Instant trigger evaluation // Instant trigger evaluation
TriggerManager.getInstance().evaluateAndExecute(); if (triggerOnChange)
TriggerManager.getInstance().evaluateAndExecute();
} }
@ -71,14 +74,17 @@ public class EventTrigger implements HalTrigger,
@Override @Override
public void reset() { public void reset() {
receivedData = null; if (triggerOnChange) // only reset if we want to trigger on change
receivedData = null;
} }
@Override @Override
public String toString(){ public String toString(){
Event event = getEvent(eventId); Event event = getEvent(eventId);
return (event != null ? event.getName() : null) + " == "+ expectedData; return "Trigger " + (triggerOnChange ? "on" : "when") +
" event: "+eventId+" ("+(event != null ? event.getName() : null) + ")" +
" == "+ expectedData;
} }
} }