mirror of
https://github.com/mtan93/SmartThingsPublic.git
synced 2026-03-08 05:31:56 +00:00
Add parens to unsubscribe method (#1231)
This commit is contained in:
committed by
Juan Pablo Risso
parent
e89e45e000
commit
4523498dab
@@ -14,7 +14,7 @@
|
|||||||
* for the specific language governing permissions and limitations under the License.
|
* for the specific language governing permissions and limitations under the License.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
definition(
|
definition(
|
||||||
name: "Smart Home Ventilation",
|
name: "Smart Home Ventilation",
|
||||||
namespace: "MichaelStruck",
|
namespace: "MichaelStruck",
|
||||||
@@ -164,7 +164,7 @@ def installed() {
|
|||||||
def updated() {
|
def updated() {
|
||||||
unschedule()
|
unschedule()
|
||||||
turnOffSwitch() //Turn off all switches if the schedules are changed while in mid-schedule
|
turnOffSwitch() //Turn off all switches if the schedules are changed while in mid-schedule
|
||||||
unsubscribe
|
unsubscribe()
|
||||||
log.debug "Updated with settings: ${settings}"
|
log.debug "Updated with settings: ${settings}"
|
||||||
init()
|
init()
|
||||||
}
|
}
|
||||||
@@ -174,12 +174,12 @@ def init() {
|
|||||||
schedule (midnightTime, midNight)
|
schedule (midnightTime, midNight)
|
||||||
subscribe(location, "mode", locationHandler)
|
subscribe(location, "mode", locationHandler)
|
||||||
startProcess()
|
startProcess()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Common methods
|
// Common methods
|
||||||
|
|
||||||
def startProcess () {
|
def startProcess () {
|
||||||
createDayArray()
|
createDayArray()
|
||||||
state.dayCount=state.data.size()
|
state.dayCount=state.data.size()
|
||||||
if (state.dayCount){
|
if (state.dayCount){
|
||||||
state.counter = 0
|
state.counter = 0
|
||||||
@@ -190,7 +190,7 @@ def startProcess () {
|
|||||||
def startDay() {
|
def startDay() {
|
||||||
def start = convertEpoch(state.data[state.counter].start)
|
def start = convertEpoch(state.data[state.counter].start)
|
||||||
def stop = convertEpoch(state.data[state.counter].stop)
|
def stop = convertEpoch(state.data[state.counter].stop)
|
||||||
|
|
||||||
runOnce(start, turnOnSwitch, [overwrite: true])
|
runOnce(start, turnOnSwitch, [overwrite: true])
|
||||||
runOnce(stop, incDay, [overwrite: true])
|
runOnce(stop, incDay, [overwrite: true])
|
||||||
}
|
}
|
||||||
@@ -218,7 +218,7 @@ def locationHandler(evt) {
|
|||||||
}
|
}
|
||||||
if (!result) {
|
if (!result) {
|
||||||
startProcess()
|
startProcess()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
def midNight(){
|
def midNight(){
|
||||||
@@ -238,7 +238,7 @@ def turnOffSwitch() {
|
|||||||
}
|
}
|
||||||
log.debug "Home ventilation switches are off."
|
log.debug "Home ventilation switches are off."
|
||||||
}
|
}
|
||||||
|
|
||||||
def schedDesc(on1, off1, on2, off2, on3, off3, on4, off4, modeList, dayList) {
|
def schedDesc(on1, off1, on2, off2, on3, off3, on4, off4, modeList, dayList) {
|
||||||
def title = ""
|
def title = ""
|
||||||
def dayListClean = "On "
|
def dayListClean = "On "
|
||||||
@@ -252,7 +252,7 @@ def schedDesc(on1, off1, on2, off2, on3, off3, on4, off4, modeList, dayList) {
|
|||||||
dayListClean = "${dayListClean}, "
|
dayListClean = "${dayListClean}, "
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
dayListClean = "Every day"
|
dayListClean = "Every day"
|
||||||
}
|
}
|
||||||
@@ -272,7 +272,7 @@ def schedDesc(on1, off1, on2, off2, on3, off3, on4, off4, modeList, dayList) {
|
|||||||
modeListClean = "${modeListClean} ${modePrefix}"
|
modeListClean = "${modeListClean} ${modePrefix}"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
modeListClean = "${modeListClean}all modes"
|
modeListClean = "${modeListClean}all modes"
|
||||||
}
|
}
|
||||||
@@ -283,16 +283,16 @@ def schedDesc(on1, off1, on2, off2, on3, off3, on4, off4, modeList, dayList) {
|
|||||||
title += "\nSchedule 2: ${humanReadableTime(on2)} to ${humanReadableTime(off2)}"
|
title += "\nSchedule 2: ${humanReadableTime(on2)} to ${humanReadableTime(off2)}"
|
||||||
}
|
}
|
||||||
if (on3 && off3) {
|
if (on3 && off3) {
|
||||||
title += "\nSchedule 3: ${humanReadableTime(on3)} to ${humanReadableTime(off3)}"
|
title += "\nSchedule 3: ${humanReadableTime(on3)} to ${humanReadableTime(off3)}"
|
||||||
}
|
}
|
||||||
if (on4 && off4) {
|
if (on4 && off4) {
|
||||||
title += "\nSchedule 4: ${humanReadableTime(on4)} to ${humanReadableTime(off4)}"
|
title += "\nSchedule 4: ${humanReadableTime(on4)} to ${humanReadableTime(off4)}"
|
||||||
}
|
}
|
||||||
if (on1 || on2 || on3 || on4) {
|
if (on1 || on2 || on3 || on4) {
|
||||||
title += "\n$modeListClean"
|
title += "\n$modeListClean"
|
||||||
title += "\n$dayListClean"
|
title += "\n$dayListClean"
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!on1 && !on2 && !on3 && !on4) {
|
if (!on1 && !on2 && !on3 && !on4) {
|
||||||
title="Click to configure scenario"
|
title="Click to configure scenario"
|
||||||
}
|
}
|
||||||
@@ -374,7 +374,7 @@ def createDayArray() {
|
|||||||
timeOk(timeOnD1, timeOffD1)
|
timeOk(timeOnD1, timeOffD1)
|
||||||
timeOk(timeOnD2, timeOffD2)
|
timeOk(timeOnD2, timeOffD2)
|
||||||
timeOk(timeOnD3, timeOffD3)
|
timeOk(timeOnD3, timeOffD3)
|
||||||
timeOk(timeOnD4, timeOffD4)
|
timeOk(timeOnD4, timeOffD4)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
state.data.sort{it.start}
|
state.data.sort{it.start}
|
||||||
@@ -384,7 +384,7 @@ def createDayArray() {
|
|||||||
|
|
||||||
private def textAppName() {
|
private def textAppName() {
|
||||||
def text = "Smart Home Ventilation"
|
def text = "Smart Home Ventilation"
|
||||||
}
|
}
|
||||||
|
|
||||||
private def textVersion() {
|
private def textVersion() {
|
||||||
def text = "Version 2.1.2 (05/31/2015)"
|
def text = "Version 2.1.2 (05/31/2015)"
|
||||||
@@ -416,4 +416,4 @@ private def textHelp() {
|
|||||||
"that each scenario does not overlap and run in separate modes (i.e. Home, Out of town, etc). Also note that you should " +
|
"that each scenario does not overlap and run in separate modes (i.e. Home, Out of town, etc). Also note that you should " +
|
||||||
"avoid scheduling the ventilation fan at exactly midnight; the app resets itself at that time. It is suggested to start any new schedule " +
|
"avoid scheduling the ventilation fan at exactly midnight; the app resets itself at that time. It is suggested to start any new schedule " +
|
||||||
"at 12:15 am or later."
|
"at 12:15 am or later."
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user