From: amiraj <amiraj.95@uci.edu>
Date: Thu, 1 Aug 2019 19:18:26 +0000 (-0700)
Subject: Solving the conflicts
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartthings-infrastructure.git;a=commitdiff_plain;h=4fba2a38e9f917aadf91639ed04e1d2338fa2b34

Solving the conflicts
---

diff --git a/SmokeDetector/SmokeDetectors.groovy b/SmokeDetector/SmokeDetectors.groovy
index e7aec2f..768f53a 100644
--- a/SmokeDetector/SmokeDetectors.groovy
+++ b/SmokeDetector/SmokeDetectors.groovy
@@ -53,7 +53,7 @@ public class SmokeDetectors {
 			this.carbonMonoxideLatestValue = "tested"		
 		}
 		}*/
-		smokeDetectors.add(new SmokeDetector(id, label, displayName, this.currentSmokeValue, this.smokeLatestValue))
+		smokeDetectors.add(new SmokeDetector(id, label, displayName, this.currentSmokeValue, this.smokeLatestValue, this.carbonMonoxide, this.carbonMonoxideLatestValue, this.battery))
 	}
 
 	//By Model Checker
diff --git a/Thermostat/Thermostats.groovy b/Thermostat/Thermostats.groovy
index 42a8728..73a2148 100644
--- a/Thermostat/Thermostats.groovy
+++ b/Thermostat/Thermostats.groovy
@@ -227,6 +227,8 @@ public class Thermostats{
 			this.coolingSetpoint = coolingSetpoint
 			this.currentHeatingSetpoint = heatingSetpoint
 			this.heatingSetpoint = heatingSetpoint
+			this.latestCoolingSetPoint = coolingSetpoint
+	                this.latestHeatingSetpoint = heatingSetpoint
 			thermostats[0].setHold(info1, coolingSetpoint, heatingSetpoint, info2, info3)
 		}
 	}