Audio Visualizer.

Wrote new audio visualizer. Created help functions to operate on a 3D
image buffer.

CubeFirmware/buffhelp.c

@@ -0,0 +1,89 @@
+/*
+ * buffhelp.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/>.
+ */
+#include <avr/io.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <serial.h>
+#include <strings.h>
+
+uint8_t *buffNew(void) {
+	uint8_t *tmp = (uint8_t *)malloc(64);
+	if (tmp == NULL) {
+#ifdef DEBUG
+		serialWriteString(getString(24));
+#endif
+		while(1); // Ran out of heap => Watchdog Reset
+	}
+	return tmp;
+}
+
+void buffSetPixel(uint8_t *buffer, uint8_t x, uint8_t y, uint8_t z) {
+	buffer[(8 * z) + (7 - y)] |= (1 << x);
+}
+
+void buffClearPixel(uint8_t *buffer, uint8_t x, uint8_t y, uint8_t z) {
+	buffer[(8 * z) + (7 - y)] &= ~(1 << x);
+}
+
+void buffFillRect(uint8_t *buffer, uint8_t x1, uint8_t y1, uint8_t z1,
+					uint8_t x2, uint8_t y2, uint8_t z2, uint8_t value) {
+	uint8_t depth, depthMax, depthMin, x, xMax, xMin, y, yMax, yMin;
+
+	if (z1 <= z2) {
+		depthMin = z1;
+		depthMax = z2;
+	} else {
+		depthMin = z2;
+		depthMax = z1;
+	}
+	if (x1 <= x2) {
+		xMin = x1;
+		xMax = x2;
+	} else {
+		xMin = x2;
+		xMax = x1;
+	}
+	if (y1 <= y2) {
+		yMin = y1;
+		yMax = y2;
+	} else {
+		yMin = y2;
+		yMax = y1;
+	}
+	for (depth = depthMin; depth <= depthMax; depth++) {
+		// now draw a 2d rectangle, z = depth
+		for (x = xMin; x <= xMax; x++) {
+			for (y = yMin; y <= yMax; y++) {
+				if (value) {
+					buffSetPixel(buffer, x, y, depth);
+				} else {
+					buffClearPixel(buffer, x, y, depth);
+				}
+			}
+		}
+	}
+}
+
+void buffFree(uint8_t *buffer) {
+	free(buffer);
+}

CubeFirmware/header/buffhelp.h

@@ -0,0 +1,28 @@
+/*
+ * buffhelp.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/>.
+ */
+uint8_t *buffNew(void);
+void buffSetPixel(uint8_t *buffer, uint8_t x, uint8_t y, uint8_t z);
+void buffClearPixel(uint8_t *buffer, uint8_t x, uint8_t y, uint8_t z);
+void buffFillRect(uint8_t *buffer, uint8_t x1, uint8_t y1, uint8_t z1,
+					uint8_t x2, uint8_t y2, uint8_t z2, uint8_t value);
+void buffFree(uint8_t *buffer);

CubeFirmware/header/visualizer.h

@@ -0,0 +1,24 @@
+/*
+ * visualizer.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/>.
+ */
+void simpleVisualization(uint8_t *data);
+void wave3DVisualization(uint8_t *data);

CubeFirmware/main.c

@@ -44,6 +44,7 @@
 #include "memLayer.h"
 #include "twi.h"
 #include "strings.h"
+#include "visualizer.h"
 
 #define NOERROR 0
 // Audio does not answer
@@ -63,9 +64,6 @@ void sendAudioData(void);
 void recieveAnimations(void);
 void transmitAnimations(void);
 uint8_t audioModeSelected(void);
-void setPixelBuffer(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);
 #ifdef DEBUG
 void printErrors(uint8_t e);
 uint8_t selfTest(void);
@@ -205,16 +203,7 @@ int main(void) {
 			if (isFinished()) {
 				audioData = getAudioData(); // Not malloc'ed => Don't free
 				if (audioData != NULL) {
-					imageData = (uint8_t *)malloc(64);
-					if (imageData == NULL) {
-#ifdef DEBUG
-						serialWriteString(getString(24));
-#endif
-						while(1); // Ran out of heap => Watchdog Reset
-					}
-					visualizeAudioData(audioData, imageData);
-					setImage(imageData);
-					free(imageData);
+					simpleVisualization(audioData);
 				}
 			}
 		} else {
@@ -724,101 +713,3 @@ uint8_t audioModeSelected(void) {
 	}
 	return lastButtonState;
 }
-
-void setRow(uint8_t x, uint8_t z, uint8_t height, uint8_t *buf) {
-	uint8_t i = 0;
-	for (; i < height; i++) {
-		setPixelBuffer(x, i, z, buf);
-	}
-}
-
-void setPixelBuffer(uint8_t x, uint8_t y, uint8_t z, uint8_t *buf) {
-	buf[(8 * z) + (7 - y)] |= (1 << x);
-}
-
-void visualizeAudioData(uint8_t *audioData, uint8_t *imageData) {
-	uint8_t i;
-	for (i = 0; i < 64; i++) {
-		imageData[i] = 0;
-	}
-
-	// 8 LEDs, Max Val 255:
-	// 256 / 8 = 32 => Divide by 31 (FACTOR) to get num of leds to light
-	// 255 / FACTOR = 8,...
-	// 127 / FACTOR = 4,...
-
-	#define FACTOR 31
-
-	// Could not figure out a way to represent this easily in a loop
-	// without using a shitload of 'if's...
-	setRow(0, 0, (audioData[0] / FACTOR), imageData);
-	setRow(0, 1, (audioData[0] / FACTOR), imageData);
-	setRow(1, 0, (audioData[0] / FACTOR), imageData);
-
-	setRow(0, 2, (audioData[1] / FACTOR), imageData);
-	setRow(0, 3, (audioData[1] / FACTOR), imageData);
-	setRow(1, 1, (audioData[1] / FACTOR), imageData);
-	setRow(1, 2, (audioData[1] / FACTOR), imageData);
-	setRow(2, 0, (audioData[1] / FACTOR), imageData);
-	setRow(2, 1, (audioData[1] / FACTOR), imageData);
-
-	setRow(0, 4, (audioData[2] / FACTOR), imageData);
-	setRow(0, 5, (audioData[2] / FACTOR), imageData);
-	setRow(1, 3, (audioData[2] / FACTOR), imageData);
-	setRow(1, 4, (audioData[2] / FACTOR), imageData);
-	setRow(2, 2, (audioData[2] / FACTOR), imageData);
-	setRow(2, 3, (audioData[2] / FACTOR), imageData);
-	setRow(3, 0, (audioData[2] / FACTOR), imageData);
-	setRow(3, 1, (audioData[2] / FACTOR), imageData);
-	setRow(3, 2, (audioData[2] / FACTOR), imageData);
-	setRow(4, 0, (audioData[2] / FACTOR), imageData);
-	setRow(4, 1, (audioData[2] / FACTOR), imageData);
-
-	setRow(0, 6, (audioData[3] / FACTOR), imageData);
-	setRow(0, 7, (audioData[3] / FACTOR), imageData);
-	setRow(1, 5, (audioData[3] / FACTOR), imageData);
-	setRow(1, 6, (audioData[3] / FACTOR), imageData);
-	setRow(2, 4, (audioData[3] / FACTOR), imageData);
-	setRow(2, 5, (audioData[3] / FACTOR), imageData);
-	setRow(3, 3, (audioData[3] / FACTOR), imageData);
-	setRow(3, 4, (audioData[3] / FACTOR), imageData);
-	setRow(4, 2, (audioData[3] / FACTOR), imageData);
-	setRow(4, 3, (audioData[3] / FACTOR), imageData);
-	setRow(5, 0, (audioData[3] / FACTOR), imageData);
-	setRow(5, 1, (audioData[3] / FACTOR), imageData);
-	setRow(5, 2, (audioData[3] / FACTOR), imageData);
-	setRow(6, 0, (audioData[3] / FACTOR), imageData);
-	setRow(6, 1, (audioData[3] / FACTOR), imageData);
-
-	setRow(1, 7, (audioData[4] / FACTOR), imageData);
-	setRow(2, 6, (audioData[4] / FACTOR), imageData);
-	setRow(2, 7, (audioData[4] / FACTOR), imageData);
-	setRow(3, 5, (audioData[4] / FACTOR), imageData);
-	setRow(3, 6, (audioData[4] / FACTOR), imageData);
-	setRow(4, 4, (audioData[4] / FACTOR), imageData);
-	setRow(4, 5, (audioData[4] / FACTOR), imageData);
-	setRow(5, 3, (audioData[4] / FACTOR), imageData);
-	setRow(5, 4, (audioData[4] / FACTOR), imageData);
-	setRow(6, 2, (audioData[4] / FACTOR), imageData);
-	setRow(6, 3, (audioData[4] / FACTOR), imageData);
-	setRow(7, 0, (audioData[4] / FACTOR), imageData);
-	setRow(7, 1, (audioData[4] / FACTOR), imageData);
-
-	setRow(3, 7, (audioData[5] / FACTOR), imageData);
-	setRow(4, 6, (audioData[5] / FACTOR), imageData);
-	setRow(4, 7, (audioData[5] / FACTOR), imageData);
-	setRow(5, 5, (audioData[5] / FACTOR), imageData);
-	setRow(5, 6, (audioData[5] / FACTOR), imageData);
-	setRow(6, 4, (audioData[5] / FACTOR), imageData);
-	setRow(6, 5, (audioData[5] / FACTOR), imageData);
-	setRow(7, 2, (audioData[5] / FACTOR), imageData);
-	setRow(7, 3, (audioData[5] / FACTOR), imageData);
-	setRow(7, 4, (audioData[5] / FACTOR), imageData);
-
-	setRow(5, 7, (audioData[6] / FACTOR), imageData);
-	setRow(6, 6, (audioData[6] / FACTOR), imageData);
-	setRow(6, 7, (audioData[6] / FACTOR), imageData);
-	setRow(7, 5, (audioData[6] / FACTOR), imageData);
-	setRow(7, 6, (audioData[6] / FACTOR), imageData);
-	setRow(7, 7, (audioData[6] / FACTOR), imageData);
-}

CubeFirmware/makefile

@@ -45,6 +45,8 @@ SRC += audio.c
 SRC += time.c
 SRC += memLayer.c
 SRC += strings.c
+SRC += buffhelp.c
+SRC += visualizer.c
 
 # List Assembler source files here.
 # Make them always end in a capital .S.  Files ending in a lowercase .s

CubeFirmware/visualizer.c

@@ -0,0 +1,47 @@
+/*
+ * visualizer.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 <avr/io.h>
+#include <stdint.h>
+
+#include <visualizer.h>
+#include <cube.h>
+#include <buffhelp.h>
+
+void simpleVisualization(uint8_t *data) {
+	uint8_t *buff;
+
+	buff = buffNew();
+	buffFillRect(buff, 0, data[0] / 31, 0, 0, 0, 7, 1);
+	buffFillRect(buff, 1, data[1] / 31, 0, 1, 0, 7, 1);
+	buffFillRect(buff, 2, data[2] / 31, 0, 2, 0, 7, 1);
+	buffFillRect(buff, 3, data[3] / 31, 0, 3, 0, 7, 1);
+	buffFillRect(buff, 4, data[4] / 31, 0, 4, 0, 7, 1);
+	buffFillRect(buff, 5, data[5] / 31, 0, 5, 0, 7, 1);
+	buffFillRect(buff, 6, data[6] / 31, 0, 6, 0, 7, 1);
+	setImage(buff);
+	buffFree(buff);
+}
+
+void wave3DVisualization(uint8_t *data) {
+
+}