Rsad and write serial port

CubeControl/Frame.java

@@ -67,7 +67,7 @@ public class Frame extends JFrame implements ListSelectionListener {
   private JButton load = new JButton();
   private JButton save = new JButton();
   private JButton saveAs = new JButton();
-  private JComboBox jComboBox1 = new JComboBox();
+  public JComboBox jComboBox1 = new JComboBox();
   private JButton upload = new JButton();
   private JButton download = new JButton();
   private JLabel jLabel4 = new JLabel();
@@ -805,8 +805,43 @@ public class Frame extends JFrame implements ListSelectionListener {
 		l.resetView();
 	}
 
+	if (s.startsWith("port ")) {
+		s = s.substring(5);
+		f.jComboBox1.addItem(s);
+		f.jComboBox1.setSelectedItem(s);
+	}
+
+	if (s.startsWith("send ")) {
+		s = s.substring(5);
+		HelperUtility.openPort(((String)f.jComboBox1.getSelectedItem()) + "\n");
+		short[] dat = toShortArray(s);
+		HelperUtility.writeData(dat, dat.length);
+		HelperUtility.closePort();
+	}
+
+	if (s.startsWith("read ")) {
+		s = s.substring(5);
+		int leng = Integer.parseInt(s);
+		HelperUtility.openPort((String)f.jComboBox1.getSelectedItem());
+		short[] data = HelperUtility.readData(leng);
+		System.out.println(shortToString(data));
+		HelperUtility.closePort();
+	}
+
+	if (s.equals("s") || s.equals("scan")) {
+		String[] sPorts = f.worker.getSerialPorts();
+		f.jComboBox1.removeAllItems();
+		for(int i = 0; i < sPorts.length; i++){
+			f.jComboBox1.addItem(sPorts[i]);
+		}
+	}
+
       if (s.equals("h") || (s.equals("help"))) {
         System.out.println("Commands:");
+		System.out.println("\t'port *name*'\t:\tSet serial port to this");
+		System.out.println("\t'send *datas*'\t:\tSend data to serial port");
+		System.out.println("\t'read *leng*'\t:\tRead data from serial port");
+		System.out.println("\t'scan'   / 's'\t:\tScan for serial ports");
         System.out.println("\t'on'     / '1'\t:\tToggle all LEDs on");
         System.out.println("\t'off'    / '0'\t:\tToggle all LEDs off");
         System.out.println("\t'print'  / 'p'\t:\tPrint 3D Translation Matrix Data");
@@ -819,4 +854,22 @@ public class Frame extends JFrame implements ListSelectionListener {
     }
   } while (true);
   }
+
+  private static short[] toShortArray(String s) {
+	  char[] d = s.toCharArray();
+	  System.out.println("Length: " + d.length);
+	  short[] r = new short[d.length];
+	  for (int i = 0; i < d.length; i++) {
+		  r[i] = (short)d[i];
+	  }
+	  return r;
+  }
+
+  private static String shortToString(short[] d) {
+	  String s = "";
+	  for (int i = 0; i < d.length; i++) {
+		  s += String.valueOf((char)d[i]);
+	  }
+	  return s;
+  }
 }

CubeControl/HelperUtility.java

@@ -42,6 +42,18 @@ public class HelperUtility {
 	public static native String getPorts();
 
 	/**
+	 * Open Connection to a port
+	 * @return TRUE if successful
+	 * @param name Port to open
+	 */
+	public static native boolean openPort(String name);
+
+	/**
+	 * Close Connection to port
+	 */
+	public static native void closePort();
+
+	/**
 	 * Read data from Cube
 	 * @param length Amount of data to read
 	 * @return Data read

CubeControl/serialHelper.c

@@ -77,9 +77,43 @@ JNIEXPORT jstring JNICALL Java_HelperUtility_getPorts(JNIEnv *env, jclass class)
 }
 
 JNIEXPORT jshortArray JNICALL Java_HelperUtility_readData(JNIEnv *env, jclass class, jint length) {
-	return NULL;
+	jshortArray arr = (*env)->NewShortArray(env, length);
+	int toBeRead = 0, read;
+	char *data = (char *)malloc(length * sizeof(char));
+
+	while (length > 0) {
+		read = serialRead(data + toBeRead, length);
+		toBeRead += read;
+		length -= read;
+	}
+
+	(*env)->SetShortArrayRegion(env, arr, 0, (*env)->GetArrayLength(env, arr), (jshort *)data);
+	return arr;
 }
 
 JNIEXPORT void JNICALL Java_HelperUtility_writeData(JNIEnv *env, jclass class, jshortArray data, jint length) {
-	return;
+	int written = 0;
+	int lastIndex = length;
+	char *dat = (char *)malloc(length * sizeof(char));
+
+	while (length > 0) {
+		(*env)->GetShortArrayRegion(env, data, written, length, (jshort *)dat);
+		written = serialWrite(dat, length);
+		length -= written;
+	}
+}
+
+JNIEXPORT void JNICALL Java_HelperUtility_closePort(JNIEnv * env, jclass class) {
+	serialClose();
+}
+
+JNIEXPORT jboolean JNICALL Java_HelperUtility_openPort(JNIEnv *env, jclass class, jstring name) {
+	jboolean isCopy;
+	const char *path = (*env)->GetStringUTFChars(env, name, &isCopy);
+	int ret = serialOpen((char *)path);
+	if (ret == 0) {
+		return JNI_TRUE;
+	} else {
+		return JNI_FALSE;
+	}
 }