Misc fixes.

Better error output CubeControl. Better debug output cubeEmu. cubeEmu
now supports sending data, but still hangs sometimes or doesn't answer
with OKs, etc.

CubeControl/SerialHelper.java

@@ -62,12 +62,17 @@ public class SerialHelper {
 		short[] data = new short[1];
 		data[0] = OK;
 		if (!writeData(data)) {
-			printErrorMessage("Timeout Probing for Cube");
+			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;
@@ -85,26 +90,32 @@ public class SerialHelper {
 		// Send download command
 		tmp[0] = 'g';
 		if (!writeData(tmp)) {
-			printErrorMessage("Timout Command");
+			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");
+			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 Response");
+			printErrorMessage("Timout acknowledging animation count!");
 			return null;
 		}
 
@@ -118,13 +129,14 @@ public class SerialHelper {
 			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 Response");
+				printErrorMessage("Timout sending response Frame Count.");
 				return null;
 			}
 
@@ -136,13 +148,14 @@ public class SerialHelper {
 				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 Response");
+					printErrorMessage("Timout sending response Frame Duration");
 					return null;
 				}
 
@@ -150,13 +163,14 @@ public class SerialHelper {
 				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 Response");
+					printErrorMessage("Timout sending response Frame Data");
 					return null;
 				}
 
@@ -182,24 +196,34 @@ public class SerialHelper {
 		// Send upload command
 		tmp[0] = 's';
 		if (!writeData(tmp)) {
-			printErrorMessage("Timout Command");
+			printErrorMessage("Timout sending Command");
 			return -1;
 		}
 		data = readData(1);
 		if ((data == null) || (data[0] != OK)) {
-			printErrorMessage("Response Error");
+			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 numOfAnimations");
+			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;
 		}
 
@@ -208,12 +232,17 @@ public class SerialHelper {
 			// Send frame count
 			tmp[0] = (short)worker.getAnimation(a).size();
 			if (!writeData(tmp)) {
-				printErrorMessage("Timeout numOfFrames");
+				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;
 			}
 
@@ -222,23 +251,33 @@ public class SerialHelper {
 				// Frame duration
 				tmp[0] = worker.getAnimation(a).getFrame(f).getTime();
 				if (!writeData(tmp)) {
-					printErrorMessage("Timeout Frame duration");
+					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 Frame");
+					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;
 				}
 			}
@@ -251,12 +290,17 @@ public class SerialHelper {
 		tmp[2] = OK;
 		tmp[3] = OK;
 		if (!writeData(tmp)) {
-			printErrorMessage("Timeout Finish");
+			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;

HardwareEmulator/main.c

@@ -53,9 +53,11 @@ int main(int argc, char *argv[]) {
 						printf("Could not write to pseudo terminal\n");
 						return -1;
 					}
+					printf("OK!\n");
 					break;
 
 				case 'h': case 'H':
+					printf("Help\n");
 					if (serialWriteString("(d)elete, (g)et anims, (s)et anims, (v)ersion\n")) {
 						printf("Could not write to pseudo terminal\n");
 						return -1;
@@ -63,6 +65,7 @@ int main(int argc, char *argv[]) {
 					break;
 
 				case 'v': case 'V':
+					printf("Version\n");
 					if (serialWriteString(VERSION)) {
 						printf("Could not write to pseudo terminal\n");
 						return -1;
@@ -70,27 +73,34 @@ int main(int argc, char *argv[]) {
 					break;
 
 				case 's': case 'S':
+					printf("Recieving... ");
 					if (recieveFrames()) {
 						printf("Error while recieving frames!\n");
 						return -1;
 					}
+					printf("Done!\n");
 					break;
 
 				case 'g': case 'G':
+					printf("Sending... ");
 					if (sendFrames()) {
 						printf("Error while sending frames!\n");
 						return -1;
 					}
+					printf("Done!\n");
 					break;
 
 				case 'd': case 'D':
+					printf("Deleting... ");
 					if (deleteFrames()) {
 						printf("Error while deleting frames!\n");
 						return -1;
 					}
+					printf("Done!\n");
 					break;
 
 				default:
+					printf("Unknown. Error!\n");
 					c = ERROR;
 					if (serialWriteTry(&c, 1)) {
 						printf("Could not write to pseudo terminal\n");
@@ -107,15 +117,157 @@ int main(int argc, char *argv[]) {
 }
 
 int sendFrames() {
-
+	char c = ERROR;
+	printf("Not implemented!\n");
+	if (serialWriteTry(&c, 1)) {
+		printf("Could not write to pseudo terminal\n");
+	}
+	return -1;
 }
 
 int recieveFrames() {
+	char c;
+	ssize_t size;
+	int animCount, a, frameCount, f, d;
+	char data[65];
+
+	clearMemory();
+
+	// First send acknowledge
+	c = OK;
+	if (serialWriteTry(&c, 1)) {
+		printf("Could not write to pseudo terminal\n");
+		return -1;
+	}
+
+	printf("AnimationCount");
+	while (1) {
+		size = serialRead(&c, 1);
+		if (size == 1) {
+			break;
+		} else if (size == -1) {
+			printf("Could not read from psuedo terminal!\n");
+			return -1;
+		}
+	}
+	printf(" = %d\n", c);
+	animCount = c;
+
+	c = OK;
+	if (serialWriteTry(&c, 1)) {
+		printf("Could not write to pseudo terminal\n");
+		return -1;
+	}
+
+	for (a = 0; a < animCount; a++) {
+		printf("FrameCount");
+		while (1) {
+			size = serialRead(&c, 1);
+			if (size == 1) {
+				break;
+			} else if (size == -1) {
+				printf("Could not read from psuedo terminal!\n");
+				return -1;
+			}
+		}
+		printf(" = %d\n", c);
+		frameCount = c;
+
+		c = OK;
+		if (serialWriteTry(&c, 1)) {
+			printf("Could not write to pseudo terminal\n");
+			return -1;
+		}
+
+		for (f = 0; f < frameCount; f++) {
+			printf("Duration");
+			while (1) {
+				size = serialRead(&c, 1);
+				if (size == 1) {
+					break;
+				} else if (size == -1) {
+					printf("Could not read from psuedo terminal!\n");
+					return -1;
+				}
+			}
+			printf(" = %d\n", c);
+			data[64] = c;
+
+			printf("Data...");
+			for (d = 0; d < 64; d++) {
+				while (1) {
+					size = serialRead(&c, 1);
+					if (size == 1) {
+						break;
+					} else if (size == -1) {
+						printf("Could not read from psuedo terminal!\n");
+						return -1;
+					}
+				}
+				data[d] = c;
+			}
+			printf(" Done!\n");
+
+			addFrame(data);
+		}
+	}
+
+	while (1) {
+		size = serialRead(&c, 1);
+		if (size == 1) {
+			break;
+		} else if (size == -1) {
+			printf("Could not read from psuedo terminal!\n");
+			return -1;
+		}
+	}
+	while (1) {
+		size = serialRead(&c, 1);
+		if (size == 1) {
+			break;
+		} else if (size == -1) {
+			printf("Could not read from psuedo terminal!\n");
+			return -1;
+		}
+	}
+	while (1) {
+		size = serialRead(&c, 1);
+		if (size == 1) {
+			break;
+		} else if (size == -1) {
+			printf("Could not read from psuedo terminal!\n");
+			return -1;
+		}
+	}
+	while (1) {
+		size = serialRead(&c, 1);
+		if (size == 1) {
+			break;
+		} else if (size == -1) {
+			printf("Could not read from psuedo terminal!\n");
+			return -1;
+		}
+	}
 
+	printf("Got 4 OKs!\n");
+
+	c = OK;
+	if (serialWriteTry(&c, 1)) {
+		printf("Could not write to pseudo terminal\n");
+		return -1;
+	}
+
+	return 0;
 }
 
 int deleteFrames() {
-
+	char c = OK;
+	clearMemory();
+	if (serialWriteTry(&c, 1)) {
+		printf("Could not write to pseudo terminal\n");
+		return -1;
+	}
+	return 0;
 }
 
 int serialWriteString(char *s) {

HardwareEmulator/serial.c

@@ -1,6 +1,8 @@
 /*
- * POSIX compatible serial port library
- * Uses 8 databits, no parity, 1 stop bit, no handshaking
+ * POSIX compatible
+ * Compatible API to libSerial (SerialHelper)
+ * Opens a pseudoterminal, lets you write to it,
+ * gives name of slave side.
  * By: Thomas Buck <taucher.bodensee@gmail.com>
  * Visit: www.xythobuz.org
  */
@@ -13,6 +15,7 @@
 #include <termios.h>
 #include <dirent.h>
 #include <errno.h>
+#include <string.h>
 
 #include "serial.h"
 
@@ -27,22 +30,23 @@ char *serialOpen() {
 		close(fd);
 	}
 
-	fd = posix_openpt(O_RDWR | O_NOCTTY | O_NDELAY);
+	fd = posix_openpt(O_RDWR | O_NOCTTY);
 	if (fd == -1) {
 		return NULL;
 	}
 
 	// Set rigths
-	if (grantpt(fd) != 0) {
+	if (grantpt(fd) == -1) {
 		return NULL;
 	}
 
 	// Unlock slave
-	if (unlockpt(fd) != 0) {
+	if (unlockpt(fd) == -1) {
 		return NULL;
 	}
+
+	fcntl(fd, F_SETFL, FNDELAY); // read non blocking
 	
-	fcntl(fd, F_SETFL, FNDELAY); // read() isn't blocking'
 	tcgetattr(fd, &options);
 	cfsetispeed(&options, BAUD); // Set speed
 	cfsetospeed(&options, BAUD);