Modifying 'Slightly smarter use of motion sensor'

The MOTION works as expected outside the TIMEFRAME interval.
The SWITCH is always ON during the TIMEFRAME interval.
If there is no MOTION the SWITCH is turned OFF at the end of the TIMEFRAME interval.

devicetypes/smartthings/dimmer-switch.src/dimmer-switch.groovy

@@ -22,9 +22,10 @@ metadata {
 		capability "Sensor"
 		capability "Health Check"
 
-		fingerprint mfr:"0063", prod:"4457", deviceJoinName: "Z-Wave Wall Dimmer"
-		fingerprint mfr:"0063", prod:"4944", deviceJoinName: "Z-Wave Wall Dimmer"
-		fingerprint mfr:"0063", prod:"5044", deviceJoinName: "Z-Wave Plug-In Dimmer"
+		fingerprint mfr:"0063", prod:"4457", deviceJoinName: "GE In-Wall Smart Dimmer "
+		fingerprint mfr:"0063", prod:"4944", deviceJoinName: "GE In-Wall Smart Dimmer "
+		fingerprint mfr:"0063", prod:"5044", deviceJoinName: "GE Plug-In Smart Dimmer "
+		fingerprint mfr:"0063", prod:"4944", model:"3034", deviceJoinName: "GE In-Wall Smart Fan Control"
 	}
 
 	simulator {

devicetypes/smartthings/zwave-switch-generic.src/zwave-switch-generic.groovy

@@ -25,6 +25,9 @@ metadata {
 		fingerprint mfr:"0063", prod:"4F50", model:"3031", deviceJoinName: "GE Plug-in Outdoor Switch"
 		fingerprint mfr:"001D", prod:"1D04", model:"0334", deviceJoinName: "Leviton Outlet"
 		fingerprint mfr:"001D", prod:"1C02", model:"0334", deviceJoinName: "Leviton Switch"
+		fingerprint mfr:"001D", prod:"0301", model:"0334", deviceJoinName: "Leviton 15A Switch"
+		fingerprint mfr:"011A", prod:"0101", model:"0102", deviceJoinName: "Enerwave On/Off Switch"
+		fingerprint mfr:"011A", prod:"0101", model:"0603", deviceJoinName: "Enerwave Duplex Receptacle"
 	}
 
 	// simulator metadata

smartapps/herna202/smart-im-home.src/smart-im-home.groovy

@@ -1,212 +0,0 @@
-/**
- *  Smart Im Home
- *
- *  Copyright 2016 Fernando Hernandez
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- *  in compliance with the License. You may obtain a copy of the License at:
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
- *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
- *  for the specific language governing permissions and limitations under the License.
- *
- */
-definition(
-    name: "Smart Im Home",
-    namespace: "Herna202",
-    author: "Fernando Hernandez",
-    description: "Only turn on the light after sunset when you are the first to come home",
-    category: "Convenience",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
-    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png") {
-}
-
-
-preferences 
-{
-	section("When I arrive and leave...")
-    {
-		input "presence1", "capability.presenceSensor", title: "Who?",required: true, multiple: true
-	}
-	section("Turn on/off a light...")
-    {
-		input "switch1", "capability.switchLevel",required: true, multiple: true
-	}
-    section("Light Level") 
-    {
-    	input "LightLevel", "number", required: true, title: "How Bright?"
-    }
-    section("Change to this mode when you leave (defaults to Away)") 
-    {
-        input "leaveMode", "mode", required: false ,title: "Mode?"
-    }
-    section("Change to this mode when you return (defaults to Home)") 
-    {
-        input "returnMode", "mode", required: false, title: "Mode?"
-    }
-    section("False alarm threshold (defaults to 2 min)") 
-    {
-        input "falseAlarmThreshold", "decimal", title: "Number of minutes", required: false
-    }
-    section( "Notifications" ) 
-    {
-        input("recipients", "contact", title: "Send notifications to", required: false) 
-        {
-            input "sendPushMessage", "enum", title: "Send a push notification?", options: ["Yes", "No"], required: false
-            input "phone", "phone", title: "Send a Text Message?", required: false
-        }
-    }
-}
-
-def installed()
-{
-    state.howManyPeopleAreHome = isAnyoneHome()
-	subscribe(presence1, "presence", presenceHandler)
-}
-
-def updated()
-{
-	unsubscribe()
-	subscribe(presence1, "presence", presenceHandler)
-}
-
-private findFalseAlarmThreshold() 
-{
-    (falseAlarmThreshold != null && falseAlarmThreshold != "") ? falseAlarmThreshold : 2
-}
-
-private findReturnMode() 
-{
-    (returnMode != null && returnMode != "") ? returnMode : "Home"
-}
-
-private findLeaveMode() 
-{
-    (leaveMode != null && leaveMode != "") ? leaveMode : "Away"
-}
-
-private isAnyoneHome()
-{
-    def result = 0
-    for (person in presence1) 
-    {
-        if (person.currentPresence == "present") 
-        {
-            result++
-        }
-    }
-    return result
-}
-
-def checkIfEveryoneIsActuallyGone() {
-    if (isAnyoneHome() == 0) {
-        def threshold = 1000 * 60 * falseAlarmThreshold - 1000
-        def awayLongEnough = presence1.findAll { person ->
-            def presenceState = presence1.currentState("presence")
-            def elapsed = now() - presenceState.rawDateCreated.time
-            elapsed >= threshold
-        }
-        log.debug "Found ${awayLongEnough.size()} out of ${presence1.size()} person(s) who were away long enough"
-        if (awayLongEnough.size() == presence1.size()) {
-            //def message = "${app.label} changed your mode to '${newMode}' because everyone left home"
-            def message = "SmartThings changed your mode to '${findLeaveMode()}' because everyone left home"
-            log.info message
-            send(message)
-            switch1.setLevel(0)
-            state.howManyPeopleAreHome = 0
-            log.warn "Everyone's away."
-            changeMode(findLeaveMode())
-            runIn(30, "VerifyAway", [overwrite: false])
-        } else {
-            log.debug "not everyone has been away long enough; doing nothing"
-        }
-    } else {
-        log.debug "not everyone is away; doing nothing"
-    }
-}
-
-private send(msg) {
-    if ( sendPushMessage != "No" ) {
-        log.debug( "sending push message" )
-        sendPush( msg )
-    }
-
-    if ( phone ) {
-        log.debug( "sending text message" )
-        sendSms( phone, msg )
-    }
-
-    log.debug msg
-}
-
-def changeMode(newMode) 
-{
-    log.warn "changeMode, location.mode = $location.mode, newMode = $newMode, location.modes = $location.modes"
-
-    if (location.mode != newMode) {
-        if (location.modes?.find{it.name == newMode}) {
-            setLocationMode(newMode)
-            log.warn "changeMode, location.mode = $location.mode, newMode = $newMode, location.modes = $location.modes"
-        }  else {
-            log.warn "Tried to change to undefined mode '${newMode}'"
-        }
-    }
-}
-
-def VerifyHome() 
-{
-	log.warn "VerifyHome, location.mode = $location.mode"
-}
-
-def VerifyAway() 
-{
-	log.warn "VerifyAway, location.mode = $location.mode"
-}
-
-def presenceHandler(evt)
-{
-	def now = new Date()
-	def sunTime = getSunriseAndSunset()
-    def tempHowManyPoepleAreHome = isAnyoneHome()
-    
-	log.debug "nowTime: $now"
-	log.debug "riseTime: $sunTime.sunrise"
-	log.debug "setTime: $sunTime.sunset"
-	log.debug "presenceHandler $evt.name: $evt.value"
-	log.debug "The current mode ID is: ${location.currentMode}"
-
-    if(tempHowManyPoepleAreHome == 0)
-    {
-        log.info "starting debounce sequence"
-        runIn(findFalseAlarmThreshold() * 60, "checkIfEveryoneIsActuallyGone", [overwrite: false])
-    }
-	else if(state.howManyPeopleAreHome)
-    {
-    	log.warn "Someone is already Home, no need to take action"
-    }
-    else
-    {
-        log.warn "First person to arrive, need to take action"
-    	state.howManyPeopleAreHome = tempHowManyPoepleAreHome
-        log.debug "How many people are home after update $state.howManyPeopleAreHome"
-        def message = "SmartThings changed your mode to '${findReturnMode()}' because everyone came home"
-        log.info message
-        send(message)
-        changeMode(findReturnMode())
-        runIn(30, "VerifyHome", [overwrite: false])
-        if(state.howManyPeopleAreHome && (now > sunTime.sunset)) 
-        {
-            switch1.setLevel(LightLevel)
-            log.warn "Welcome home at night!"
-        }
-        else if(state.howManyPeopleAreHome && (now < sunTime.sunset)) 
-        {
-            log.warn "Welcome home at daytime!"
-        }
-    }
-}
-
-

smartapps/pasci/motion-switch-smarttimeframe.src/motion-switch-smarttimeframe.groovy

@@ -0,0 +1,125 @@
+//==================================================================================
+/**
+ *  Motion-Switch-Sched SmartApp
+ *
+ *  Copyright 2017 PASCI Ciro Ippolito 2017
+ ***********************************************************************************
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ */
+ //==================================================================================
+definition(
+    name: "Motion Switch SmartTimeframe",
+    namespace: "PASCI",
+    author: "PASCI",
+    description: "Motion Activated switch + Override timeframe.",
+    category: "Convenience",
+    iconUrl: "http://cdn.device-icons.smartthings.com/Home/home30-icn@2x.png",
+    iconX2Url: "http://cdn.device-icons.smartthings.com/Home/home30-icn@2x.png",
+    iconX3Url: "http://cdn.device-icons.smartthings.com/Home/home30-icn@2x.png"
+    )
+    //iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
+    //iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
+    //iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png")
+//==================================================================================
+preferences {
+    section("When MOTION is detected") {
+        input "themotion", "capability.motionSensor", required: true, title: "WHERE"
+    }
+    section("Turn ON this SWITCH") {
+        input "OUTLE", "capability.switch", required: true, title: "WHICH"
+    }
+    section("ON for how long") {
+         input "minutes", "number", required: true, title: "MINUTES)"
+    }
+    section("ON OVERRIDE time frame (if there is no motion)") {
+        input "FROMTime", "time", title: "From", required: true
+        input "TOTime", "time", title: "To", required: true
+    }
+}
+//==================================================================================
+def installed() {
+	log.debug "Installed with settings: ${settings}"
+	initialize()
+}
+//==================================================================================
+def updated() {
+	log.debug "Updated with settings: ${settings}"
+	unsubscribe()
+	initialize()
+}
+//==================================================================================
+def initialize() {
+    log.debug "Installata at: " + now()
+    schedule(FROMTime, handlerFROMTIME)
+    schedule(TOTime,   handlerTOTime)
+    subscribe(themotion, "motion.active",   handler_Motion___Active)
+    subscribe(themotion, "motion.inactive", handler_motion_inactive)
+}
+// HANDLERS
+//==================================================================================
+def handlerFROMTIME() {
+    log.debug "FROM TIME at ${new Date()}"
+    OUTLE.on()
+}
+//==================================================================================
+def handlerTOTime() {
+	log.debug "TO TIME at ${new Date()}"
+	checkMotion();
+    /*
+	def motionState = themotion.currentState("motion")
+	log.debug "state of motion sensor is: " + motionState.value
+    log.debug "TURN OFF at ${new Date()}"
+    log.debug "state of motion sensor is: " + themotion.motion
+    if (motionState.value ==  "active"){
+    	log.debug "state of motion sensor is ACTIVE"
+    }else{
+    	OUTLE.off()
+    	log.debug "state of motion sensor is INACTIVE"
+    }
+    */
+}
+//==================================================================================
+def handler_Motion___Active(evt) {
+	log.debug("MOT Active")
+	OUTLE.on()
+}
+//==================================================================================
+def handler_motion_inactive(evt) {
+	log.debug("MOT Inactive")
+	def between = timeOfDayIsBetween(FROMTime, TOTime, new Date(), location.timeZone)  
+	if (between) {
+    	log.debug("It dasan't mattar Christopha")
+		OUTLE.on()
+    } else {
+		runIn(60 * minutes, checkMotion)
+    }
+}
+//==================================================================================
+def checkMotion() {
+    log.debug "In checkMotion scheduled method"
+    // get the current state object for the motion sensor
+    def motionState = themotion.currentState("motion")
+    if (motionState.value == "inactive") {
+        def elapsed = now() - motionState.date.time // time elapsed between now and when the motion reported inactive
+        def threshold = 1000 * 60 * minutes  // elapsed time is in milliseconds
+            if (elapsed >= threshold) {
+            	log.debug "Motion has stayed inactive long enough since last check ($elapsed ms):  turning switch off"
+            	OUTLE.off()
+            } else {
+            	log.debug "Motion has not stayed inactive long enough since last check ($elapsed ms):  doing nothing"
+        }
+    } else {
+		// Motion active; just log it and do nothing
+		log.debug "Motion is active, do nothing and wait for inactive"
+    }
+}
+//==================================================================================
+//==================================================================================