Cube can receive animations

CubeControl/cubeWorker.java

@@ -411,7 +411,7 @@ public class cubeWorker {
 		for (int i = 0; i < animations.size(); i++) {
 			size += animations.get(i).size();
 		}
-		if (size > 2016) {
+		if (size > framesRemaining) {
 			return -1;
 		}
 		return 0;

CubeFirmware/main.c

@@ -29,24 +29,34 @@
 #include "cube.h"
 #include "time.h"
 #include "audio.h"
+#include "memLayer.h"
 
 #ifndef F_CPU
 #define F_CPU 16000000L
 #endif
 
+#define OK 0x42
+#define ERROR 0x23
+
+void serialHandler(char c);
+void recieveAnimations(void);
+void transmitAnimations(void);
 uint8_t audioModeSelected(void);
 inline void setPixelBuffer(uint8_t x, uint8_t y, uint8_t z, uint8_t **buf);
 inline void clearPixelBuffer(uint8_t x, uint8_t y, uint8_t z, uint8_t **buf);
 void setRow(uint8_t x, uint8_t z, uint8_t height, uint8_t **buf);
 void visualizeAudioData(uint8_t *audioData, uint8_t **imageData);
 
+uint8_t refreshAnimationCount = 1;
+
 int main(void) {
-	char c;
+	unsigned int character;
 	uint8_t *audioData;
 	uint8_t **imageData;
-	uint8_t i, j;
+	uint8_t i;
 	uint64_t lastTimeChecked;
 	uint8_t audioMode;
+	uint16_t count;
 
 	DDRD = 0xFF; // Mosfets as Output
 	DDRB = 0xFE;
@@ -77,7 +87,20 @@ int main(void) {
 			while(!isFinished()); // Wait for it to display
 		} else {
 			// Look for commands, play from fram
-			
+			// We have 128*1024 bytes
+			// A Frame needs 65 bytes (64 data + duration)
+			// We place 2016 Frames in mem => 131040
+			// That gives us 32 bytes at the beginning, 0 -> 31
+			// The first frame starts at 32
+			character = uart_getc();
+			if (!(character & 0xFF00)) { // No error...
+				serialHandler((char)(character & 0x00FF));
+			}
+
+			if (refreshAnimationCount) {
+				count = getAnimationCount();
+				refreshAnimationCount = 0;
+			}
 		}
 
 		if ((getSystemTime() - lastTimeChecked) > 1000) {
@@ -91,6 +114,109 @@ int main(void) {
 	return 0;
 }
 
+void serialHandler(char c) {
+	// Got a char on serial line...
+	// React accordingly
+	// Set refreshAnimationCount if Animation Data in Ram was changed...
+	// We do a complete transaction in one call of this routine...
+
+	switch(c) {
+		case OK:
+			// Send "Hello World"
+			uart_putc(OK);
+			break;
+
+		case 'd': case 'D':
+			clearMem();
+			uart_putc(OK);
+			break;
+
+		case 'g': case 'G':
+			transmitAnimations();
+			break;
+
+		case 's': case 'S':
+			recieveAnimations();
+			break;
+
+		default:
+			uart_putc(ERROR);
+			break;
+	}
+}
+
+void recieveAnimations() {
+	uint8_t animCount, a, frameCount, f, i;
+	uint16_t completeCount = 0, character;
+	uint8_t frame[65];
+
+	uart_putc(OK); // We are ready...
+
+	character = uart_getc();
+	while (character & 0xFF00) { // Wait for answer
+		character = uart_getc();
+	}
+
+	animCount = (uint8_t)(character & 0x00FF); // Got animation count
+	uart_putc(OK);
+
+	for (a = 0; a < animCount; a++) {
+		character = uart_getc();
+		while (character & 0xFF00) { // Wait for answer
+			character = uart_getc();
+		}
+
+		frameCount = (uint8_t)(character & 0x00FF); // Got frame count
+		uart_putc(OK);
+
+		for (f = 0; f < frameCount; f++) {
+			character = uart_getc();
+			while (character & 0xFF00) { // Wait for answer
+				character = uart_getc();
+			}
+
+			frame[64] = (uint8_t)(character & 0x00FF); // Got duration
+			uart_putc(OK);
+
+			for (i = 0; i < 64; i++) {
+				character = uart_getc();
+				while (character & 0xFF00) { // Wait for answer
+					character = uart_getc();
+				}
+
+				frame[i] = (uint8_t)(character & 0x00FF); // Got data byte
+			}
+			uart_putc(OK);
+
+			setFrame(completeCount++, frame);
+		}
+	}
+
+	character = uart_getc();
+	while (character & 0xFF00) { // Wait for answer
+		character = uart_getc();
+	}
+	character = uart_getc();
+	while (character & 0xFF00) { // Wait for answer
+		character = uart_getc();
+	}
+	character = uart_getc();
+	while (character & 0xFF00) { // Wait for answer
+		character = uart_getc();
+	}
+	character = uart_getc();
+	while (character & 0xFF00) { // Wait for answer
+		character = uart_getc();
+	}
+	uart_putc(OK);
+	setAnimationCount(completeCount);
+	refreshAnimationCount = 1;
+}
+
+void transmitAnimations() {
+	uart_putc(ERROR);
+}
+
 // Blocks 10ms or more
 uint8_t audioModeSelected(void) {
 	// Switch: PB0, Low active

CubeFirmware/makefile

@@ -42,6 +42,7 @@ SRC += twi.c
 SRC += mem.c
 SRC += audio.c
 SRC += time.c
+SRC += memLayer.c
 
 # List Assembler source files here.
 # Make them always end in a capital .S.  Files ending in a lowercase .s
@@ -63,7 +64,6 @@ OPT = s
 # Native formats for AVR-GCC's -g are stabs [default], or dwarf-2.
 # AVR (extended) COFF requires stabs, plus an avr-objcopy run.
 #DEBUG = stabs
-DEBUG = dwarf-2
 
 # List any extra directories to look for include files here.
 #     Each directory must be seperated by a space.

CubeFirmware/mem.h

@@ -22,6 +22,7 @@
  */
 
 #define MEMTWIADDRESS 0xA0
+#define MemLength 131072
 
 // address is a number between (inclusive) zero and 131071
 uint8_t memGetByte(uint32_t address);
@@ -31,4 +32,4 @@ uint8_t *memGetBytes(uint32_t address, uint8_t length);
 
 void memWriteByte(uint32_t address, uint8_t data);
 
-void memWriteBytes(uint32_t address, uint8_t *data, uint8_t length);
+void memWriteBytes(uint32_t address, uint8_t *data, uint8_t length);

CubeFirmware/memLayer.c

@@ -0,0 +1,55 @@
+/*
+ * memLayer.c
+ *
+ * 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/>.
+ */
+ #include <stdint.h>
+ #include <avr/io.h>
+ #include <stdlib.h>
+ #include "mem.h"
+ #include "memLayer.h"
+
+// Free after usage!
+uint8_t *getFrame(uint16_t frameNumber) {
+	return memGetBytes(32 + (65 * frameNumber), 65);
+}
+
+// 65 bytes framedata, data and duration...
+void setFrame(uint16_t frameNumber, uint8_t *frameData) {
+	memWriteBytes(32 + (65 * frameNumber), frameData, 65);
+}
+
+void clearMem() {
+	uint32_t i;
+	for (i = 0; i < MemLength; i++) {
+		memWriteByte(i, 0);
+	}
+}
+
+uint16_t getAnimationCount() {
+	uint16_t animationCount = memGetByte(0);
+	animationCount |= (memGetByte(1) << 8);
+	return animationCount;
+}
+
+void setAnimationCount(uint16_t c) {
+	memWriteByte(0, (uint8_t)(c & 0x00FF));
+	memWriteByte(0, (uint8_t)((c & 0xFF00) >> 8));
+}

CubeFirmware/memLayer.h

@@ -0,0 +1,34 @@
+/*
+ * memLayer.h
+ *
+ * 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/>.
+ */
+
+// Free after usage!
+uint8_t *getFrame(uint16_t frameNumber);
+
+// 65 bytes framedata, data and duration...
+void setFrame(uint16_t frameNumber, uint8_t *frameData);
+
+void clearMem(void);
+
+uint16_t getAnimationCount(void);
+
+void setAnimationCount(uint16_t c);