X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=official%2Flighting-director.groovy;h=a5906d472fea2d1bbe37339439cdc76db4f49d39;hb=b33d00f94deb8a017c8dd18e68bd1ba0413a46f8;hp=8b7438bb7fc80502aa35612ef0bc5c4cd67ea56f;hpb=60526c608145571e7e260c78858617c34a922196;p=smartapps.git diff --git a/official/lighting-director.groovy b/official/lighting-director.groovy index 8b7438b..a5906d4 100755 --- a/official/lighting-director.groovy +++ b/official/lighting-director.groovy @@ -287,7 +287,7 @@ def initialize() { def onEventA(evt) { -if ((!A_triggerOnce || (A_triggerOnce && !state.A_triggered)) && (!A_switchDisable || (A_switchDisable && !state.A_triggered))) { //Checks to make sure this scenario should be triggered more then once in a day +if (/*(!A_triggerOnce || (A_triggerOnce && !state.A_triggered)) && (!A_switchDisable || (A_switchDisable && !state.A_triggered))*/true) { //Checks to make sure this scenario should be triggered more then once in a day if ((!A_mode || A_mode.contains(location.mode)) && true/*getTimeOk (A_timeStart, A_timeEnd) && getDayOk(A_day)*/) { //checks to make sure we are not opperating outside of set restrictions. if ((!A_luxSensors) || (A_luxSensors.latestValue("illuminance") <= A_turnOnLux)){ //checks to make sure illimunance is either not cared about or if the value is within the restrictions def A_levelOn = A_level as Integer @@ -346,7 +346,7 @@ def delayTurnOffA(){ def onPressA(evt) { if ((!A_mode || A_mode.contains(location.mode)) && /*getTimeOk (A_timeStart, A_timeEnd) && getDayOk(A_day)*/true) { //checks to make sure we are not opperating outside of set restrictions. if ((!A_luxSensors) || (A_luxSensors.latestValue("illuminance") <= A_turnOnLux)){ -if ((!A_triggerOnce || (A_triggerOnce && !state.A_triggered)) && (!A_switchDisable || (A_switchDisable && !state.A_triggered))) { +if (/*(!A_triggerOnce || (A_triggerOnce && !state.A_triggered)) && (!A_switchDisable || (A_switchDisable && !state.A_triggered))*/true) { if (evt.physical){ state.A_triggered = true unschedule(delayTurnOffA)