Can now upload frames "by hand"

CubeFirmware/header/transmit.h

@@ -25,4 +25,7 @@ void recieveAnimations(void);
 void transmitAnimations(void);
 void sendAudioData(void);
 void printTime(void);
-void dumpFrame(uint8_t *f);
+void dumpFrame(uint8_t *f);
+uint8_t *readLine(void);
+uint8_t readNumber(uint8_t base);
+uint8_t *readAFrame(void);

CubeFirmware/main.c

@@ -327,7 +327,7 @@ void randomAnimation(void) {
 
 void serialHandler(char c) {
 	// Used letters:
-	// a, b, c, d, e, f, g, h, i, n, q, r, s, t, u, v, x, y, 0, 1, 2, 3, #
+	// a, b, c, d, e, f, g, h, i, m, n, q, r, s, t, u, v, x, y, 0, 1, 2, 3, #
 	uint8_t i, y, z;
 	uint8_t *tmp;
 
@@ -416,30 +416,23 @@ void serialHandler(char c) {
 
 	case 'u': case 'U':
 		serialWriteString(getString(31));
-		while(!serialHasChar()) {
-			wdt_reset();
-		}
-		i = serialGet() - '0';
-		serialWrite(i + '0');
-		serialWrite('\n');
-		tmp = getFrame(i);
+		tmp = getFrame(readNumber(10));
 		dumpFrame(tmp);
 		free(tmp);
 		break;
 
 	case 'x': case 'X':
 		// Get byte, store as animation count
-		serialWriteString(getString(16));
-		while (!serialHasChar());
-		c = serialGet();
-		setAnimationCount(c);
-		serialWriteString(itoa(c, buffer, 10));
-		serialWriteString(getString(17));
+		serialWriteString(getString(16)); // "New animation count: "
+		setAnimationCount(readNumber(10));
 		break;
 
 	case 'y': case 'Y':
-		setAnimationCount(0x2201);
-		serialWriteString(getString(18));
+		serialWriteString(getString(18)); // "Frame to change: "
+		i = readNumber(10);
+		tmp = readAFrame();
+		setFrame(i, tmp);
+		free(tmp);
 		break;
 
 	case 'e': case 'E':

CubeFirmware/strings.c

@@ -32,17 +32,17 @@ const char stringMemError[] PROGMEM = " => No answer from Memory!\n"; // 4
 const char stringMemWriteError[] PROGMEM = " => Can't write to Memory!\n"; // 5
 const char stringHelp1[] PROGMEM = "(d)elete, (g)et anims, (s)et anims, (v)ersion\n"; // 6
 const char stringHelp2[] PROGMEM = "(t)ime, (a)udio, (c)ount, (x)Custom count\n"; // 7
-const char stringHelp3[] PROGMEM = "(y)Set fixed animation count\n"; // 8
-const char stringHelp4[] PROGMEM = "S(e)lf Test, (m)ode, d(u)mp\n"; // 9
+const char stringHelp3[] PROGMEM = "(y)Set a frame\n"; // 8
+const char stringHelp4[] PROGMEM = "t(e)st, (m)ode, d(u)mp\n"; // 9
 const char stringHelp5[] PROGMEM = "Play S(n)ake\n"; // 10
 const char stringHelp6[] PROGMEM = "All LEDs Off/On (0/1)\n"; // 11
 const char stringHelp7[] PROGMEM = "(2): Test Anim. 1\n"; // 12
 const char stringHelp8[] PROGMEM = "(3): All Surface LEDs on\n"; // 13
 const char stringTime[] PROGMEM = "System Time: "; // 14
 const char stringFrames[] PROGMEM = " Frames stored\n"; // 15
-const char stringByte[] PROGMEM = "Send a byte... "; // 16
-const char stringWritten[] PROGMEM = " written!\n"; // 17
-const char stringCount[] PROGMEM = "Animation count now 8705!\n"; // 18
+const char stringByte[] PROGMEM = "New animation count: "; // 16
+const char stringWritten[] PROGMEM = ""; // 17
+const char stringCount[] PROGMEM = "Frame to change: "; // 18
 const char stringSelfTest[] PROGMEM = "Self-Test: 0b"; // 19
 const char stringKillCount[] PROGMEM = "Killed Animation Counter!\n"; // 20
 const char stringAccessError[] PROGMEM = "Could not access device!\n"; // 21
@@ -59,7 +59,7 @@ const char stringWatchdog[] PROGMEM = "Enter frame to dump: "; // 31
 const char stringBrownout[] PROGMEM = "Formatting memory... "; // 32
 const char stringNothing[] PROGMEM = "Done!\n"; // 33
 const char stringExtern[] PROGMEM = "(f)ormat memory\n"; // 34
-const char stringJtag[] PROGMEM = ""; // 35
+const char stringJtag[] PROGMEM = "Duration: "; // 35
 const char stringPowerOn[] PROGMEM = ""; // 36
 const char stringMinute[] PROGMEM = ""; // 37
 const char stringAudioMode[] PROGMEM = ""; // 38

CubeFirmware/transmit.c

@@ -148,7 +148,6 @@ void recieveAnimations(void) {
 	setAnimationCount(completeCount);
 }
 
-// TODO: Rewrite for new Serial API
 void transmitAnimations(void) {
 	serialWrite(ERROR);
 }
@@ -209,8 +208,47 @@ void dumpFrame(uint8_t *f) {
 		}
 		serialWrite('\n');
 	}
-	serialWriteString("Duration: ");
+	serialWriteString(getString(35));
 	itoa(f[64], buffer, 10);
 	serialWriteString(buffer);
 	serialWrite('\n');
 }
+
+uint8_t *readLine(void) {
+	uint8_t ptr = 0;
+	while(1) {
+		wdt_reset();
+		if (serialHasChar()) {
+			buffer[ptr] = serialGet();
+			serialWrite(buffer[ptr]);
+			if ((buffer[ptr] == '\n') || (ptr == sizeof(buffer) - 1)) {
+				buffer[ptr] = '\0';
+				return (uint8_t *)buffer;
+			}
+			ptr++;
+		}
+
+	}
+}
+
+uint8_t readNumber(uint8_t base) {
+	uint8_t *s = readLine();
+	uint8_t val = (uint8_t)strtoul((char *)s, NULL, base);
+	return val;
+}
+
+uint8_t *readAFrame(void) {
+	uint8_t *frame = (uint8_t *)malloc(65);
+	uint8_t byte;
+
+	serialWriteString(getString(35)); // "Duration: "
+	frame[64] = readNumber(10);
+	for (byte = 0; byte < 64; byte++) {
+		itoa(byte, buffer, 10);
+		serialWriteString(buffer);
+		serialWriteString(": "); // "xx: "
+		frame[byte] = readNumber(16);
+	}
+	serialWriteString(getString(33));
+	return frame;
+}