Update gentle-wake-up.groovy

[smartapps.git] / third-party / groveStreams.groovy

diff --git a/third-party/groveStreams.groovy b/third-party/groveStreams.groovy
index 2497733c673131d56dfb61c5dc3f80eb7cfd21cb..24b3c8ce78c29232f28390782b5e32775e850ef6 100755 (executable)
--- a/third-party/groveStreams.groovy
+++ b/third-party/groveStreams.groovy
@@ -46,12 +46,12 @@ preferences {
        section("Log devices...") {
                input "temperatures", "capability.temperatureMeasurement", title: "Temperatures", required: false, multiple: true
                input "thermostats", "capability.thermostat", title: "Thermostats", required: false, multiple: true
-               input "ecobees", "device.myEcobeeDevice", title: "Ecobees", required: false, multiple: true
+               //input "ecobees", "device.myEcobeeDevice", title: "Ecobees", required: false, multiple: true
                input "automatic", "capability.presenceSensor", title: "Automatic Connected Device(s)", required: false, multiple: true
                input "detectors", "capability.smokeDetector", title: "Smoke/CarbonMonoxide Detectors", required: false, multiple: true
                input "humidities", "capability.relativeHumidityMeasurement", title: "Humidity sensors", required: false, multiple: true
                input "waters", "capability.waterSensor", title: "Water sensors", required: false, multiple: true
-               input "illuminances", "capability.IlluminanceMeasurement", title: "Illuminance sensor", required: false, multiple: true
+               input "illuminances", "capability.illuminanceMeasurement", title: "Illuminance sensor", required: false, multiple: true
                input "locks", "capability.lock", title: "Locks", required: false, multiple: true
                input "contacts", "capability.contactSensor", title: "Doors open/close", required: false, multiple: true
                input "accelerations", "capability.accelerationSensor", title: "Accelerations", required: false, multiple: true
@@ -108,26 +108,6 @@ def initialize() {
        subscribe(thermostats, "thermostatMode", handleThermostatModeEvent)
        subscribe(thermostats, "fanMode", handleFanModeEvent)
        subscribe(thermostats, "thermostatOperatingState", handleThermostatOperatingStateEvent)
-       subscribe(ecobees, "dehumidifierMode", handleDehumidifierModeEvent)
-       subscribe(ecobees, "equipmentStatus", handleEquipmentStatusEvent)
-       subscribe(ecobees, "dehumidifierLevel", handleDehumidifierLevelEvent)
-       subscribe(ecobees, "humidifierMode", handleHumidifierModeEvent)
-       subscribe(ecobees, "humidifierLevel", handleHumidifierLevelEvent)
-       subscribe(ecobees, "fanMinOnTime", handleFanMinOnTimeEvent)
-       subscribe(ecobees, "ventilatorMode", handleVentilatorModeEvent)
-       subscribe(ecobees, "ventilatorMinOnTime", handleVentilatorMinOnTimeEvent)
-       subscribe(ecobees, "programScheduleName", handleProgramNameEvent)
-       subscribe(ecobees, "auxHeat1RuntimeDaily", handleDailyStats)
-       subscribe(ecobees, "auxHeat2RuntimeDaily", handleDailyStats)
-       subscribe(ecobees, "auxHeat3RuntimeDaily", handleDailyStats)
-       subscribe(ecobees, "compCool1RuntimeDaily", handleDailyStats)
-       subscribe(ecobees, "compCool2RuntimeDaily", handleDailyStats)
-       subscribe(ecobees, "fanRuntimeDaily", handleDailyStats)
-       subscribe(ecobees, "humidifierRuntimeDaily", handleDailyStats)
-       subscribe(ecobees, "dehumidifierRuntimeDaily", handleDailyStats)
-       subscribe(ecobees, "ventilatorRuntimeDaily", handleDailyStats)
-       subscribe(ecobees, "presence", handlePresenceEvent)
-       subscribe(ecobees, "compCool2RuntimeDaily", handleDailyStats)
        subscribe(automatic, "yesterdayTripsAvgAverageKmpl",handleDailyStats)
        subscribe(automatic, "yesterdayTripsAvgDistanceM",handleDailyStats)
        subscribe(automatic, "yesterdayTripsAvgDurationS",handleDailyStats)
@@ -159,11 +139,11 @@ def initialize() {
        subscribe(location, "sunsetTime", rescheduleIfNeeded)
        subscribe(app, appTouch)
 
-       rescheduleIfNeeded()   
+       //rescheduleIfNeeded()   
 }
 
 def appTouch(evt) {
-       rescheduleIfNeeded()
+       rescheduleIfNeeded(evt)
        processQueue()
        def queue = []
        atomicState.queue=queue
@@ -181,8 +161,8 @@ def rescheduleIfNeeded(evt) {
        }
        if (((atomicState?.poll["last"]?:0) + (delay * 60000) < currentTime) && canSchedule()) {
                log.info "rescheduleIfNeeded>scheduling processQueue in ${delay} minutes.."
-               unschedule        
-               schedule("0 0/${delay} * * * ?", processQueue)
+               unschedule()     
+               //schedule("14:00", processQueue)
        }
        // Update rescheduled state
     
@@ -400,7 +380,7 @@ def processQueue() {
 
        if (((atomicState?.poll["rescheduled"]?:0) + (delay * 60000)) < now()) {
                log.info "processQueue>scheduling rescheduleIfNeeded() in ${delay} minutes.."
-               schedule("0 0/${delay} * * * ?", rescheduleIfNeeded)
+               //schedule("0 0/${delay} * * * ?", rescheduleIfNeeded)
                // Update rescheduled state
                atomicState?.poll["rescheduled"] = now()
        }