forked from jens/Automation
device is starting-trigger enhanced
This commit is contained in:
parent
7fdbf74906
commit
7a05b9a95b
@ -411,12 +411,17 @@ public class Trigger
|
|||||||
|
|
||||||
boolean checkDeviceStarts()
|
boolean checkDeviceStarts()
|
||||||
{
|
{
|
||||||
return checkServiceStarts() && !Settings.deviceStartDone;
|
if(triggerParameter && checkServiceStarts() && !Settings.deviceStartDone)
|
||||||
|
return true;
|
||||||
|
else if(!triggerParameter && !checkServiceStarts() && Settings.deviceStartDone)
|
||||||
|
return true;
|
||||||
|
else
|
||||||
|
return false;
|
||||||
|
// return checkServiceStarts() && !Settings.deviceStartDone && triggerParameter;
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean checkServiceStarts()
|
boolean checkServiceStarts()
|
||||||
{
|
{
|
||||||
boolean result = !Settings.serviceStartDone == getTriggerParameter();
|
|
||||||
return !Settings.serviceStartDone == getTriggerParameter();
|
return !Settings.serviceStartDone == getTriggerParameter();
|
||||||
// return !Settings.serviceStartDone;
|
// return !Settings.serviceStartDone;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user