Solving the conflicts

diff --git a/SmokeDetector/SmokeDetectors.groovy b/SmokeDetector/SmokeDetectors.groovy
index e7aec2f7aa5279456a837eb2af5f219026802670..768f53acb1ed9e1e7c77ba67b2022bc00339c9e6 100644 (file)
--- 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 42a8728ebaa584e942d3bd3a2520610ec4183356..73a2148c0b9477282bc8c82b7bd743024b441173 100644 (file)
--- 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)
                }
        }