expose NGIO getStatus method to LabQuest class

besides getting the status of the device this should be
an efficient way to see if the device is attached.
[#56591614]

Author: scytacki

labquest-jna/src/main/java/org/concord/sensor/labquest/jna/LabQuest.java

@@ -20,6 +20,8 @@ public void open(String deviceName, Pointer hLibrary)
 
 	public void acquireExclusiveOwnership() throws LabQuestException;
 
+	public LabQuestStatus getStatus() throws LabQuestException;
+
 	public String getSensorName(byte channel) throws LabQuestException;
 
 	public int getSensorId(byte channel) throws LabQuestException;

labquest-jna/src/main/java/org/concord/sensor/labquest/jna/LabQuestImpl.java

@@ -92,6 +92,17 @@ public void acquireExclusiveOwnership() throws LabQuestException
 		}
 	}
 
+	public LabQuestStatus getStatus() throws LabQuestException
+	{
+		LabQuestStatus status = new LabQuestStatus();
+		try{
+			sendCmdAndGetResponse(NGIOSourceCmds.CMD_ID_GET_STATUS, null,
+					status);
+		} catch(NGIOException e) {
+			throw new LabQuestException(e);
+		}
+		return status;
+	}
 
 	/**
 	 * @see org.concord.sensor.labquest.jna.LabQuest#getSensorName()

labquest-jna/src/main/java/org/concord/sensor/labquest/jna/LabQuestStatus.java

@@ -0,0 +1,30 @@
+package org.concord.sensor.labquest.jna;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class LabQuestStatus extends NGIOStructure {
+	public byte status;	//See NGIO_MASK_STATUS_*.
+	public byte minorVersionMasterCPU;	//Binary coded decimal
+	public byte majorVersionMasterCPU;	//Binary coded decimal
+	public byte minorVersionSlaveCPU;		//Binary coded decimal - updated only by Skip and Cyclops, not by Jonah
+	public byte majorVersionSlaveCPU;		//Binary coded decimal - updated only by Skip and Cyclops, not by Jonah
+
+	@Override
+	protected List<String> getFieldOrder() {
+		return Arrays.asList(new String[] { 
+				"status", 
+				"minorVersionMasterCPU",
+				"majorVersionMasterCPU",
+				"minorVersionSlaveCPU",
+				"majorVersionSlaveCPU"
+		});
+	}
+
+	public String inspect() {
+		return "status: " + status +
+				", masterCPUVersion: " + majorVersionMasterCPU + "." + minorVersionMasterCPU +
+				", slaveCPUVersion: " + majorVersionSlaveCPU + "." + minorVersionSlaveCPU;
+	}
+
+}

labquest-jna/src/main/java/org/concord/sensor/labquest/jna/NGIOLibrary.java

@@ -110,6 +110,11 @@ int device_IsRemoteCollectionActive(Pointer hDevice,
 	int device_SendCmdAndGetResponse(Pointer hDevice, byte cmd, Structure pParams,
 			int nParamBytes, Pointer pRespBuf, IntByReference pnRespBytes, int timeoutMs); 
 
+	int device_GetLastCmdResponseStatus(Pointer hDevice,
+			ByteByReference lastCmd, ByteByReference lastCmdStatus,
+			ByteByReference lastCmdWithErrorRespSentOvertheWire,
+			ByteByReference lastErrorSentOvertheWire);
+
 	// untested
 	// need to possibly add in the NGIO_PTR structure for pParams
 	int device_SendCmd(Pointer hDevice,	byte cmd, Pointer pParms, int nParamBytes,

labquest-jna/src/test/java/org/concord/sensor/labquest/jna/LabQuestJNATest.java

@@ -85,6 +85,8 @@ public void run() {
 	 * @throws IOException 
 	 */
 	public static void test() throws LabQuestException {
+		LabQuestStatus status = labQuest.getStatus();
+		System.out.println("labQuest status: " + status.inspect());
 		boolean remoteCollectionActive = false;
 		remoteCollectionActive = labQuest.isRemoteCollectionActive();
 		System.out.println("remote collection active: " + remoteCollectionActive);