Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure

[smartthings-infrastructure.git] / Thermostat / Thermostats.groovy

diff --git a/Thermostat/Thermostats.groovy b/Thermostat/Thermostats.groovy
index d8f7adaff9a9e14d69d32fa48f9f30f2b9471d60..80a643b6a5ae0be8fbdaa4961f354e617254fab2 100644 (file)
--- a/Thermostat/Thermostats.groovy
+++ b/Thermostat/Thermostats.groovy
@@ -46,7 +46,7 @@ public class Thermostats{
                this.deviceNumbers = deviceNumbers
                this.thermostats = []
 
-               def initTemperature = Verify.getIntFromList(60, 66, 70)
+               /*def initTemperature = Verify.getIntFromList(60, 66, 70)
                this.temperature = initTemperature
                this.currentTemperature = initTemperature
                
@@ -99,8 +99,12 @@ public class Thermostats{
                } else {
                        this.thermostatMode = "off"
                        this.currentThermostatMode = "off"
+<<<<<<< HEAD
                        this.thermostatLatestMode = "off"
                }
+=======
+               }*/
+>>>>>>> a02c9807815a35c0f57241ee6510a3d312499049
 
                thermostats.add(new Thermostat(sendEvent, id, label, displayName, this.temperature, this.currentCoolingSetpoint, 
                                                this.currentHeatingSetpoint, this.coolingSetpoint, this.thermostatSetpoint, this.heatingSetpoint, this.coolingSetpointRange,