ExperimentConfig supports initialReadDelay option set by device

- LabPro requires an initial delay before reading experiment data

Author: kswenson

sensor-native/src/swig/java/ccsd/pseudo/ExperimentConfig.java

@@ -37,6 +37,7 @@ public class ExperimentConfig implements
  {
   private long swigCPtr;
   protected boolean swigCMemOwn;
+  private int initialReadDelayMillis;
 
   protected ExperimentConfig(long cPtr, boolean cMemoryOwn) {
     swigCMemOwn = cMemoryOwn;
@@ -69,6 +70,16 @@ public boolean getExactPeriod()
 		return getExactPeriodUChar() == 1;
 	}
 
+  public int getInitialReadDelay()
+  {
+    return initialReadDelayMillis;
+  }
+
+  public void setInitialReadDelay(int initialReadDelayMillis)
+  {
+    this.initialReadDelayMillis = initialReadDelayMillis;
+  }
+	
 	public org.concord.sensor.SensorConfig [] getSensorConfigs()
 	{
 		int num = getNumSensorConfigs();

sensor-native/src/swig/java/ccsd/ti/ExperimentConfig.java

@@ -37,6 +37,7 @@ public class ExperimentConfig implements
  {
   private long swigCPtr;
   protected boolean swigCMemOwn;
+  private int initialReadDelayMillis;
 
   protected ExperimentConfig(long cPtr, boolean cMemoryOwn) {
     swigCMemOwn = cMemoryOwn;
@@ -136,6 +137,16 @@ public String getDeviceName() {
     return NativeBridgeJNI.get_ExperimentConfig_deviceName(swigCPtr);
   }
 
+  public int getInitialReadDelay()
+  {
+    return initialReadDelayMillis;
+  }
+
+  public void setInitialReadDelay(int initialReadDelayMillis)
+  {
+    this.initialReadDelayMillis = initialReadDelayMillis;
+  }
+	
   public void setNumSensorConfigs(int numSensorConfigs) {
     NativeBridgeJNI.set_ExperimentConfig_numSensorConfigs(swigCPtr, numSensorConfigs);
   }

sensor-native/src/swig/java/ccsd/vernier/ExperimentConfig.java

@@ -37,10 +37,12 @@ public class ExperimentConfig implements
  {
   private long swigCPtr;
   protected boolean swigCMemOwn;
+  private int initialReadDelayMillis;
 
   protected ExperimentConfig(long cPtr, boolean cMemoryOwn) {
     swigCMemOwn = cMemoryOwn;
     swigCPtr = cPtr;
+    initialReadDelayMillis = 0;
   }
 
   protected void finalize() {
@@ -67,7 +69,17 @@ public boolean isValid()
 	public boolean getExactPeriod()
 	{
 		return getExactPeriodUChar() == 1;
-	}
+  }
+  
+  public int getInitialReadDelay()
+  {
+    return initialReadDelayMillis;
+  }
+
+  public void setInitialReadDelay(int initialReadDelayMillis)
+  {
+    this.initialReadDelayMillis = initialReadDelayMillis;
+  }
 
 	public org.concord.sensor.SensorConfig [] getSensorConfigs()
 	{

sensor-vernier/src/main/java/org/concord/sensor/vernier/labpro/LabProSensorDevice.java

@@ -33,7 +33,10 @@ public class LabProSensorDevice extends AbstractStreamingSensorDevice
 
     public final static int [] CHANNELS = {1,2,3,4,11,12};
 
-    public final static String ERR_DEVICE_NOT_ATTACHED = "LabPro is not attached";
+		public final static String ERR_DEVICE_NOT_ATTACHED = "LabPro is not attached";
+
+		// additional delay from starting an experiment to reading first sample
+		public final static int INITIAL_READ_DELAY_MILLIS = 850;
 
 	protected final byte [] buf = new byte [1024];
 
@@ -169,15 +172,18 @@ public final static int round(float value)
      * @see org.concord.sensor.device.SensorDevice#configure(org.concord.sensor.ExperimentRequest)
      */
     public ExperimentConfig configure(ExperimentRequest request) 
-    {
+	{
 		ExperimentConfig experimentConfig = autoIdConfigure(request);
 
+		// Configure the LabPro-specific timing delay
+		experimentConfig.setInitialReadDelay(INITIAL_READ_DELAY_MILLIS);
+
 		// Configure the LabPro library appropriately
 		int numChannels = experimentConfig.getSensorConfigs().length;
 		port.setNumChannels(numChannels);
 
 		return experimentConfig;
-    }
+	}
 
 
 	/**
@@ -389,12 +395,12 @@ public boolean start()
 				} else if(sensor.getType() == SensorConfig.QUANTITY_RAW_VOLTAGE_2 ||
 						sensor.getType() == SensorConfig.QUANTITY_RAW_DATA_2){
 					// setup sensor to report +/-10V
-					protocol.channelSetup(channelNumber, 2);				
+					protocol.channelSetup(channelNumber, 2);
 				} else {
 					protocol.channelSetup(channelNumber, 1);
-				}				
-			}			
-			
+				}
+			}
+
 			port.setNumChannels(sensorConfigs.length);
 
 			// Turning on the power seems necessary before reading
@@ -439,7 +445,7 @@ public void stop(boolean wasRunning)
 			// send the reset
 			protocol.reset();
 			port.reset();
-						
+
 			// Close the port if it can open quickly again.
 			// This way if the program crashes or second program is opened then there will
 			// be less of a chance of port conflict.

sensor/src/main/java/org/concord/sensor/ExperimentConfig.java

@@ -96,6 +96,24 @@ public interface ExperimentConfig
 	 */
 	public float getDataReadPeriod();
 
+	/**
+	 * This is the number of milliseconds the client should wait between
+	 * starting an experiment and beginning to collect the data in
+	 * addition to the time it takes to collect the first sample.
+	 * 
+	 * @return
+	 */
+	public int getInitialReadDelay();
+		
+	/**
+	 * This is the number of milliseconds the client should wait between
+	 * starting an experiment and beginning to collect the data in
+	 * addition to the time it takes to collect the first sample.
+	 * 
+	 * @return
+	 */
+	public void setInitialReadDelay(int initialReadDelayMillis);
+		
 	/**
 	 * An array of SensorConfig, each SensorConfig contains configuration
 	 * information about the sensor.  This will return null if there are no

sensor/src/main/java/org/concord/sensor/impl/ExperimentConfigImpl.java

@@ -49,9 +49,15 @@ public class ExperimentConfigImpl
     private String deviceName;
 	private int deviceId;
     private float dataReadPeriod;
+	private int initialReadDelayMillis;
 
     private Range periodRange;
-    
+	
+	public ExperimentConfigImpl()
+	{
+		initialReadDelayMillis = 0;
+	}
+
 	/* (non-Javadoc)
 	 * @see org.concord.sensor.ExperimentConfig#isValid()
 	 */
@@ -102,8 +108,18 @@ public void setExactPeriod(boolean exact)
 	{
 	    exactPeriod = exact;
 	}
-	
-	/* (non-Javadoc)
+
+	public int getInitialReadDelay()
+	{
+	  return initialReadDelayMillis;
+	}
+  
+	public void setInitialReadDelay(int initialReadDelayMillis)
+	{
+	  this.initialReadDelayMillis = initialReadDelayMillis;
+	}
+	  
+	  /* (non-Javadoc)
 	 * @see org.concord.sensor.ExperimentConfig#getSensorConfigs()
 	 */
 	public SensorConfig[] getSensorConfigs()