From 4fba2a38e9f917aadf91639ed04e1d2338fa2b34 Mon Sep 17 00:00:00 2001 From: amiraj Date: Thu, 1 Aug 2019 12:18:26 -0700 Subject: [PATCH] Solving the conflicts --- SmokeDetector/SmokeDetectors.groovy | 2 +- Thermostat/Thermostats.groovy | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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) } } -- 2.34.1