CubeWorker is sending data!

CubeControl/AnimationUtility.java

@@ -156,12 +156,6 @@ public class AnimationUtility {
 		return frame;
 	}
 
-	/*
-	 * private static short[] invert(short[] a){ short[] tmp = new
-	 * short[a.length]; int j = 0; for(int i = a.length-1; i >= 0; i--){ tmp[j]
-	 * = a[i]; j++; } return tmp; }
-	 */
-
 	private static short[] concat(short[] a, short[] b) {
 		short[] c = new short[a.length + b.length];
 		System.arraycopy(a, 0, c, 0, a.length);

CubeControl/Frame.java

@@ -767,7 +767,7 @@ public class Frame extends JFrame implements ListSelectionListener, ChangeListen
 			public void actionPerformed(ActionEvent evt) {
 				// Error messages are generated by worker
 				if (worker.cubeProbeConnected((String) serialPortSelector.getSelectedItem())) {
-					if (worker.cubeSendState((String) serialPortSelector.getSelectedItem()) == -1) {
+					if (worker.cubeSendState((String) serialPortSelector.getSelectedItem()) != -1) {
 						showDialog("Success!", "Data was sent successfuly!");
 					}
 				}
@@ -781,7 +781,7 @@ public class Frame extends JFrame implements ListSelectionListener, ChangeListen
 			public void actionPerformed(ActionEvent evt) {
 				// Error messages are generated by worker
 				if (worker.cubeProbeConnected((String) serialPortSelector.getSelectedItem())) {
-					if (worker.cubeGetState((String) serialPortSelector.getSelectedItem()) == -1) {
+					if (worker.cubeGetState((String) serialPortSelector.getSelectedItem()) != -1) {
 						showDialog("Success!", "Got data successfuly!");
 					}
 				}

CubeControl/HelperUtility.java

@@ -179,9 +179,8 @@ public class HelperUtility {
 	/**
 	 * Read data from Cube
 	 * 
-	 * @param length
-	 *            Amount of data to read
-	 * @return Data read
+	 * @param length Amount of data to read
+	 * @return Data read, empty on error
 	 */
 	public static short[] readData(int length) {
 		try {
@@ -201,16 +200,19 @@ public class HelperUtility {
 	 *            Data to write
 	 * @param length
 	 *            Length of data
+	 *
+	 * @return TRUE on success, FALSE on error
 	 */
-	public static void writeData(short[] data, int length) {
+	public static boolean writeData(short[] data, int length) {
 		try {
-			writeDataNative(data, length);
+			return writeDataNative(data, length);
 		} catch (UnsatisfiedLinkError e) {
 			System.out.println("ERROR: Library not loaded! (writeData)");
+			return false;
 		}
 	}
 
-	private static native void writeDataNative(short[] data, int length);
+	private static native boolean writeDataNative(short[] data, int length);
 
 	// http://thomaswabner.wordpress.com/2007/10/09/fast-stream-copy-using-javanio-channels/
 	private static void fastChannelCopy(ReadableByteChannel src, WritableByteChannel dest) throws IOException {

CubeControl/SerialHelper.java

@@ -1,358 +0,0 @@
-/*
- * SerialHelper.java
- *
- * Copyright 2011 Thomas Buck <xythobuz@me.com>
- * Copyright 2011 Max Nuding <max.nuding@gmail.com>
- * Copyright 2011 Felix Bäder <baeder.felix@gmail.com>
- *
- * This file is part of LED-Cube.
- *
- * LED-Cube is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * LED-Cube is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with LED-Cube.  If not, see <http://www.gnu.org/licenses/>.
- */
- /**
- * Implement commands of cube. You can only open one serial port.
- * If you want to communicate with another port, close this one first!
- * @author Thomas Buck
- * @author Max Nuding
- * @author Felix Bäder
- * @version 1.0
- */
-
-import java.util.Date;
-import java.util.ArrayList;
-import java.util.List;
-
-public class SerialHelper {
-
-	private final short OK = 0x42;
-	private final short ERROR = 0x23;
-
-	// Timeout in milliseconds per byte
-	private final int transmitTimeout = 1000;
-	private final int recieveTimeout = 1000;
-
-	private Frame frame;
-
-	/**
-	 * Create new SerialHelper.
-	 * @param serialPort Name of serial port to use.
-	 * @param frame Frame to show error messages 
-	 * @throws Exception Could not open serial port.
-	 */
-	public SerialHelper(String serialPort, Frame frame) throws Exception {
-		if (HelperUtility.openPort(serialPort) == false) {
-			printErrorMessage("Could not open serial port \"" + serialPort + "\"");
-			throw new Exception("Could not open serial port \"" + serialPort + "\"");
-		}
-		this.frame = frame;
-	}
-
-	/**
-	 * Poll to check if the cube is there...
-	 * @return TRUE if cube is connected.
-	 */
-	public boolean probeForCube() {
-		short[] data = new short[1];
-		data[0] = OK;
-		if (!writeData(data)) {
-			printErrorMessage("Timeout sending probe for Cube");
-			return false;
-		}
-		data = readData(1);
-		if ((data == null) || (data[0] != OK)) {
-			printErrorMessage("No response from cube!");
-			if (data == null) {
-				System.out.println("Probe was null!");
-			} else {
-				System.out.println("Probe was " + data[0]);
-			}
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Recieve all animations saved in cube.
-	 * @return A cubeWorker populated with the new data or null.
-	 */
-	public cubeWorker getAnimationsFromCube() {
-		Animation[] animations;
-		int animationCount, frameCount;
-		short[] data, tmp = new short[1];
-
-		// Send download command
-		tmp[0] = 'g';
-		if (!writeData(tmp)) {
-			printErrorMessage("Timout sending Command");
-			return null;
-		}
-		data = readData(1);
-		if ((data == null) || (data[0] != OK)) {
-			printErrorMessage("Response Error");
-			if (data == null) {
-				System.out.println("Download was null!");
-			} else {
-				System.out.println("Download was " + data[0]);
-			}
-			return null;
-		}
-
-		// Get animation count
-		data = readData(1);
-		if (data == null) {
-			printErrorMessage("Response Error.");
-			System.out.println("Did not get animation count!");
-			return null;
-		} else {
-			animationCount = data[0];
-		}
-		tmp[0] = OK;
-		if (!writeData(tmp)) {
-			printErrorMessage("Timout acknowledging animation count!");
-			return null;
-		}
-
-		animations = new Animation[animationCount];
-
-		// Get animations
-		for (int a = 0; a < animationCount; a++) {
-			Animation currentAnim = new Animation();
-
-			// Get number of frames
-			data = readData(1);
-			if (data == null) {
-				printErrorMessage("Response Error");
-				System.out.println("Did not get frame count!");
-				return null;
-			} else {
-				frameCount = data[0];
-			}
-			tmp[0] = OK;
-			if (!writeData(tmp)) {
-				printErrorMessage("Timout sending response Frame Count.");
-				return null;
-			}
-
-			// Get frames
-			for (int f = 0; f < frameCount; f++) {
-				AFrame currentFrame = new AFrame();
-
-				// Get frame duration
-				data = readData(1);
-				if (data == null) {
-					printErrorMessage("Response Error");
-					System.out.println("Did not get frame duration!");
-					return null;
-				} else {
-					currentFrame.setTime(data[0]);
-				}
-				tmp[0] = OK;
-				if (!writeData(tmp)) {
-					printErrorMessage("Timout sending response Frame Duration");
-					return null;
-				}
-
-				// Get frame data
-				data = readData(64);
-				if (data == null) {
-					printErrorMessage("Response Error");
-					System.out.println("Did not get frame data!");
-					return null;
-				} else {
-					currentFrame.setData(data);
-				}
-				tmp[0] = OK;
-				if (!writeData(tmp)) {
-					printErrorMessage("Timout sending response Frame Data");
-					return null;
-				}
-
-				// Add frame to animation
-				currentAnim.setFrame(currentFrame, f);
-			}
-
-			// Add animation to animations list
-			animations[a] = currentAnim;
-		}
-
-		return new cubeWorker(animations, frame);
-	}
-
-	/**
-	 * Send all animations in a cubeWorker to the Cube.
-	 * @param worker cubeWorker that containts data.
-	 * @return 0 on success. -1 on error.
-	 */
-	public int sendAnimationsToCube(cubeWorker worker) {
-		short[] data, tmp = new short[1];
-
-		// Send upload command
-		tmp[0] = 's';
-		if (!writeData(tmp)) {
-			printErrorMessage("Timout sending Command");
-			return -1;
-		}
-		data = readData(1);
-		if ((data == null) || (data[0] != OK)) {
-			printErrorMessage("Response Error Command");
-			if (data == null) {
-				System.out.println("Response Command was null!");
-			} else {
-				System.out.println("Response Command was " + data[0]);
-			}
-			return -1;
-		}
-
-		// Send animation count
-		tmp[0] = (short)worker.size();
-		if (!writeData(tmp)) {
-			printErrorMessage("Timeout sending numOfAnimations");
-			return -1;
-		}
-		data = readData(1);
-		if ((data == null) || (data[0] != OK)) {
-			printErrorMessage("Response Error");
-			if (data == null) {
-				System.out.println("Response Count was null!");
-			} else {
-				System.out.println("Response Count was " + data[0]);
-			}
-			return -1;
-		}
-
-		// Send animations
-		for (int a = 0; a < worker.size(); a++) {
-			// Send frame count
-			tmp[0] = (short)worker.getAnimation(a).size();
-			if (!writeData(tmp)) {
-				printErrorMessage("Timeout sending numOfFrames");
-				return -1;
-			}
-			data = readData(1);
-			if ((data == null) || (data[0] != OK)) {
-				printErrorMessage("Response Error");
-				if (data == null) {
-				System.out.println("Frame Count was null!");
-			} else {
-				System.out.println("Frame Count was " + data[0]);
-			}
-				return -1;
-			}
-
-			// Send frames
-			for (int f = 0; f < worker.getAnimation(a).size(); f++) {
-				// Frame duration
-				tmp[0] = worker.getAnimation(a).getFrame(f).getTime();
-				if (!writeData(tmp)) {
-					printErrorMessage("Timeout sending Frame duration");
-					return -1;
-				}
-				data = readData(1);
-				if ((data == null) || (data[0] != OK)) {
-					printErrorMessage("Response Error");
-					if (data == null) {
-						System.out.println("Duration was null!");
-					} else {
-						System.out.println("Duration was " + data[0]);
-					}
-					return -1;
-				}
-
-				// Frame data
-				if (!writeData(worker.getAnimation(a).getFrame(f).getData())) {
-					printErrorMessage("Timeout sending Frame");
-					return -1;
-				}
-				data = readData(1);
-				if ((data == null) || (data[0] != OK)) {
-					printErrorMessage("Response Error");
-					if (data == null) {
-						System.out.println("Datawas null!");
-					} else {
-						System.out.println("Data was " + data[0]);
-					}
-					return -1;
-				}
-			}
-		}
-
-		// Send finish
-		tmp = new short[4];
-		tmp[0] = OK;
-		tmp[1] = OK;
-		tmp[2] = OK;
-		tmp[3] = OK;
-		if (!writeData(tmp)) {
-			printErrorMessage("Timeout sending Finish");
-			return -1;
-		}
-		data = readData(1);
-		if ((data == null) || (data[0] != OK)) {
-			printErrorMessage("Response Error");
-			if (data == null) {
-				System.out.println("Finish was null!");
-			} else {
-				System.out.println("Finish was " + data[0]);
-			}
-			return -1;
-		}
-		return 0;
-	}
-
-	/**
-	 * Close the serial port again.
-	 */
-	public void closeSerialPort() {
-		HelperUtility.closePort();
-	}
-
-	private void printErrorMessage(String s) {
-		System.out.println("SerialHelper: " + s);
-		frame.errorMessage("Serial Error", s);
-	}
-
-	private boolean writeData(short[] data) {
-		// write data. return true if success
-		long startdate = (new Date()).getTime();
-
-		SerialWriteThread t = new SerialWriteThread(data);
-		t.start();
-		while (!t.dataWasSent()) {
-			if ((new Date()).getTime() >= (startdate + (data.length * transmitTimeout))) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	private short[] readData(int length) {
-		// return data read or null if timeout
-		long startdate = (new Date()).getTime();
-		short[] result;
-		SerialReadThread t = new SerialReadThread(length);
-		t.start();
-		while (!t.dataIsReady()) {
-			if ((new Date()).getTime() >= (startdate + (length * recieveTimeout))) {
-				return null;
-			}
-		}
-		result = t.getSerialData();
-		if (result == null) {
-			System.out.println("Data read was null!");
-		} else if (result.length == 0) {
-			System.out.println("No data read!");
-		}
-		return result;
-	}
-}

CubeControl/SerialReadThread.java

@@ -1,75 +0,0 @@
-/*
- * SerialReadThread.java
- *
- * Copyright 2011 Thomas Buck <xythobuz@me.com>
- * Copyright 2011 Max Nuding <max.nuding@gmail.com>
- * Copyright 2011 Felix Bäder <baeder.felix@gmail.com>
- *
- * This file is part of LED-Cube.
- *
- * LED-Cube is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * LED-Cube is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with LED-Cube.  If not, see <http://www.gnu.org/licenses/>.
- */
- /**
- * Thread that reads data from an opened serial port.
- * @author Thomas Buck
- * @author Max Nuding
- * @author Felix Bäder
- * @version 1.0
- */
-
-import java.lang.Thread;
-
-public class SerialReadThread extends Thread {
-
-	private short[] storage;
-	private int length;
-	private boolean dataReady = false;
-
-	private static int idIndex = 0;
-
-	/**
-	 * Create a SerialReadThread
-	 * @param length Amount of data to be read.
-	 */
-	public SerialReadThread(int length) {
-		this.length = length;
-		setName("Serial Reader " + idIndex++);
-	}
-
-	/**
-	 * Start getting data.
-	 */
-	public void run() {
-		storage = HelperUtility.readData(length);
-		dataReady = true;
-	}
-
-	/**
-	 * Check if all data was recieved.
-	 * 
-	 * @return TRUE if all data was recieved.
-	 */
-	public boolean dataIsReady() {
-		return dataReady;
-	}
-
-	/**
-	 * Get the serial data that was recieved.
-	 * 
-	 * @return Array with recieved bytes.
-	 */
-	public short[] getSerialData() {
-		return storage;
-	}
-}

CubeControl/SerialWriteThread.java

@@ -1,65 +0,0 @@
-/*
- * SerialWriteThread.java
- *
- * Copyright 2011 Thomas Buck <xythobuz@me.com>
- * Copyright 2011 Max Nuding <max.nuding@gmail.com>
- * Copyright 2011 Felix Bäder <baeder.felix@gmail.com>
- *
- * This file is part of LED-Cube.
- *
- * LED-Cube is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * LED-Cube is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with LED-Cube.  If not, see <http://www.gnu.org/licenses/>.
- */
- /**
- * Thread that writes data to an opened serial port.
- * @author Thomas Buck
- * @author Max Nuding
- * @author Felix Bäder
- * @version 1.0
- */
-
-import java.lang.Thread;
-
-public class SerialWriteThread extends Thread {
-
-	private short[] data;
-	private boolean dataSent = false;
-
-	private static int idIndex = 0;
-
-	/**
-	 * Create a SerialWriteThread
-	 * @param data Data to be written.
-	 */
-	public SerialWriteThread(short[] data) {
-		this.data = data;
-		setName("Serial Writer " + idIndex++);
-	}
-
-	/**
-	 * Start writing data.
-	 */
-	public void run() {
-		HelperUtility.writeData(data, data.length);
-		dataSent = true;
-	}
-
-	/**
-	 * Check if all data was sent.
-	 * 
-	 * @return TRUE if all data was sent.
-	 */
-	public boolean dataWasSent() {
-		return dataSent;
-	}
-}

CubeControl/cubeWorker.java

@@ -213,28 +213,188 @@ public class cubeWorker {
 	}
 
 	/**
+	 * Get the array of animations in this worker.
+	 * @return animation array
+	 */
+	public Animation[] getAnimationArray() {
+		return animations;
+	}
+
+	/**
 	 * Send all animations to the cube.
 	 * 
 	 * @param port Name of serial port to use
 	 * @return 0 on success, -1 on error
 	 */
 	public int cubeSendState(String port) {
-		try {
-			SerialHelper sh = new SerialHelper(port, parentFrame);
-			int ret = sh.sendAnimationsToCube(this);
-			sh.closeSerialPort();
-			return ret;
-		} catch (Exception e) {
+		int a, f;
+		short[] d;
+
+		if (HelperUtility.openPort(port) == false) {
+			error("Could not open Port!");
 			return -1;
 		}
-	}
 
-	/**
-	 * Get the array of animations in this worker.
-	 * @return animation array
-	 */
-	public Animation[] getAnimationArray() {
-		return animations;
+		// Send command
+		d = new short[1];
+		d[0] = 's';
+		if (HelperUtility.writeData(d, 1) == false) {
+			error("Could not write to port!");
+			HelperUtility.closePort();
+			return -1;
+		}
+
+		// Recieve ack
+		d = HelperUtility.readData(1);
+		if (d.length == 0) {
+			error("Could not read from port!");
+			HelperUtility.closePort();
+			return -1;
+		}
+		if (d[0] != 0x42) {
+			error("Cube not OK!");
+			HelperUtility.closePort();
+			return -1;
+		}
+
+		System.out.println("Command sent!");
+
+		// Send animation count
+		d = new short[1];
+		if (animations.length >= 255) {
+			error("Too many animations");
+			return -1;
+		}
+		d[0] = (short)animations.length;
+		if (HelperUtility.writeData(d, 1) == false) {
+			error("Could not write to port!");
+			HelperUtility.closePort();
+			return -1;
+		}
+
+		// Recieve ack
+		d = HelperUtility.readData(1);
+		if (d.length == 0) {
+			error("Could not read from port!");
+			HelperUtility.closePort();
+			return -1;
+		}
+		if (d[0] != 0x42) {
+			error("Cube not OK!");
+			HelperUtility.closePort();
+			return -1;
+		}
+
+		System.out.println("Animation count sent (" + animations.length + ")!");
+
+		for (a = 0; a < animations.length; a++) {
+			// Send frame count
+			d = new short[1];
+			if (animations[a].size() >= 255) {
+				error("Too many frames!");
+				HelperUtility.closePort();
+				return -1;
+			}
+			d[0] = (short)animations[a].size();
+			if (HelperUtility.writeData(d, 1) == false) {
+				error("Could not write to port!");
+				HelperUtility.closePort();
+				return -1;
+			}
+
+			// Recieve ack
+			d = HelperUtility.readData(1);
+			if (d.length == 0) {
+				error("Could not read from port!");
+				HelperUtility.closePort();
+				return -1;
+			}
+			if (d[0] != 0x42) {
+				error("Cube not OK!");
+				HelperUtility.closePort();
+				return -1;
+			}
+
+			System.out.println("Frame count sent (" + animations[a].size() + ")!");
+
+			for (f = 0; f < animations[a].size(); f++) {
+				// Send duration
+				d = new short[1];
+				d[0] = animations[a].getFrame(f).getTime();
+				if (HelperUtility.writeData(d, 1) == false) {
+					error("Could not write to port!");
+					HelperUtility.closePort();
+					return -1;
+				}
+
+				// Recieve ack
+				d = HelperUtility.readData(1);
+				if (d.length == 0) {
+					error("Could not read from port!");
+					HelperUtility.closePort();
+					return -1;
+				}
+				if (d[0] != 0x42) {
+					error("Cube not OK!");
+					HelperUtility.closePort();
+					return -1;
+				}
+
+				System.out.println("Duration sent (" + animations[a].getFrame(f).getTime() + ")!");
+
+				// Send data
+				d = animations[a].getFrame(f).getData();
+				if (HelperUtility.writeData(d, 64) == false) {
+					error("Could not write to port!");
+					HelperUtility.closePort();
+					return -1;
+				}
+
+				// Recieve ack
+				d = HelperUtility.readData(1);
+				if (d.length == 0) {
+					error("Could not read from port!");
+					HelperUtility.closePort();
+					return -1;
+				}
+				if (d[0] != 0x42) {
+					error("Cube not OK!");
+					HelperUtility.closePort();
+					return -1;
+				}
+
+				System.out.println("Data sent");
+			}
+		}
+
+		// Send finish sequence
+		d = new short[4];
+		d[0] = 0x42;
+		d[1] = 0x42;
+		d[2] = 0x42;
+		d[3] = 0x42;
+		if (HelperUtility.writeData(d, 4) == false) {
+			error("Could not write to port!");
+			HelperUtility.closePort();
+			return -1;
+		}
+
+		// Recieve ack
+		d = HelperUtility.readData(1);
+		if (d.length == 0) {
+			error("Could not read from port!");
+			HelperUtility.closePort();
+			return -1;
+		}
+		if (d[0] != 0x42) {
+			error("Cube not OK!");
+			HelperUtility.closePort();
+			return -1;
+		}
+
+		System.out.println("Uploaded animations!");
+
+		return 0;
 	}
 
 	/**
@@ -243,21 +403,9 @@ public class cubeWorker {
 	 * @param port Name of serial port to use
 	 * @return 0 on success, -1 on error
 	 */
+	// We generate error messages in here
 	public int cubeGetState(String port) {
-		try {
-			SerialHelper sh = new SerialHelper(port, parentFrame);
-			cubeWorker ret = sh.getAnimationsFromCube();
-			sh.closeSerialPort();
-			if (ret == null) {
-				return -1;
-			} else {
-				changedState = true;
-				animations = ret.getAnimationArray();
-				return 0;
-			}
-		} catch (Exception e) {
-			return -1;
-		}
+		return -1;
 	}
 
 	/**
@@ -267,14 +415,41 @@ public class cubeWorker {
 	 * @param port Name of serial port
 	 */
 	public boolean cubeProbeConnected(String port) {
-		try {
-			SerialHelper sh = new SerialHelper(port, parentFrame);
-			boolean response = sh.probeForCube();
-			sh.closeSerialPort();
-			return response;
-		} catch (Exception e) {
+		if (HelperUtility.openPort(port) == false) {
+			error("Could not open Port!");
+			return false;
+		}
+
+		short[] d = new short[1];
+		d[0] = 0x42;
+		if (HelperUtility.writeData(d, 1) == false) {
+			error("Could not write to port!");
+			HelperUtility.closePort();
 			return false;
 		}
+
+		d = HelperUtility.readData(1);
+		if (d.length == 0) {
+			error("Could not read from port!");
+			HelperUtility.closePort();
+			return false;
+		}
+
+		HelperUtility.closePort();
+
+		if (d[0] != 0x42) {
+			error("Answer was not OK");
+			return false;
+		} else {
+			System.out.println("Got probe response!");
+			return true;
+		}
+
+	}
+
+	private void error(String s) {
+		System.out.println(s);
+		parentFrame.errorMessage("Serial Error", s);
 	}
 
 	private void extendArray() {

CubeControl/libSerial/serialHelper.c

@@ -81,14 +81,21 @@ JNIEXPORT jstring JNICALL Java_HelperUtility_getThePorts(JNIEnv *env, jclass cla
 
 JNIEXPORT jshortArray JNICALL Java_HelperUtility_readDataNative(JNIEnv *env, jclass class, jint length) {
 	jshortArray arr = (*env)->NewShortArray(env, length);
-	int toBeRead = 0, read, i;
+	int toBeRead = 0, read, i, error = 0;
 	char *data = (char *)malloc(length * sizeof(char));
 	jshort *data2 = (jshort *)malloc(length * sizeof(jshort));
 
 	while (length > 0) {
 		read = serialRead(data + toBeRead, length);
-		toBeRead += read;
-		length -= read;
+		if (read == -1) {
+			error++;
+			if (error > 10) {
+				return (*env)->NewShortArray(env, 0);
+			}
+		} else {
+			toBeRead += read;
+			length -= read;
+		}
 	}
 
 	for (i = 0; i < (*env)->GetArrayLength(env, arr); i++) {
@@ -98,20 +105,34 @@ JNIEXPORT jshortArray JNICALL Java_HelperUtility_readDataNative(JNIEnv *env, jcl
 	return arr;
 }
 
-JNIEXPORT void JNICALL Java_HelperUtility_writeDataNative(JNIEnv *env, jclass class, jshortArray data, jint length) {
-	int toWrite = length, written = 0, now, i;
+JNIEXPORT jboolean JNICALL Java_HelperUtility_writeDataNative(JNIEnv *env, jclass class, jshortArray data, jint length) {
+	int toWrite = length, written = 0, now, i, error = 0;
 	char *dat = (char *)malloc(length * sizeof(char));
 	jshort *dat2 = (jshort *)malloc(length * sizeof(jshort));
 
+	// Get unwritten data from argument, place in dat2
+	// move from dat2 into dat1
+	// write dat1
+	// repeat
+
 	while (toWrite > 0) {
-		(*env)->GetShortArrayRegion(env, data, written, length, dat2);
-		for (i = 0; i < length; i++) {
+		(*env)->GetShortArrayRegion(env, data, written, length, dat2); // Unwritten part of data in dat2
+		for (i = 0; i < (length - written); i++) {
 			dat[i] = dat2[i];
 		}
 		now = serialWrite(dat, toWrite);
-		written += now;
-		toWrite -= now;
+		if (now == -1) {
+			error++;
+			if (error > 10) {
+				return JNI_FALSE;
+			}
+		} else {
+			written += now;
+			toWrite -= now;
+		}
 	}
+
+	return JNI_TRUE;
 }
 
 JNIEXPORT void JNICALL Java_HelperUtility_closePortNative(JNIEnv * env, jclass class) {

CubeControl/libSerial/serialInterface.h

@@ -53,7 +53,7 @@ JNIEXPORT jshortArray DLL JNICALL Java_HelperUtility_readDataNative
  * Method:    writeDataNative
  * Signature: ([SI)V
  */
-JNIEXPORT void DLL JNICALL Java_HelperUtility_writeDataNative
+JNIEXPORT jboolean DLL JNICALL Java_HelperUtility_writeDataNative
   (JNIEnv *, jclass, jshortArray, jint);
 
 #ifdef __cplusplus

CubeControl/makefile

@@ -25,7 +25,7 @@ endif
 
 # All java files to be compiled
 # List so it works as target
-JAVAFILES = HelperUtility.java AnimationUtility.java Animation.java AFrame.java cubeWorker.java layerEditFrame.java Led3D.java Frame.java SerialReadThread.java SerialWriteThread.java SerialHelper.java
+JAVAFILES = HelperUtility.java AnimationUtility.java Animation.java AFrame.java cubeWorker.java layerEditFrame.java Led3D.java Frame.java
 
 # --------------------------------------
 

UploadTest/main.c

@@ -19,7 +19,7 @@ volatile int keepRunning = 1;
 
 int main(int argc, char *argv[]) {
 	char c;
-	int i;
+	int i, f;
 	
 	if (argc != 2) {
 		printf("Usage: %s /dev/port\n", argv[0]);
@@ -56,8 +56,8 @@ int main(int argc, char *argv[]) {
 
 	readAck();
 
-	printf("\tSending frame count (1)...");
-	c = 1;
+	printf("\tSending frame count (2)...");
+	c = 2;
 	if (serialWriteTry(&c, 1) != 0) {
 		printf(" Could not send it!\n");
 		suicide;
@@ -66,29 +66,45 @@ int main(int argc, char *argv[]) {
 
 	readAck();
 
-	printf("\tSending duration (1)...");
-	c = 1;
-	if (serialWriteTry(&c, 1) != 0) {
-		printf(" Could not send it!\n");
-		suicide;
-	}
-	printf(" Success!\n");
-
-	readAck();
-
-	printf("\tSending data");
-	for(i = 0; i < 64; i++) {
-		c = (char)i; // Some test data
+	for (f = 0; f < 2; f++) {
+		printf("\tSending duration (3)...");
+		c = 3;
 		if (serialWriteTry(&c, 1) != 0) {
-			printf(" Error while sending!\n");
+			printf(" Could not send it!\n");
 			suicide;
+		}
+		printf(" Success!\n");
+
+		readAck();
+
+		printf("\tSending data");
+		
+		if (f == 0) {
+			for(i = 0; i < 64; i++) {
+				c = (char)i; // Some test data
+				if (serialWriteTry(&c, 1) != 0) {
+					printf(" Error while sending!\n");
+					suicide;
+				} else {
+					printf(".");
+				}
+			}
+			printf(" Success!\n");
 		} else {
-			printf(".");
+			for(i = 0; i < 64; i++) {
+				c = (char)63 - i; // Some test data
+				if (serialWriteTry(&c, 1) != 0) {
+					printf(" Error while sending!\n");
+					suicide;
+				} else {
+					printf(".");
+				}
+			}
+			printf(" Success!\n");
 		}
-	}
-	printf(" Success!\n");
 
-	readAck();
+		readAck();
+	}
 
 	printf("\tSending end sequence");
 	for (i = 0; i < 4; i++) {