package MotionSensor
import Timer.SimulatedTimer
-//JPF's Verify API
-import gov.nasa.jpf.vm.Verify
-
public class MotionSensors {
private int deviceNumbers
private List motionSensors
private String motionLatestValue = "inactive"
- MotionSensors(Closure sendEvent, int deviceNumbers) {
+ MotionSensors(Closure sendEvent, int deviceNumbers, boolean init) {
this.sendEvent = sendEvent
this.deviceNumbers = deviceNumbers
this.motionSensors = []
- /*def init = Verify.getBoolean()
if (init) {
this.motion = "inactive"
+ this.currentMotion = "inactive"
this.motionLatestValue = "inactive"
} else {
this.motion = "active"
+ this.currentMotion = "active"
this.motionLatestValue = "active"
- }*/
+ }
motionSensors.add(new MotionSensor(id, label, displayName, this.motion, this.motionLatestValue))
}
def collect(Closure Input) {
motionSensors.collect(Input)
}
-
+
+ def currentState(String deviceFeature) {
+ currentValue(deviceFeature)
+ }
def currentValue(String deviceFeature) {
motionSensors[0].currentValue(deviceFeature)//It is called if we have only one device
}
def statesSince(String info, Date dateObj) {
- return motionSensors[0].statesSince(info, dateObj)
+ return motionSensors[0].statesSince()
}
def getAt(int ix) {