Storing frames no longer corrupts them!

CubeFirmware/header/memLayer.h

 uint8_t *getFrame(uint16_t frameNumber);
 // 65 bytes framedata, data and duration...
 void setFrame(uint16_t frameNumber, uint8_t *frameData);
+void setDuration(uint16_t frameNumber, uint8_t duration);
 
 void clearMem(void);
 

CubeFirmware/header/transmit.h

 void dumpFrame(uint8_t *f);
 uint8_t *readLine(void);
 uint8_t readNumber(uint8_t base);
-uint8_t *readAFrame(void);
+void writeNumber(uint8_t num, uint8_t base);
+uint8_t *readAFrame(void);
+void simpleAnimationInput(void);

CubeFirmware/main.c

 
 void serialHandler(char c) {
 	// Used letters:
-	// a, b, c, d, e, f, g, h, i, m, n, q, r, s, t, u, v, x, y, 0, 1, 2, 3, #
+	// a, b, c, d, e, f, g, h, i, m, n, p, q, r, s, t, u, v, x, y, 0, 1, 2, 3, #
 	uint8_t i, y, z;
 	uint8_t *tmp;
 
 		serialWriteString(getString(10));
 		serialWriteString(getString(26));
 		serialWriteString(getString(34));
+		serialWriteString(getString(17));
 
 		serialWriteString(getString(11));
 		serialWriteString(getString(12));
 		free(tmp);
 		break;
 
+	case 'o': case 'O':
+		serialWriteString(getString(36)); // Start:
+		i = readNumber(10);
+		serialWriteString(getString(39)); // Ende:
+		y = readNumber(10);
+		serialWriteString(getString(35)); // Duration:
+		z = readNumber(10);
+		for (c = i; c <= y; c++) {
+			setDuration(c, z);
+		}
+		serialWriteString(getString(33)); // Done
+		break;
+
 	case 'x': case 'X':
 		// Get byte, store as animation count
 		serialWriteString(getString(16)); // "New animation count: "
 		setAnimationCount(readNumber(10));
+		refreshAnimationCount = 1;
+		break;
+
+	case 'p': case 'P':
+		simpleAnimationInput();
 		break;
 
 	case 'y': case 'Y':

CubeFirmware/mem.c

 		// Address needs more than 16 bits, we have to set the PAGE bit in i2c address
 		memAddress |= 2;
 	}
-	addA = address & 0xFF00;
+	addA = (address & 0xFF00) >> 8;
 	addB = address & 0xFF;
 
 	if (i2c_start(memAddress | I2C_WRITE) == 0) { // Send start, write address to read
 		// Address needs more than 16 bits, we have to set the PAGE bit in i2c address
 		memAddress |= 2;
 	}
-	addA = address & 0xFF00;
+	addA = (address & 0xFF00) >> 8;
 	addB = address & 0xFF;
 	ret = (uint8_t *)malloc(length); // Allocate memory for values read
 	if (ret == NULL) {
 		// Address needs more than 16 bits, we have to set the PAGE bit in i2c address
 		memAddress |= 2;
 	}
-	addA = address & 0xFF00;
+	addA = (address & 0xFF00) >> 8;
 	addB = address & 0xFF;
 	if (i2c_start(memAddress | I2C_WRITE) == 0) {
 		i2c_write(addA);
 		// Address needs more than 16 bits, we have to set the PAGE bit in i2c address
 		memAddress |= 2;
 	}
-	addA = address & 0xFF00;
+	addA = (address & 0xFF00) >> 8;
 	addB = address & 0xFF;
 	if (i2c_start(memAddress | I2C_WRITE) == 0) {
 		i2c_write(addA);

CubeFirmware/memLayer.c

 // We place 2016 Frames in mem => 131040
 // That gives us 32 bytes at the beginning, 0 -> 31
 // The first frame starts at 32
+// Framecount in 0 and 1
+// General Purpose bytes 0 to 29, starting at 2
 
 // Free after usage!
 uint8_t *getFrame(uint16_t frameNumber) {
 	memWriteBytes(32 + (65 * frameNumber), frameData, 65);
 }
 
+void setDuration(uint16_t frameNumber, uint8_t duration) {
+	memWriteByte(32 + 64 + (65 * frameNumber), duration);
+}
+
 void clearMem() {
 	uint32_t i;
 	for (i = 0; i < MemLength; i++) {

CubeFirmware/strings.c

 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 a frame\n"; // 8
+const char stringHelp3[] PROGMEM = "(y)Set a frame, sim(p)le anim\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 stringTime[] PROGMEM = "System Time: "; // 14
 const char stringFrames[] PROGMEM = " Frames stored\n"; // 15
 const char stringByte[] PROGMEM = "New animation count: "; // 16
-const char stringWritten[] PROGMEM = ""; // 17
+const char stringWritten[] PROGMEM = "durati(o)n"; // 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 stringNothing[] PROGMEM = "Done!\n"; // 33
 const char stringExtern[] PROGMEM = "(f)ormat memory\n"; // 34
 const char stringJtag[] PROGMEM = "Duration: "; // 35
-const char stringPowerOn[] PROGMEM = ""; // 36
-const char stringMinute[] PROGMEM = ""; // 37
-const char stringAudioMode[] PROGMEM = ""; // 38
-const char stringCubeMode[] PROGMEM = ""; // 39
+const char stringPowerOn[] PROGMEM = "Start: "; // 36
+const char stringMinute[] PROGMEM = "8 Layerbytes...\n"; // 37
+const char stringAudioMode[] PROGMEM = "Storing in 8 frames...\n"; // 38
+const char stringCubeMode[] PROGMEM = "Ende: "; // 39
 const char stringModeChange[] PROGMEM = "Cube mode entered!\n"; // 40
 const char stringModeChange2[] PROGMEM = "Audio mode entered!\n"; // 41
 

CubeFirmware/transmit.c

 	return val;
 }
 
+void writeNumber(uint8_t num, uint8_t base) {
+	itoa(num, buffer, base);
+	serialWriteString(buffer);
+}
+
 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);
+		writeNumber(byte, 10);
 		serialWriteString(": "); // "xx: "
 		frame[byte] = readNumber(16);
 	}
 	serialWriteString(getString(33));
 	return frame;
 }
+
+void simpleAnimationInput(void) {
+	uint8_t start, j, d;
+	int8_t i;
+	uint8_t data[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+	uint8_t *frame = (uint8_t *)malloc(65);
+	frame[64] = 2;
+
+	serialWriteString(getString(36));
+	start = readNumber(10);
+	serialWriteString(getString(37));
+	for (i = 0; i < 8; i++) {
+		writeNumber(i, 10);
+		serialWriteString(": ");
+		data[i] = readNumber(16);
+	}
+	serialWriteString(getString(38));
+	for (i = 0; i < 8; i++) {
+		d = 0;
+		for (j = 0; j < 64; j++) {
+			if ((j < (8 * (i + 1))) && (j >= (8 * i))) {
+				frame[j] = data[d++];
+			} else {
+				frame[j] = 0;
+			}
+		}
+		setFrame(i + start, frame);
+	}
+	serialWriteString(getString(33)); // Done
+	free(frame);
+}