Upload download

CubeControl/AFrame.java

@@ -61,7 +61,9 @@ public class AFrame {
 	 * @param d 64 bytes that contain data (8 bit per byte, so 8 LEDs)
 	 */
 	public void setData(short[] d) {
-		data = d;
+		for (int i = 0; i < 64; i++) {
+			data[i] = d[i];
+		}
 	}
 
 	/**

CubeControl/Frame.java

@@ -81,7 +81,7 @@ public class Frame extends JFrame implements ListSelectionListener {
 	private JButton playAnimationFullscreen = new JButton();
 	// Ende Attribute
 
-	public cubeWorker worker = new cubeWorker();
+	public cubeWorker worker = new cubeWorker(this);
 	private boolean fileSelected = false;
 
 	// Ende Variablen
@@ -110,6 +110,12 @@ public class Frame extends JFrame implements ListSelectionListener {
 				JOptionPane.ERROR_MESSAGE, null, Optionen, Optionen[0]);
 	}
 
+	public void errorMessage(String title, String msg) {
+		String[] Optionen = { "OK" };
+		JOptionPane.showOptionDialog(this, msg, title, JOptionPane.YES_OPTION,
+				JOptionPane.ERROR_MESSAGE, null, Optionen, Optionen[0]);
+	}
+
 	public void valueChanged(ListSelectionEvent evt) {
 		if ((!evt.getValueIsAdjusting())
 				&& ((evt.getSource() == animList) || (evt.getSource() == frameList))) {
@@ -965,8 +971,8 @@ public class Frame extends JFrame implements ListSelectionListener {
 
 				if (s.startsWith("send ")) {
 					s = s.substring(5);
-					HelperUtility.openPort(((String) f.jComboBox1
-							.getSelectedItem()) + "\n");
+					HelperUtility.openPort((String) f.jComboBox1
+							.getSelectedItem());
 					short[] dat = toShortArray(s);
 					HelperUtility.writeData(dat, dat.length);
 					HelperUtility.closePort();

CubeControl/SerialHelper.java

@@ -29,22 +29,28 @@
  * @version 1.0
  */
 
- import java.util.Date;
+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;
 
+	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) throws Exception {
+	public SerialHelper(String serialPort, Frame frame) throws Exception {
 		if (HelperUtility.openPort(serialPort) == false) {
 			throw new Exception("Could not open serial port \"" + serialPort + "\"");
 		}
+		this.frame = frame;
 	}
 
 	/**
@@ -52,27 +58,127 @@ public class SerialHelper {
 	 * @return A cubeWorker populated with the new data or null.
 	 */
 	public cubeWorker getAnimationsFromCube() {
-		return null;
+		List<Animation> animations = new ArrayList<Animation>();
+		int animationCount, frameCount;
+		short[] data, tmp = new short[1];
+
+		// Send download command
+		tmp[0] = 'g';
+		if (!writeData(tmp)) {
+			printErrorMessage("Timout Command");
+			return null;
+		}
+		data = readData(1);
+		if ((data == null) || (data[0] != OK)) {
+			printErrorMessage("Response Error");
+			return null;
+		}
+
+		// Get animation count
+		data = readData(1);
+		if (data == null) {
+			printErrorMessage("Response Error");
+			return null;
+		} else {
+			animationCount = data[0];
+		}
+		tmp[0] = OK;
+		if (!writeData(tmp)) {
+			printErrorMessage("Timout Response");
+			return null;
+		}
+
+		// 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");
+				return null;
+			} else {
+				frameCount = data[0];
+			}
+			tmp[0] = OK;
+			if (!writeData(tmp)) {
+				printErrorMessage("Timout Response");
+				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");
+					return null;
+				} else {
+					currentFrame.setTime(data[0]);
+				}
+				tmp[0] = OK;
+				if (!writeData(tmp)) {
+					printErrorMessage("Timout Response");
+					return null;
+				}
+
+				// Get frame data
+				data = readData(64);
+				if (data == null) {
+					printErrorMessage("Response Error");
+					return null;
+				} else {
+					currentFrame.setData(data);
+				}
+				tmp[0] = OK;
+				if (!writeData(tmp)) {
+					printErrorMessage("Timout Response");
+					return null;
+				}
+
+				// Add frame to animation
+				currentAnim.add(f, currentFrame);
+			}
+
+			// Add animation to animations list
+			animations.add(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 void sendAnimationsToCube(cubeWorker worker) {
-		short[] data;
-		short[] tmp = new short[1];
+	public int sendAnimationsToCube(cubeWorker worker) {
+		short[] data, tmp = new short[1];
+
+		// Send upload command
+		tmp[0] = 's';
+		if (!writeData(tmp)) {
+			printErrorMessage("Timout Command");
+			return -1;
+		}
+		data = readData(1);
+		if ((data == null) || (data[0] != OK)) {
+			printErrorMessage("Response Error");
+			return -1;
+		}
 
 		// Send animation count
 		tmp[0] = (short)worker.numOfAnimations();
 		if (!writeData(tmp)) {
-			System.out.println("SerialHelper: Timeout numOfAnimations");
-			return;
+			printErrorMessage("Timeout numOfAnimations");
+			return -1;
 		}
 		data = readData(1);
-		if ((data != null) && (data[0] != OK)) {
-			System.out.println("SerialHelper: Response Error");
-			return;
+		if ((data == null) || (data[0] != OK)) {
+			printErrorMessage("Response Error");
+			return -1;
 		}
 
 		// Send animations
@@ -80,13 +186,13 @@ public class SerialHelper {
 			// Send frame count
 			tmp[0] = (short)worker.numOfFrames(a);
 			if (!writeData(tmp)) {
-				System.out.println("SerialHelper: Timeout numOfFrames");
-				return;
+				printErrorMessage("Timeout numOfFrames");
+				return -1;
 			}
 			data = readData(1);
-			if ((data != null) && (data[0] != OK)) {
-				System.out.println("SerialHelper: Response Error");
-				return;
+			if ((data == null) || (data[0] != OK)) {
+				printErrorMessage("Response Error");
+				return -1;
 			}
 
 			// Send frames
@@ -94,24 +200,24 @@ public class SerialHelper {
 				// Frame duration
 				tmp[0] = worker.getFrameTime(a, f);
 				if (!writeData(tmp)) {
-					System.out.println("SerialHelper: Timeout Frame duration");
-					return;
+					printErrorMessage("Timeout Frame duration");
+					return -1;
 				}
 				data = readData(1);
-				if ((data != null) && (data[0] != OK)) {
-					System.out.println("SerialHelper: Response Error");
-					return;
+				if ((data == null) || (data[0] != OK)) {
+					printErrorMessage("Response Error");
+					return -1;
 				}
 
 				// Frame data
 				if (!writeData(worker.getFrame(a, f))) {
-					System.out.println("SerialHelper: Timeout Frame");
-					return;
+					printErrorMessage("Timeout Frame");
+					return -1;
 				}
 				data = readData(1);
-				if ((data != null) && (data[0] != OK)) {
-					System.out.println("SerialHelper: Response Error");
-					return;
+				if ((data == null) || (data[0] != OK)) {
+					printErrorMessage("Response Error");
+					return -1;
 				}
 			}
 		}
@@ -123,14 +229,15 @@ public class SerialHelper {
 		tmp[2] = OK;
 		tmp[3] = OK;
 		if (!writeData(tmp)) {
-			System.out.println("SerialHelper: Timeout Finish");
-			return;
+			printErrorMessage("Timeout Finish");
+			return -1;
 		}
 		data = readData(1);
-		if ((data != null) && (data[0] != OK)) {
-			System.out.println("SerialHelper: Response Error");
-			return;
+		if ((data == null) || (data[0] != OK)) {
+			printErrorMessage("Response Error");
+			return -1;
 		}
+		return 0;
 	}
 
 	/**
@@ -140,6 +247,11 @@ public class SerialHelper {
 		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();

CubeControl/cubeWorker.java

@@ -56,17 +56,19 @@ public class cubeWorker {
 	private List<Animation> animations = new ArrayList<Animation>();
 	private final int framesRemaining = 2016; // (128 * 1024) / 65 = 2016,...
 	private boolean changedState = false;
+	private Frame parentFrame;
 
 	// --------------------
 
 	/**
 	 * Creates a worker with one animation, containing an empty frame.
 	 */
-	cubeWorker() {
+	public cubeWorker(Frame parent) {
 		animations.add(new Animation());
 		animations.get(0).setName("Animation 1");
 		animations.get(0).add(0);
 		animations.get(0).get(0).setName("Frame 1");
+		parentFrame = parent;
 	}
 
 	/**
@@ -74,8 +76,9 @@ public class cubeWorker {
 	 * 
 	 * @param anims List of animations
 	 */
-	cubeWorker(List<Animation> anims) {
+	public cubeWorker(List<Animation> anims, Frame parent) {
 		animations = anims;
+		parentFrame = parent;
 	}
 
 	/**
@@ -397,18 +400,47 @@ public class cubeWorker {
 	 * @return 0 on success, -1 on error
 	 */
 	public int uploadState(String port) {
-
-		return -1;
+		try {
+			SerialHelper sh = new SerialHelper(port, parentFrame);
+			int ret = sh.sendAnimationsToCube(this);
+			sh.closeSerialPort();
+			return ret;
+		} catch (Exception e) {
+			System.out.println("Serial Exception: " + e.getMessage());
+			return -1;
+		}
 	}
 
 	/**
 	 * Get all animations from the cube, place it in this object
 	 * 
-	 * @param port Name of serial port to use  @return 0 on success, -1 on error
+	 * @param port Name of serial port to use
+	 * @return 0 on success, -1 on error
 	 */
 	public int downloadState(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.getAnimationList();
+				return 0;
+			}
+		} catch (Exception e) {
+			System.out.println("Serial Exception: " + e.getMessage());
+			return -1;
+		}
+	}
 
-		return -1;
+	/**
+	 * Get the list used internally to store all the animations.
+	 * @return The list.
+	 */
+	public List<Animation> getAnimationList() {
+		return animations;
 	}
 
 	/**

CubeControl/libSerial/serialHelper.c

@@ -79,8 +79,9 @@ JNIEXPORT jstring JNICALL Java_HelperUtility_getThePorts(JNIEnv *env, jclass cla
 
 JNIEXPORT jshortArray JNICALL Java_HelperUtility_readData(JNIEnv *env, jclass class, jint length) {
 	jshortArray arr = (*env)->NewShortArray(env, length);
-	int toBeRead = 0, read;
+	int toBeRead = 0, read, i;
 	char *data = (char *)malloc(length * sizeof(char));
+	jshort *data2 = (jshort *)malloc(length * sizeof(jshort));
 
 	while (length > 0) {
 		read = serialRead(data + toBeRead, length);
@@ -88,19 +89,26 @@ JNIEXPORT jshortArray JNICALL Java_HelperUtility_readData(JNIEnv *env, jclass cl
 		length -= read;
 	}
 
-	(*env)->SetShortArrayRegion(env, arr, 0, (*env)->GetArrayLength(env, arr), (jshort *)data);
+	for (i = 0; i < (*env)->GetArrayLength(env, arr); i++) {
+		data2[i] = data[i];
+	}
+	(*env)->SetShortArrayRegion(env, arr, 0, (*env)->GetArrayLength(env, arr), data2);
 	return arr;
 }
 
 JNIEXPORT void JNICALL Java_HelperUtility_writeData(JNIEnv *env, jclass class, jshortArray data, jint length) {
-	int written = 0;
-	int lastIndex = length;
+	int toWrite = length, written = 0, now, i;
 	char *dat = (char *)malloc(length * sizeof(char));
+	jshort *dat2 = (jshort *)malloc(length * sizeof(jshort));
 
-	while (length > 0) {
-		(*env)->GetShortArrayRegion(env, data, written, length, (jshort *)dat);
-		written = serialWrite(dat, length);
-		length -= written;
+	while (toWrite > 0) {
+		(*env)->GetShortArrayRegion(env, data, written, length, dat2);
+		for (i = 0; i < length; i++) {
+			dat[i] = dat2[i];
+		}
+		now = serialWrite(dat, toWrite);
+		written += now;
+		toWrite -= now;
 	}
 }
 

CubeControl/makefile

@@ -20,7 +20,7 @@ JAVAFILES = HelperUtility.java AnimationUtility.java Animation.java AFrame.java
 
 # --------------------------------------
 
-all: CubeControl.jar clean
+all: CubeControl.jar
 
 doc: doc/index.html
 
@@ -45,15 +45,14 @@ endif
 Serial.dll: libSerial/serialHelper.c libSerial/winSerial.c
 	make -C libSerial
 	mv libSerial/Serial.dll Serial.dll
-	make -C libSerial clean
 
 libSerial.jnilib: libSerial/serialHelper.c libSerial/unixSerial.c
 	make -C libSerial
 	mv libSerial/libSerial.jnilib libSerial.jnilib
-	make -C libSerial clean
 
 # Delete intermediate files
 clean:
+	make -C libSerial clean
 	$(RM) *.class
 	$(RM) *.
 	$(RM) *.o