midNightReset()
if(A_motion) {
+ //subscribe(A_motion, "motion", onEventA)
subscribe(A_motion, "motion", onEventA)
}
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_mode || A_mode.contains(location.mode)) && getTimeOk (A_timeStart, A_timeEnd) && getDayOk(A_day)) { //checks to make sure we are not opperating outside of set restrictions.
+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
//when physical switch is actuated disable the scenario
def onPressA(evt) {
-if ((!A_mode || A_mode.contains(location.mode)) && getTimeOk (A_timeStart, A_timeEnd) && getDayOk(A_day)) { //checks to make sure we are not opperating outside of set restrictions.
+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)
def getMidnight() {
- def midnightToday = timeToday("2000-01-01T23:59:59.999-0000", location.timeZone)
+ def midnightToday = timeToday("23:59", location.timeZone)
midnightToday
}
def result = false
if (motion) {
- if (motion.latestValue("motion").contains("active")) {
+ if (motion.latestValue("motion") == "active") {
motionDetected = true
}
}
if (acceleration) {
- if (acceleration.latestValue("acceleration").contains("active")) {
+ if (acceleration.latestValue("acceleration") == "active") {
accelerationDetected = true
}
}