Can now send animations to cube.

CubeControl/AnimationUtility.java

@@ -106,7 +106,7 @@ public class AnimationUtility {
 	 * Get the last error that occured while writing
 	 * 
 	 * @return Text of the exception that occured
-	 * @see AnimationUtility#writeFile(String, ArrayList) writeFile()
+	 * @see AnimationUtility#writeFile(String, List) writeFile()
 	 */
 	public static String getLastError() {
 		String tmp = lastError;

CubeControl/Frame.java

@@ -98,12 +98,12 @@ public class Frame extends JFrame implements ListSelectionListener {
 		}
 	}
 
-	private String askString(String title, String text) {
+	public String askString(String title, String text) {
 		return JOptionPane.showInputDialog(null, text, title,
 				JOptionPane.QUESTION_MESSAGE);
 	}
 
-	private void errorMessage(String s) {
+	public void errorMessage(String s) {
 		String[] Optionen = { "OK" };
 		JOptionPane.showOptionDialog(this, s, "Error!", JOptionPane.YES_OPTION,
 				JOptionPane.ERROR_MESSAGE, null, Optionen, Optionen[0]);

CubeControl/HelperUtility.java

@@ -80,7 +80,7 @@ public class HelperUtility {
 	}
 
 	// http://thomaswabner.wordpress.com/2007/10/09/fast-stream-copy-using-javanio-channels/
-	public static void fastChannelCopy(ReadableByteChannel src,
+	private static void fastChannelCopy(ReadableByteChannel src,
 			WritableByteChannel dest) throws IOException {
 		ByteBuffer buffer = ByteBuffer.allocateDirect(16 * 1024);
 		while (src.read(buffer) != -1) {

CubeControl/SerialHelper.java

@@ -0,0 +1,172 @@
+/*
+ * 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;
+
+public class SerialHelper {
+
+	private final short OK = 0x42;
+	private final short ERROR = 0x23;
+
+	/**
+	 * Create new SerialHelper.
+	 * @param serialPort Name of serial port to use.
+	 * @throws Exception Could not open serial port.
+	 */
+	public SerialHelper(String serialPort) throws Exception {
+		if (HelperUtility.openPort(serialPort) == false) {
+			throw new Exception("Could not open serial port \"" + serialPort + "\"");
+		}
+	}
+
+	/**
+	 * Recieve all animations saved in cube.
+	 * @return A cubeWorker populated with the new data or null.
+	 */
+	public cubeWorker getAnimationsFromCube() {
+		return null;
+	}
+
+	/**
+	 * Send all animations in a cubeWorker to the Cube.
+	 * @param worker cubeWorker that containts data.
+	 */
+	public void sendAnimationsToCube(cubeWorker worker) {
+		short[] data;
+		short[] tmp = new short[1];
+
+		// Send animation count
+		tmp[0] = (short)worker.numOfAnimations();
+		if (!writeData(tmp)) {
+			System.out.println("SerialHelper: Timeout numOfAnimations");
+			return;
+		}
+		data = readData(1);
+		if ((data != null) && (data[0] != OK)) {
+			System.out.println("SerialHelper: Response Error");
+			return;
+		}
+
+		// Send animations
+		for (int a = 0; a < worker.numOfAnimations(); a++) {
+			// Send frame count
+			tmp[0] = (short)worker.numOfFrames(a);
+			if (!writeData(tmp)) {
+				System.out.println("SerialHelper: Timeout numOfFrames");
+				return;
+			}
+			data = readData(1);
+			if ((data != null) && (data[0] != OK)) {
+				System.out.println("SerialHelper: Response Error");
+				return;
+			}
+
+			// Send frames
+			for (int f = 0; f < worker.numOfFrames(a); f++) {
+				// Frame duration
+				tmp[0] = worker.getFrameTime(a, f);
+				if (!writeData(tmp)) {
+					System.out.println("SerialHelper: Timeout Frame duration");
+					return;
+				}
+				data = readData(1);
+				if ((data != null) && (data[0] != OK)) {
+					System.out.println("SerialHelper: Response Error");
+					return;
+				}
+
+				// Frame data
+				if (!writeData(worker.getFrame(a, f))) {
+					System.out.println("SerialHelper: Timeout Frame");
+					return;
+				}
+				data = readData(1);
+				if ((data != null) && (data[0] != OK)) {
+					System.out.println("SerialHelper: Response Error");
+					return;
+				}
+			}
+		}
+
+		// Send finish
+		tmp = new short[4];
+		tmp[0] = OK;
+		tmp[1] = OK;
+		tmp[2] = OK;
+		tmp[3] = OK;
+		if (!writeData(tmp)) {
+			System.out.println("SerialHelper: Timeout Finish");
+			return;
+		}
+		data = readData(1);
+		if ((data != null) && (data[0] != OK)) {
+			System.out.println("SerialHelper: Response Error");
+			return;
+		}
+	}
+
+	/**
+	 * Close the serial port again.
+	 */
+	public void closeSerialPort() {
+		HelperUtility.closePort();
+	}
+
+	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 * 1000))) {
+				// More than (length * 1000) milliseconds went by
+				return false;
+			}
+		}
+		return true;
+	}
+
+	private short[] readData(int length) {
+		// return data read or null if timeout
+		long startdate = (new Date()).getTime();
+
+		SerialReadThread t = new SerialReadThread(length);
+		t.start();
+		while (!t.dataIsReady()) {
+			if ((new Date()).getTime() >= (startdate + (length * 1000))) {
+				// More than (length * 1000) milliseconds went by
+				return null;
+			}
+		}
+		return t.getSerialData();
+	}
+}

CubeControl/SerialReadThread.java

@@ -0,0 +1,75 @@
+/*
+ * 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

@@ -0,0 +1,65 @@
+/*
+ * 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

@@ -54,7 +54,7 @@ public class cubeWorker {
 	// --------------------
 
 	private List<Animation> animations = new ArrayList<Animation>();
-	private int framesRemaining = 2016; // (128 * 1024) / 65 = 2016,...
+	private final int framesRemaining = 2016; // (128 * 1024) / 65 = 2016,...
 	private boolean changedState = false;
 
 	// --------------------
@@ -67,7 +67,6 @@ public class cubeWorker {
 		animations.get(0).setName("Animation 1");
 		animations.get(0).add(0);
 		animations.get(0).get(0).setName("Frame 1");
-		framesRemaining--;
 	}
 
 	/**
@@ -79,6 +78,19 @@ public class cubeWorker {
 		animations = anims;
 	}
 
+	/**
+	 * Returns number of frames in this cubeWorker.
+	 *
+	 * @return number of frames.
+	 */
+	public int completeNumOfFrames() {
+		int count = 0;
+		for (int i = 0; i < numOfAnimations(); i++) {
+			count += numOfFrames(i);
+		}
+		return count;
+	}
+
 	// --------------------
 	// Misc. Methods
 	// --------------------
@@ -108,7 +120,7 @@ public class cubeWorker {
 	 * @return number of frames remaining
 	 */
 	public int framesRemaining() {
-		return framesRemaining;
+		return framesRemaining - completeNumOfFrames();
 	}
 
 	// --------------------
@@ -122,7 +134,7 @@ public class cubeWorker {
 	 */
 	public int addAnimation() {
 		changedState = true;
-		if (framesRemaining <= 0) {
+		if (framesRemaining() <= 0) {
 			return -1;
 		} else {
 			int s = animations.size();
@@ -223,10 +235,9 @@ public class cubeWorker {
 	 */
 	public int addFrame(int anim) {
 		changedState = true;
-		if (framesRemaining <= 0) {
+		if (framesRemaining() <= 0) {
 			return -1;
 		}
-		framesRemaining--;
 		int s = animations.get(anim).size();
 		animations.get(anim).add(s);
 		animations.get(anim).get(s)
@@ -344,7 +355,6 @@ public class cubeWorker {
 		for (int i = 0; i < animations.size(); i++) {
 			size += animations.get(i).size();
 		}
-		framesRemaining = 2016 - size;
 		if (size > 2016) {
 			return -1;
 		}

CubeControl/makefile

@@ -16,7 +16,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
+JAVAFILES = HelperUtility.java AnimationUtility.java Animation.java AFrame.java cubeWorker.java layerEditFrame.java Led3D.java Frame.java SerialReadThread.java SerialWriteThread.java SerialHelper.java
 
 # --------------------------------------