Updating conflict variables list in main.jpf.

diff --git a/main.jpf b/main.jpf
index 85af65a5ccedf82e64dccbc07d1cdb7fb441caf1..d394ec3350e8e0f4a1a0988e62874e1d5f752c1b 100644 (file)
--- a/main.jpf
+++ b/main.jpf
@@ -4,11 +4,16 @@ target = main
 listener=gov.nasa.jpf.listener.VariableConflictTracker
 
 # Potentially conflicting variables
-variables=currentAlarm,currentContact,doorState,currentLock,currentMotion,status,currentPresence,\
-                       currentSmokeValue,currentHeatingSetpoint,thermostatSetpoint,currentCoolingSetpoint,\
-                       thermostatOperatingState,thermostatFanMode,currentThermostatMode,currentSwitch,\
-                       currentAcceleration, currentBattery, currentPresence, currentCarbonMonoxideValue,\
-                       color, hue, saturation
+# Alarms
+#variables=currentAlarm
+# Locks
+variables=currentLock
+# Thermostats
+#variables=currentHeatingSetpoint,thermostatSetpoint,currentCoolingSetpoint,thermostatOperatingState,thermostatFanMode,currentThermostatMode
+# Switches
+#variables=currentSwitch
+# Lights
+#variables=color,hue,saturation
                        
 # Potentially conflicting apps (we default to App1 and App2 for now)
 apps=App1,App2