Misc fixes.

Audio CPU now resets MSGEQ7 properly. Bufferhelper clears memory after
allocation. Z Axis now goes into the correct direction. Removed
FillRect. Enabled Watchdog for Debug Build, too. Removed unneeded
strings. Built-In Framedata in own file. Makefile cleans object files
after every build, because it doesn't matter. Simple Visualization
works correctly. Most recent Hex-Files now included.

AudioFirmware/eq.c

@@ -57,12 +57,14 @@ uint8_t *equalizerGet(void) {
 		PORTC |= (1 << PC2); // Strobe '1'
 		_delay_us(STROBEDELAY); // create minimal pulse width
 		PORTC &= ~(1 << PC2);
-		adcStartConversion(0x00);
 		_delay_us(READDELAY); // Wait for result to appear
+		adcStartConversion(0x00);
 		result[i] = offset + adcGetByte();
 		_delay_us(STROBEDELAY);
 	}
 
+	PORTC |= (1 << PC3); // Enable reset
+
 	return result;
 }
 

AudioFirmware/main.c

@@ -49,9 +49,9 @@ int main(void) {
 	MCUCSR = 0;
 	wdt_disable();
 
-	DDRB = 0x3F;
-	DDRC = 0x0C;
-	DDRD = 0xFF;
+	DDRB = 6;
+	DDRC = 12;
+	DDRD = 0;
 	
 	twiInit(0x42); // All TWI action happens completely in the background.
 	adcInit();
@@ -69,7 +69,6 @@ int main(void) {
 	while (1) {
 		if (twiDataWasSent()) {
 			PORTB ^= (1 << PB2); // Toggle for every transaction
-			
 			music = equalizerGet();
 			twiSetDataToSend(music);
 			free(music);

AudioFirmware/main.hex

@@ -0,0 +1,82 @@
+:1000000012C02CC02BC02AC029C028C027C026C0BF
+:1000100025C024C023C022C021C020C01FC01EC0D4
+:100020001DC0EBC01BC011241FBECFE5D4E0DEBF56
+:10003000CDBF10E0A0E6B0E0E6EFF4E002C005902E
+:100040000D92AE36B107D9F710E0AEE6B0E001C0D0
+:100050001D92A437B107E1F719D04BC2D1CFC29A94
+:10006000C19884EC99E020E931E0F9013197F1F78A
+:100070000197D9F7C298C19A84EC99E020E931E060
+:10008000F9013197F1F70197D9F70895EF92FF92AF
+:100090000F931F93CF93DF9314BE88E10FB6F894AC
+:1000A00081BD11BC0FBE86E087BB8CE084BB11BA5A
+:1000B00082E4F7D042D054D0D2DFD1DF2DE088E106
+:1000C00090E00FB6F894A89581BD0FBE21BD55D024
+:1000D0008C01F1D0C801B5D194E0E92E82E0F82E70
+:1000E000C0EADFE0F9D0882341F088B38E2588BBD1
+:1000F00044D08C01E0D0C801A4D188B38F2588BB3F
+:10010000CE010197F1F7A895EDCF97B1907F97B900
+:1001100097B18F70892B87B9369A089586B18295E9
+:100120008695869583708095817008953699FECF67
+:10013000369824B135B1C901089584B38C7F84BB4E
+:1001400017B83E9A86B1856086B9379A80E0DDDFC0
+:10015000EDDF0895EBDF9695879596958795089541
+:1001600084B38C6084BBAB9A85E08A95F1F70895DF
+:1001700081E0CBDFEFDF86950895BF92CF92DF92CB
+:10018000EF92FF920F931F93CF93DF9387E090E05E
+:10019000ABD0F92E182FC82EEBDFD82EAB9880E20B
+:1001A00091E00197F1F7812F9F2DEC0190E6E92E68
+:1001B00080ECB82E8E01095F1F4FAA9A8E2D8A956A
+:1001C000F1F7AA988B2D8A95F1F780E09EDFC2DFC8
+:1001D0008D0D89938E2D8A95F1F7C017D10769F798
+:1001E000AB9A8C2D9F2DDF91CF911F910F91FF9096
+:1001F000EF90DF90CF90BF9008951F920F920FB6AF
+:100200000F9211248F939F93EF93FF9381B190E00E
+:10021000887F883B9105C1F0893B91053CF4883A81
+:10022000910559F0803B910581F507C0803C91050F
+:1002300031F1883C910549F522C081E080936F003F
+:100240008091600083B915C090916F00963040F0A6
+:1002500010926F008091660083B986B78F7B11C0C2
+:10026000E92FF0E0E05AFF4F808183B99F5F9093C0
+:100270006F0086B7806486BF10926E0006C086B796
+:10028000806486BF81E080936E0086B7806886BFF9
+:10029000FF91EF919F918F910F900FBE0F901F9044
+:1002A0001895882311F481E001C08E7F82B985E41E
+:1002B00086BF78940895AC0120E030E0F901E05A5F
+:1002C000FF4FDA01A20FB31F8C9180832F5F3F4F46
+:1002D0002730310599F7089580916E00882319F031
+:1002E00010926E0081E00895CF93DF93BC018230BD
+:1002F000910510F462E070E0A0917200B09173007B
+:10030000ED01E0E0F0E040E050E021C0888199811B
+:100310008617970769F48A819B81309719F0938338
+:10032000828304C09093730080937200FE0134C0F6
+:100330006817790738F44115510519F084179507A6
+:1003400008F4AC01FE018A819B819C01E9012097A0
+:10035000E9F641155105A9F1CA01861B970B0497CF
+:1003600008F4BA01E0E0F0E02AC08D919C91119769
+:1003700084179507F9F46417750781F412968D9127
+:100380009C911397309719F09383828304C09093C4
+:10039000730080937200FD0132964FC0CA01861B24
+:1003A000970BFD01E80FF91F6193719302978D93ED
+:1003B0009C9343C0FD01828193819C01D9011097D8
+:1003C000A1F68091700090917100892B41F4809189
+:1003D000690090916A009093710080937000409141
+:1003E0006B0050916C004115510541F44DB75EB75B
+:1003F0008091670090916800481B590B2091700014
+:100400003091710024173507B0F4CA01821B930B99
+:100410008617970780F0AB014E5F5F4F84179507F3
+:1004200050F0420F531F5093710040937000F90138
+:100430006193719302C0E0E0F0E0CF01DF91CF91D2
+:100440000895CF93DF93009709F450C0EC012297F1
+:100450001B821A82A0917200B0917300109709F16B
+:1004600040E050E0AC17BD0708F1BB83AA83FE0152
+:1004700021913191E20FF31FAE17BF0779F48D91EF
+:100480009C911197280F391F2E5F3F4F3983288386
+:1004900012968D919C9113979B838A8341155105E8
+:1004A00071F4D0937300C093720020C012968D91A6
+:1004B0009C911397AD01009711F0DC01D3CFFA01A5
+:1004C000D383C28321913191E20FF31FCE17DF074F
+:1004D00069F488819981280F391F2E5F3F4FFA01F7
+:1004E000318320838A819B8193838283DF91CF91A3
+:0604F0000895F894FFCF0F
+:0E04F600424242424242422000740000000096
+:00000001FF

CubeFirmware/buffhelp.c

@@ -27,6 +27,7 @@
 #include <strings.h>
 
 uint8_t *buffNew(void) {
+	uint8_t i;
 	uint8_t *tmp = (uint8_t *)malloc(64);
 	if (tmp == NULL) {
 #ifdef DEBUG
@@ -34,54 +35,19 @@ uint8_t *buffNew(void) {
 #endif
 		while(1); // Ran out of heap => Watchdog Reset
 	}
+	for (i = 0; i < 64; i++) {
+		// Clear pixels
+		tmp[i] = 0;
+	}
 	return tmp;
 }
 
 void buffSetPixel(uint8_t *buffer, uint8_t x, uint8_t y, uint8_t z) {
-	buffer[(8 * z) + (7 - y)] |= (1 << x);
+	buffer[(8 * (7 - 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);
-				}
-			}
-		}
-	}
+	buffer[(8 * (7 - z)) + (7 - y)] &= ~(1 << x);
 }
 
 void buffFree(uint8_t *buffer) {

CubeFirmware/builtInFrames.c

@@ -0,0 +1,64 @@
+/*
+ * builtInFrames.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/>.
+ */
+
+// First image loaded after initializing cube code.
+// Only visible for a short period of time after every reset.
+uint8_t defaultImageCube[64] = {	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+									0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xFF,
+									0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xFF,
+									0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xFF,
+									0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xFF,
+									0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xFF,
+									0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xFF,
+									0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
+
+// Idle animation. Displayed when no animations are stored in memory.
+uint8_t defaultImageA[64] = {	0xff, 0x01, 0x01, 0x01, 0xff, 0x80, 0x80, 0xff,
+								0xff, 0x01, 0x01, 0x01, 0xff, 0x80, 0x80, 0xff,
+								0xff, 0x01, 0x01, 0x01, 0xff, 0x80, 0x80, 0xff,
+								0xff, 0x01, 0x01, 0x01, 0xff, 0x80, 0x80, 0xff,
+								0xff, 0x01, 0x01, 0x01, 0xff, 0x80, 0x80, 0xff,
+								0xff, 0x01, 0x01, 0x01, 0xff, 0x80, 0x80, 0xff,
+								0xff, 0x01, 0x01, 0x01, 0xff, 0x80, 0x80, 0xff,
+								0xff, 0x01, 0x01, 0x01, 0xff, 0x80, 0x80, 0xff };
+
+uint8_t defaultImageB[64] = {	0x7e, 0x81, 0x81, 0x81, 0xff, 0x81, 0x81, 0x81,
+								0x7e, 0x81, 0x81, 0x81, 0xff, 0x81, 0x81, 0x81,
+								0x7e, 0x81, 0x81, 0x81, 0xff, 0x81, 0x81, 0x81,
+								0x7e, 0x81, 0x81, 0x81, 0xff, 0x81, 0x81, 0x81,
+								0x7e, 0x81, 0x81, 0x81, 0xff, 0x81, 0x81, 0x81,
+								0x7e, 0x81, 0x81, 0x81, 0xff, 0x81, 0x81, 0x81,
+								0x7e, 0x81, 0x81, 0x81, 0xff, 0x81, 0x81, 0x81,
+								0x7e, 0x81, 0x81, 0x81, 0xff, 0x81, 0x81, 0x81 };
+
+uint8_t defaultImageC[64] = {	0x1e, 0x22, 0x22, 0x22, 0x1e, 0x02, 0x02, 0x02,
+								0x1e, 0x22, 0x22, 0x22, 0x1e, 0x02, 0x02, 0x02,
+								0x1e, 0x22, 0x22, 0x22, 0x1e, 0x02, 0x02, 0x02,
+								0x1e, 0x22, 0x22, 0x22, 0x1e, 0x02, 0x02, 0x02,
+								0x1e, 0x22, 0x22, 0x22, 0x1e, 0x02, 0x02, 0x02,
+								0x1e, 0x22, 0x22, 0x22, 0x1e, 0x02, 0x02, 0x02,
+								0x1e, 0x22, 0x22, 0x22, 0x1e, 0x02, 0x02, 0x02,
+								0x1e, 0x22, 0x22, 0x22, 0x1e, 0x02, 0x02, 0x02 };
+
+#define IDLEANIMATIONCOUNT 3
+uint8_t *idleAnimation[IDLEANIMATIONCOUNT] = { defaultImageA, defaultImageB, defaultImageC };

CubeFirmware/header/buffhelp.h

@@ -23,6 +23,4 @@
 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/main.c

@@ -78,44 +78,7 @@ uint8_t lastButtonState = 0;
 uint8_t mcusr_mirror;
 char buffer[11];
 
-uint8_t defaultImageA[64] = {	0xff, 0x01, 0x01, 0x01, 0xff, 0x80, 0x80, 0xff,
-								0xff, 0x01, 0x01, 0x01, 0xff, 0x80, 0x80, 0xff,
-								0xff, 0x01, 0x01, 0x01, 0xff, 0x80, 0x80, 0xff,
-								0xff, 0x01, 0x01, 0x01, 0xff, 0x80, 0x80, 0xff,
-								0xff, 0x01, 0x01, 0x01, 0xff, 0x80, 0x80, 0xff,
-								0xff, 0x01, 0x01, 0x01, 0xff, 0x80, 0x80, 0xff,
-								0xff, 0x01, 0x01, 0x01, 0xff, 0x80, 0x80, 0xff,
-								0xff, 0x01, 0x01, 0x01, 0xff, 0x80, 0x80, 0xff };
-
-uint8_t defaultImageB[64] = {	0x7e, 0x81, 0x81, 0x81, 0xff, 0x81, 0x81, 0x81,
-								0x7e, 0x81, 0x81, 0x81, 0xff, 0x81, 0x81, 0x81,
-								0x7e, 0x81, 0x81, 0x81, 0xff, 0x81, 0x81, 0x81,
-								0x7e, 0x81, 0x81, 0x81, 0xff, 0x81, 0x81, 0x81,
-								0x7e, 0x81, 0x81, 0x81, 0xff, 0x81, 0x81, 0x81,
-								0x7e, 0x81, 0x81, 0x81, 0xff, 0x81, 0x81, 0x81,
-								0x7e, 0x81, 0x81, 0x81, 0xff, 0x81, 0x81, 0x81,
-								0x7e, 0x81, 0x81, 0x81, 0xff, 0x81, 0x81, 0x81 };
-
-uint8_t defaultImageC[64] = {	0x1e, 0x22, 0x22, 0x22, 0x1e, 0x02, 0x02, 0x02,
-								0x1e, 0x22, 0x22, 0x22, 0x1e, 0x02, 0x02, 0x02,
-								0x1e, 0x22, 0x22, 0x22, 0x1e, 0x02, 0x02, 0x02,
-								0x1e, 0x22, 0x22, 0x22, 0x1e, 0x02, 0x02, 0x02,
-								0x1e, 0x22, 0x22, 0x22, 0x1e, 0x02, 0x02, 0x02,
-								0x1e, 0x22, 0x22, 0x22, 0x1e, 0x02, 0x02, 0x02,
-								0x1e, 0x22, 0x22, 0x22, 0x1e, 0x02, 0x02, 0x02,
-								0x1e, 0x22, 0x22, 0x22, 0x1e, 0x02, 0x02, 0x02 };
-
-uint8_t defaultImageCube[64] = {	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-									0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xFF,
-									0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xFF,
-									0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xFF,
-									0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xFF,
-									0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xFF,
-									0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xFF,
-									0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
-
-#define IDLEANIMATIONCOUNT 3
-uint8_t *idleAnimation[IDLEANIMATIONCOUNT] = { defaultImageA, defaultImageB, defaultImageC };
+#include "builtInFrames.c"
 
 uint8_t DebugDone = 0; // Bit 0: 10s int. count, Bit 1: unused
 					   // Bit 2: state changed, disable idle
@@ -146,10 +109,7 @@ int main(void) {
 	initSystemTimer();
 	sei(); // Enable Interrupts
 
-#ifndef DEBUG
-	// wdt_enable(WDTO_500MS); // Enable watchdog reset after 500ms
 	wdt_enable(WDTO_1S); // Watchdog reset after 1 second
-#endif
 
 	setImage(defaultImageCube); // Display something
 
@@ -168,9 +128,10 @@ int main(void) {
 
 	serialWriteString(getString(2));
 	serialWriteString(getString(0));
-	serialWriteString("Took ");
+	
+	/* serialWriteString("Took ");
 	serialWriteString(itoa(getSystemTime(), buffer, 10));
-	serialWriteString(" ms!\n");
+	serialWriteString(" ms!\n"); */
 
 	if (mcusr_mirror & WDRF) {
 		serialWriteString(getString(31));
@@ -192,6 +153,7 @@ int main(void) {
 
 	i = 0;
 	count = getAnimationCount();
+
 	while (1) {
 		// Reset if requested
 		if (!shouldRestart) {
@@ -260,12 +222,12 @@ int main(void) {
 
 		// Show how stable we are running :)
 		if (((getSystemTime() % 60000) == 0) && (getSystemTime() > 0)) {
-			serialWriteString(getString(37));
+			// serialWriteString(getString(37));
 			printTime();
 		}
 #endif
 
-		if ((getSystemTime() - lastChecked) > 150) {
+		if ((getSystemTime() - lastChecked) > 150) { // Check button state every 150ms
 			lastMode = audioModeSelected();
 			lastChecked = getSystemTime();
 		} 
@@ -344,7 +306,7 @@ void randomAnimation(void) {
 
 void serialHandler(char c) {
 	// Used letters:
-	// a, c, d, e, g, i, n, q, r, s, t, v, x, y, 0, 1, 2, 3
+	// a, b, c, d, e, g, i, n, q, r, s, t, v, x, y, 0, 1, 2, 3, #
 #ifdef DEBUG
 	uint8_t i, y, z;
 	serialWrite(c);
@@ -397,7 +359,11 @@ void serialHandler(char c) {
 #ifdef DEBUG
 	case 'm': case 'M':
 		lastButtonState = !lastButtonState;
-		serialWriteString(getString(40));
+		if (lastButtonState) {
+			serialWriteString(getString(41));
+		} else {
+			serialWriteString(getString(40));
+		}
 		break;
 
 	case 'q': case 'Q':
@@ -553,70 +519,88 @@ void sendAudioData(void) {
 }
 #endif
 
+#define TRANSTIMEOUT 10000
+
 void recieveAnimations() {
-	uint8_t animCount, a, frameCount, f, i;
-	uint16_t completeCount = 0, character;
-	uint8_t frame[65];
+	uint8_t animCount, a, frameCount, f, i, c;
+	uint16_t completeCount = 0;
+	uint8_t *frame = (uint8_t *)malloc(65);
+	uint64_t timestamp = getSystemTime();
 
 	serialWrite(OK); // We are ready...
 
-	character = serialGet();
-	while (character & 0xFF00) { // Wait for answer
-		character = serialGet();
+	while (!serialHasChar()) { // Wait for answer
+		if ((getSystemTime() - timestamp) <= TRANSTIMEOUT) {
+			wdt_reset();
+		}
 	}
-
-	animCount = (uint8_t)(character & 0x00FF); // Got animation count
+	c = serialGet();
+	animCount = c; // Got animation count
 	serialWrite(OK);
 
 	for (a = 0; a < animCount; a++) {
-		character = serialGet();
-		while (character & 0xFF00) { // Wait for answer
-			character = serialGet();
+		while (!serialHasChar()) { // Wait for answer
+			if ((getSystemTime() - timestamp) <= TRANSTIMEOUT) {
+				wdt_reset();
+			}
 		}
-
-		frameCount = (uint8_t)(character & 0x00FF); // Got frame count
+		c = serialGet();
+		frameCount = c; // Got frame count
 		serialWrite(OK);
 
 		for (f = 0; f < frameCount; f++) {
-			character = serialGet();
-			while (character & 0xFF00) { // Wait for answer
-				character = serialGet();
+			while (!serialHasChar()) { // Wait for answer
+				if ((getSystemTime() - timestamp) <= TRANSTIMEOUT) {
+					wdt_reset();
+				}
 			}
-
-			frame[64] = (uint8_t)(character & 0x00FF); // Got duration
+			c = serialGet();
+			frame[64] = c; // Got duration
 			serialWrite(OK);
 
 			for (i = 0; i < 64; i++) {
-				character = serialGet();
-				while (character & 0xFF00) { // Wait for answer
-					character = serialGet();
+				while (!serialHasChar()) { // Wait for answer
+					if ((getSystemTime() - timestamp) <= TRANSTIMEOUT) {
+						wdt_reset();
+					}
 				}
-
-				frame[i] = (uint8_t)(character & 0x00FF); // Got data byte
+				c = serialGet();
+				frame[i] = c; // Got data byte
 			}
 			serialWrite(OK);
 
 			setFrame(completeCount++, frame);
 		}
 	}
+	free(frame);
 
-	character = serialGet();
-	while (character & 0xFF00) { // Wait for answer
-		character = serialGet();
+	while (!serialHasChar()) { // Wait for answer
+		if ((getSystemTime() - timestamp) <= TRANSTIMEOUT) {
+			wdt_reset();
+		}
 	}
-	character = serialGet();
-	while (character & 0xFF00) { // Wait for answer
-		character = serialGet();
+	c = serialGet();
+	while (!serialHasChar()) { // Wait for answer
+		if ((getSystemTime() - timestamp) <= TRANSTIMEOUT) {
+			wdt_reset();
+		}
 	}
-	character = serialGet();
-	while (character & 0xFF00) { // Wait for answer
-		character = serialGet();
+	c = serialGet();
+	while (!serialHasChar()) { // Wait for answer
+		if ((getSystemTime() - timestamp) <= TRANSTIMEOUT) {
+			wdt_reset();
+		}
 	}
-	character = serialGet();
-	while (character & 0xFF00) { // Wait for answer
-		character = serialGet();
+	c = serialGet();
+	while (!serialHasChar()) { // Wait for answer
+		if ((getSystemTime() - timestamp) <= TRANSTIMEOUT) {
+			wdt_reset();
+		}
 	}
+	c = serialGet();
+
 	serialWrite(OK);
+
 	setAnimationCount(completeCount);
 	refreshAnimationCount = 1;
 }

CubeFirmware/main.hex

@@ -0,0 +1,523 @@
+:100000000C9441020C945E020C945E020C945E020D
+:100010000C945E020C945E020C945E020C94E70A4F
+:100020000C945E020C945E020C94E60C0C945E023E
+:100030000C945E020C94A0080C94CE080C945E0202
+:100040000C945E020C945E020C945E020C945E02B0
+:100050000C945E0276322E332052656C65617365B6
+:100060000A00496E697469616C697A65643A2000B6
+:1000700053656C662D54657374204572726F723AC5
+:1000800020306200203D3E204E6F20616E73776508
+:10009000722066726F6D20417564696F210A0020BD
+:1000A0003D3E204E6F20616E737765722066726FE1
+:1000B0006D204D656D6F7279210A00203D3E204311
+:1000C000616E277420777269746520746F204D65A6
+:1000D0006D6F7279210A00286429656C6574652C3E
+:1000E00020286729657420616E696D732C20287340
+:1000F00029657420616E696D732C202876296572DC
+:1001000073696F6E0A00287429696D652C20286157
+:10011000297564696F2C202863296F756E742C20F3
+:10012000287829437573746F6D20636F756E740A38
+:100130000028792953657420666978656420616EAA
+:10014000696D6174696F6E20636F756E740A005318
+:100150002865296C6620546573742C20286D296FDE
+:1001600064650A00506C61792053286E29616B65C3
+:100170000A00416C6C204C454473204F66662F4F3B
+:100180006E2028302F31290A002832293A20546560
+:10019000737420416E696D2E20310A002833293A8C
+:1001A00020416C6C2053757266616365204C454438
+:1001B00073206F6E0A0053797374656D2054696DF6
+:1001C000653A2000204672616D65732073746F720A
+:1001D00065640A0053656E64206120627974652E3F
+:1001E0002E2E2000207772697474656E210A0041FA
+:1001F0006E696D6174696F6E20636F756E74206EC9
+:100200006F772038373035210A0053656C662D54DE
+:100210006573743A203062004B696C6C65642041F0
+:100220006E696D6174696F6E20436F756E7465726F
+:10023000210A00436F756C64206E6F7420616363E4
+:1002400065737320646576696365210A004175648E
+:10025000696F20446174613A0A00436F6E74726F73
+:100260006C733A2057204120532044205120452CC4
+:10027000207820746F20717569740A0052616E20B5
+:100280006F7574206F662048656170210A00416EA9
+:10029000696D6174696F6E2061626F72746564214B
+:1002A0000A002869296E7465727275707420636F14
+:1002B000756E742C20287229616E646F6D2C202855
+:1002C000712972657365740A0020496E74657272D3
+:1002D0007570747320616674657220313030306DD2
+:1002E0007365630A00204672616D657320706572E4
+:1002F000205365636F6E640A004D656D6F727920DF
+:1003000064656C65746564210A00526573657420C8
+:10031000696E203530306D732E20427965210A00D8
+:100320005761746368646F672052657365742064F5
+:10033000657465637465642E0A0042726F776E2D72
+:100340004F757420526573657420646574656374B9
+:1003500065642E0A004E6F205265736574207265C5
+:1003600061736F6E2064657465637465642E0A0042
+:1003700045787465726E616C205265736574206493
+:10038000657465637465642E0A004A5441472052BF
+:10039000657365742064657465637465642E0A0012
+:1003A000506F7765722D4F6E2052657365742064AF
+:1003B000657465637465642E0A0059617921204172
+:1003C0006E6F74686572206D696E757465207061FA
+:1003D00073736564203A290A00417564696F204D82
+:1003E0006F6465210A0043756265204D6F64652165
+:1003F0000A0043756265206D6F646520656E7465E3
+:10040000726564210A00417564696F206D6F6465CF
+:1004100020656E7465726564210A00540070006284
+:100420000084009F00BB00D700060131014F01642A
+:1004300001720189019C01B601C401D401E401EFFC
+:10044000010A02180233024D025A027C028E02A2F5
+:1004500002C902E502F9020A0320033A03550370B8
+:10046000038A03A003BA03D903E603F20306045385
+:100470007472696E67206E6F7420666F756E64218A
+:100480000A0011241FBECFE5D8E0DEBFCDBF11E0CA
+:10049000A0E6B0E0EAE8FFE102C005900D92AE36BA
+:1004A000B107D9F712E0AEE6B1E001C01D92A23566
+:1004B000B107E1F70E9476070C94C30F0C9400007B
+:1004C000B0990AC080916F01882321F481E0809364
+:1004D0006F0102C010926F0180916F0108957F92A9
+:1004E0008F929F92AF92BF92CF92DF92EF92FF9244
+:1004F0000F931F93CF93DF930E94750D7C016FEFD5
+:1005000070E00E94A30E892B39F4C7016FEF70E0F1
+:100510000E94A30E762E07C0C7016FEF70E00E9405
+:10052000A30E762E739482E40E94A809872D0E9460
+:10053000A8090E94530990E08234910509F061C036
+:10054000AA24BB244BC08FEFE816F10421F018F069
+:1005500088248A9401C08E2C882D0E94A8090E94AC
+:10056000530990E08234910509F04BC0650199244C
+:100570002DC0C6010E94E80D8C01FC01E05CFF4F1C
+:1005800080810E94A8090E94530990E0823491055D
+:10059000A9F4C0E0D0E0F801EC0FFD1F80810E94BB
+:1005A000A8092196C034D105B1F70E94530990E003
+:1005B0000894C11CD11C8234910521F0C8010E940D
+:1005C000640F1FC0C8010E94640F9394981488F2AE
+:1005D000E818F1088FEF90E0A80EB91E8A2D8195DA
+:1005E000871508F4B0CF82E40E94A80982E40E9433
+:1005F000A80982E40E94A80982E40E94A8090E9436
+:100600005309DF91CF911F910F91FF90EF90DF90F1
+:10061000CF90BF90AF909F908F907F9008952F9232
+:100620003F924F925F926F927F928F929F92AF9282
+:10063000BF92CF92DF92EF92FF920F931F93DF93BF
+:10064000CF93CDB7DEB727970FB6F894DEBF0FBEB6
+:10065000CDBF81E490E00E94B70E7C010E94550D51
+:10066000422E332E242E752E662E572E982E892E2E
+:1006700082E40E94A8096CC00E94550D022F041943
+:10068000F1E0201708F0F0E0232F2319E1E0321702
+:1006900008F0E0E0A22FAF1B31E02A1708F030E0AD
+:1006A000E32B242F2219F1E0421708F0F0E0B22FDB
+:1006B000BE1B31E02B1708F030E0F32B252F271954
+:1006C00041E0521708F040E0E22FEF1B31E02E1717
+:1006D00008F030E0432B262F261951E0621708F06E
+:1006E00050E0622F641B31E0261708F030E0532BF6
+:1006F000272F251941E0721708F040E0322F351BF3
+:10070000532F31E0251708F030E0432B282F29190B
+:1007100031E0821708F030E0822F841B482F81E0FF
+:10072000241708F080E0382B9819931789F4442394
+:1007300079F4552369F4662359F4EE2349F4BB2375
+:1007400039F4A83228F4A73211F4013108F4A8953D
+:100750000E944409882309F48FCF0E9453098A8399
+:1007600082E40E94A8091B82AA24BB24F701E05C52
+:10077000FF4FFD83EC8388C10E94550D022F0419A1
+:10078000F1E0201708F0F0E0232F2319E1E0321701
+:1007900008F0E0E0A22FAF1B31E02A1708F030E0AC
+:1007A000E32B242F2219F1E0421708F0F0E0B22FDA
+:1007B000BE1B31E02B1708F030E0F32B252F271953
+:1007C00041E0521708F040E0E22FEF1B31E02E1716
+:1007D00008F030E0432B262F261951E0621708F06D
+:1007E00050E0622F641B31E0261708F030E0532BF5
+:1007F000272F251941E0721708F040E0F22FF51B72
+:100800005F2F31E02F1708F030E0432B282F2919F4
+:1008100031E0821708F030E0822F841B482F81E0FE
+:10082000241708F080E0382B9819931789F4442393
+:1008300079F4552369F4662359F4EE2349F4BB2374
+:1008400039F4A83228F4A73211F4013108F4A8953C
+:100850000E944409882309F48FCF0E945309898399
+:1008600082E40E94A809650104C10E94550D022F6F
+:100870000419F1E0201708F0F0E0232F2319E1E03C
+:10088000321708F0E0E0A22FAF1B31E02A1708F082
+:1008900030E0E32B242F2219F1E0421708F0F0E0BA
+:1008A000B22FBE1B31E02B1708F030E0F32B252FC1
+:1008B000271941E0521708F040E0E22FEF1B31E02A
+:1008C0002E1708F030E0432B262F261951E062172F
+:1008D00008F050E0622F641B31E0261708F030E08A
+:1008E000532B272F251941E0721708F040E0F22F13
+:1008F000F51B5F2F31E02F1708F030E0432B282F36
+:10090000291931E0821708F030E0822F841B482F2C
+:1009100081E0241708F080E0382B9819931789F4A8
+:10092000442379F4552369F4662359F4EE2349F4FA
+:10093000BB2339F4A83228F4A73211F4013108F4AA
+:10094000A8950E944409882309F48FCF0E94530977
+:10095000EC81FD81808382E40E94A809FF82EE82FF
+:100960006CC00E94550D022F0419F1E0201708F009
+:10097000F0E0232F2319E1E0321708F0E0E0A22F86
+:10098000AF1B31E02A1708F030E0E32B242F2219A7
+:10099000F1E0421708F0F0E0B22FBE1B31E02B1758
+:1009A00008F030E0F32B252F271941E0521708F00B
+:1009B00040E0E22FEF1B31E02E1708F030E0432B30
+:1009C000262F261951E0621708F050E0622F641BB1
+:1009D00031E0261708F030E0532B272F251941E08E
+:1009E000721708F040E0F22FF51B5F2F31E02F1750
+:1009F00008F030E0432B282F291931E0821708F046
+:100A000030E0822F841B482F81E0241708F080E01B
+:100A1000382B9819931789F4442379F4552369F4F2
+:100A2000662359F4EE2349F4BB2339F4A83228F4A1
+:100A3000A73211F4013108F4A8950E9444098823D3
+:100A400009F48FCF0E945309EE81FF818193FF83C8
+:100A5000EE832C813D81E217F30779F782E40E944F
+:100A6000A80986010F5F1F4FC601B7010E94D10D73
+:100A700068018C2D8A193981831708F462CFA30E7F
+:100A8000B11C8B818F5F8B839B81EA819E1708F459
+:100A9000DFCEC7010E94640F6CC00E94550D022F6B
+:100AA0000419F1E0201708F0F0E0232F2319E1E00A
+:100AB000321708F0E0E0A22FAF1B31E02A1708F050
+:100AC00030E0E32B242F2219F1E0421708F0F0E088
+:100AD000B22FBE1B31E02B1708F030E0F32B252F8F
+:100AE000271941E0521708F040E0E22FEF1B31E0F8
+:100AF0002E1708F030E0432B262F261951E06217FD
+:100B000008F050E0622F641B31E0261708F030E057
+:100B1000532B272F251941E0721708F040E0F22FE0
+:100B2000F51B5F2F31E02F1708F030E0432B282F03
+:100B3000291931E0821708F030E0822F841B482FFA
+:100B400081E0241708F080E0382B9819931789F476
+:100B5000442379F4552369F4662359F4EE2349F4C8
+:100B6000BB2339F4A83228F4A73211F4013108F478
+:100B7000A8950E944409882309F48FCF0E94530945
+:100B80006CC00E94550D022F0419F1E0201708F0E7
+:100B9000F0E0232F2319E1E0321708F0E0E0A22F64
+:100BA000AF1B31E02A1708F030E0E32B242F221985
+:100BB000F1E0421708F0F0E0B22FBE1B31E02B1736
+:100BC00008F030E0F32B252F271941E0521708F0E9
+:100BD00040E0E22FEF1B31E02E1708F030E0432B0E
+:100BE000262F261951E0621708F050E0622F641B8F
+:100BF00031E0261708F030E0532B272F251941E06C
+:100C0000721708F040E0F22FF51B5F2F31E02F172D
+:100C100008F030E0432B282F291931E0821708F023
+:100C200030E0822F841B482F81E0241708F080E0F9
+:100C3000382B9819931789F4442379F4552369F4D0
+:100C4000662359F4EE2349F4BB2339F4A83228F47F
+:100C5000A73211F4013108F4A8950E9444098823B1
+:100C600009F48FCF0E9453096CC00E94550D022FCA
+:100C70000419F1E0201708F0F0E0232F2319E1E038
+:100C8000321708F0E0E0A22FAF1B31E02A1708F07E
+:100C900030E0E32B242F2219F1E0421708F0F0E0B6
+:100CA000B22FBE1B31E02B1708F030E0F32B252FBD
+:100CB000271941E0521708F040E0E22FEF1B31E026
+:100CC0002E1708F030E0432B262F261951E062172B
+:100CD00008F050E0622F641B31E0261708F030E086
+:100CE000532B272F251941E0721708F040E0F22F0F
+:100CF000F51B5F2F31E02F1708F030E0432B282F32
+:100D0000291931E0821708F030E0822F841B482F28
+:100D100081E0241708F080E0382B9819931789F4A4
+:100D2000442379F4552369F4662359F4EE2349F4F6
+:100D3000BB2339F4A83228F4A73211F4013108F4A6
+:100D4000A8950E944409882309F48FCF0E94530973
+:100D50006CC00E94550D022F0419F1E0201708F015
+:100D6000F0E0232F2319E1E0321708F0E0E0A22F92
+:100D7000AF1B31E02A1708F030E0E32B242F2219B3
+:100D8000F1E0421708F0F0E0B22FBE1B31E02B1764
+:100D900008F030E0F32B252F271941E0521708F017
+:100DA00040E0E22FEF1B31E02E1708F030E0432B3C
+:100DB000262F261951E0621708F050E0622F641BBD
+:100DC00031E0261708F030E0532B272F251941E09A
+:100DD000721708F040E0F22FF51B5F2F31E02F175C
+:100DE00008F030E0432B282F291931E0821708F052
+:100DF00030E0822F841B482F81E0241708F080E028
+:100E0000382B9819931789F4442379F4552369F4FE
+:100E1000662359F4EE2349F4BB2339F4A83228F4AD
+:100E2000A73211F4013108F4A8950E9444098823DF
+:100E300009F48FCF0E94530982E40E94A809C501DA
+:100E40000E94A00D81E08093600027960FB6F89471
+:100E5000DEBF0FBECDBFCF91DF911F910F91FF90ED
+:100E6000EF90DF90CF90BF90AF909F908F907F904A
+:100E70006F905F904F903F902F900895863561F16D
+:100E8000873580F4873411F1883438F48234E1F006
+:100E90008434C1F08F3331F513C0883489F0833541
+:100EA00009F517C0883661F0893628F4843651F088
+:100EB0008736C1F40BC0833761F0863799F40CC0D4
+:100EC00086E00BC00E94B20D82E40DC00E946F024A
+:100ED00008950E940F03089580E00E94FA0D0E9479
+:100EE000E509089583E20E94A80908954F925F9250
+:100EF0006F927F928F929F92AF92BF92CF92DF922A
+:100F0000EF92FF920F931F93CF93DF9384B7809359
+:100F10008A0114BE98E10FB6F89491BD11BC0FBEC2
+:100F20008FEF8ABB8CEF81BB97BB84BB87B3866096
+:100F300087BBB8980E946C0A89E190E068E040E0C5
+:100F400021E00E9410090E94610B0E94DD0C789440
+:100F50002EE088E190E00FB6F894A89581BD0FBE11
+:100F600021BD81E690E00E94120A0E946002482E94
+:100F70000E94550D522E632E742E852E962EA72E6E
+:100F8000B82EC92E0E94750DEC01FF24DD24EE243D
+:100F900080916E01882309F4A895442069F00E948D
+:100FA000680A882309F44CC00E94BE0C009709F41B
+:100FB00047C00E945C0E44C080916000882331F0DD
+:100FC0000E94750DEC0110926000FF24209701F142
+:100FD0000E94680AD816A0F52F2D30E0CE010197A7
+:100FE0002817390710F0FF2401C0F3948F2D90E0EB
+:100FF0000E94E80D8C01005C1F4FF801D080005466
+:101000001040C8010E94120AC8010E94640F18C053
+:101010008091700182FD14C00E94680A803380F0C4
+:10102000EE2DF0E0EE0FFF1FEF59FE4F8081918112
+:101030000E94120AF1E0FE1510F4EE2401C0E394C0
+:101040000E944409882321F00E9453090E943E0710
+:101050000E94550D022F0519F1E0201708F0F0E06D
+:10106000232F2619E1E0321708F0E0E0B22FBF1B72
+:1010700031E02B1708F030E0E32B242F2719F1E0A3
+:10108000421708F0F0E0A22FAE1B31E02A1708F05B
+:1010900030E0F32B252F281941E0521708F040E0EB
+:1010A000E22FEF1B31E02E1708F030E0432B262F04
+:1010B000291951E0621708F050E0622F641B31E0FB
+:1010C000261708F030E0532B272F2A1941E072171A
+:1010D00008F040E0322F351B532F31E0251708F080
+:1010E00030E0432B282F2B1931E0821708F030E035
+:1010F000822F841B482F81E0241708F080E0382BD2
+:101100009C19931779F4442369F4552359F4662301
+:1011100049F4EE2339F4AA2329F4BB2319F407393F
+:1011200008F436CF0E946002482E0E94550D522EC0
+:10113000632E742E852E962EA72EB82EC92E28CF5C
+:101140001F920F920FB60F9211248F939F93EF93DC
+:10115000FF93E0917301F09174018CB1E557FE4F5C
+:10116000808380917301909174014F9750F4809126
+:1011700073019091740101969093740180937301AF
+:1011800004C01092740110927301FF91EF919F912E
+:101190008F910F900FBE0F901F9018951F920F9276
+:1011A0000FB60F9211242F933F938F939F93EF933A
+:1011B000FF93209175013091760180917701909194
+:1011C000780128173907E9F0E0917501F09176016F
+:1011D000E555FE4F80818CB9809175019091760123
+:1011E0004F9750F4809175019091760101969093FC
+:1011F00076018093750109C01092760110927501F5
+:1012000004C081E0809367015598FF91EF919F9111
+:101210008F913F912F910F900FBE0F901F901895B7
+:10122000382F433078F5862F8550843058F5822F3B
+:101230008150823038F5442341F080B5806280BD12
+:10124000423019F480B5806180BD223019F480B538
+:10125000886080BD653079F0663011F0683018F034
+:1012600080B5826080BD673030F080B5846080BD1D
+:10127000693009F4529A90BD39B98AB188698AB93E
+:1012800080E0089581E0089520917101309172010C
+:10129000809173019091740140E02817390709F09B
+:1012A00041E0842F08952091710130917201809165
+:1012B0007301909174012817390711F420E022C0BE
+:1012C000E0917101F0917201E557FE4F2081E091AC
+:1012D0007101F0917201E557FE4F1082809171010A
+:1012E000909172014F9750F4809171019091720129
+:1012F0000196909372018093710104C01092720163
+:1013000010927101822F0895809177019091780158
+:10131000209175013091760101968217930719F497
+:1013200081E090E008958091750190917601892B7C
+:1013300019F080E090E00895809177019091780114
+:1013400020E030E04F9711F421E030E0C90108952A
+:10135000482F80917701909178012091750130910B
+:101360007601019682179307A1F380917501909100
+:101370007601892B31F480917701909178014F9714
+:1013800041F3E0917701F0917801E555FE4F4083FC
+:1013900080917701909178014F9750F48091770177
+:1013A000909178010196909378018093770104C021
+:1013B000109278011092770180916701813021F4B9
+:1013C00010926701559A5D9A0895CF93DF93EC01CF
+:1013D00003C021960E94A80988818823D1F7DF9154
+:1013E000CF9108951AB810BC10BC19B810927201B0
+:1013F0001092710110927601109275011092740191
+:101400001092730110927801109277010895209143
+:101410007D0130917E0140917F0150918001B901A1
+:10142000CA0108951F931FB7F89421E02093790112
+:1014300010927A0110927C01BC0140E050E019C08A
+:101440008D918095F90193E0EE0FFF1F9A95E1F7DA
+:10145000E40FF51FE553FE4F80832F5F3F4F283089
+:10146000310571F74F5F5F4F685F7F4F483051051F
+:1014700021F0DB0120E030E0E3CF1FBF1F91089592
+:10148000682F7FB7F89481E08093790110927A01F8
+:1014900010927C0120E030E060950FC0FA01E80F67
+:1014A000F91FE553FE4F6083019688309105B1F72F
+:1014B0002F5F3F4F2830310549F080E090E0A901CF
+:1014C000E3E0440F551FEA95E1F7E8CF7FBF0895A9
+:1014D00080917A01869508958EB589608EBD82ECE3
+:1014E00092EA9BBD8ABD80E189BF80E00E94400AEC
+:1014F000789440E050E091E01EC08FB7F894FB0173
+:10150000E20FF31FE553FE4FA08110829093790103
+:1015100010927A0110927C018FBF80917A0188230A
+:10152000E1F32F5F3F4F2830310539F74F5F5F4FB1
+:101530004830510549F020E030E0BA01F3E0660F91
+:10154000771FFA95E1F7D9CFF89410927D011092A8
+:101550007E0110927F011092800110927A01109208
+:101560007C01089589B78F7E89BF0895982F9C7F4D
+:1015700092BB98B3880F880F880F8871977E982B3D
+:1015800098BB0895382F85B3837085BB88B3897F56
+:1015900088BB323058F025B381E090E002C0880F5C
+:1015A000991F3A95E2F7282B25BB0EC048B3232F8D
+:1015B00030E02F5F3F4F81E090E002C0880F991F1D
+:1015C0002A95E2F7482B48BB6BBB000008951F9299
+:1015D0000F920FB60F9211242F933F934F935F9367
+:1015E0006F937F938F939F93AF93BF93CF93DF932B
+:1015F000EF93FF9380917C0180917901882321F002
+:1016000010927B011092790180E00E94B60AC0E03E
+:10161000D0E0E0917B01F0E0A3E0EE0FFF1FAA9580
+:10162000E1F7EC0FFD1FE553FE4F60818C2F0E9408
+:10163000C20A2196C830D10561F720917B0181E073
+:1016400090E002C0880F991F2A95E2F70E94B60A1F
+:1016500080917B01873030F480917B018F5F809394
+:101660007B0107C010927B0180917A018F5F80938C
+:101670007A0110927C0180917D0190917E01A09170
+:101680007F01B09180010196A11DB11D80937D0164
+:1016900090937E01A0937F01B0938001FF91EF9121
+:1016A000DF91CF91BF91AF919F918F917F916F917A
+:1016B0005F914F913F912F910F900FBE0F901F9010
+:1016C000189511B88CE080B90895982F84EA86BFE8
+:1016D00006B607FEFDCF81B1887F883021F08031CA
+:1016E00011F081E0089593B984E886BF06B607FE3D
+:1016F000FDCF91B1987F983111F480E0089580E09A
+:10170000903409F081E0089544EA34E824E946BFC2
+:1017100006B607FEFDCF91B1987F983011F0903159
+:10172000B1F783B936BF06B607FEFDCF91B1987FFA
+:10173000903211F0983529F426BF06B604FCFDCF8F
+:10174000E6CF08950E94650B089584E986BF06B62A
+:1017500004FCFDCF089583B984E886BF06B607FE72
+:10176000FDCF81B190E0887F883209F091E0892F28
+:10177000089584EC86BF06B607FEFDCF83B10895B9
+:1017800084E886BF06B607FEFDCF83B10895BF92F9
+:10179000CF92DF92EF92FF920F931F93CF93DF933D
+:1017A0007B018C01D42EC52EB22E80E0E81680E09D
+:1017B000F80681E0080780E0180710F082EA01C00F
+:1017C00080EA0E94650B882399F40E94AB0B8E2D52
+:1017D0000E94AB0B8D2D9C2D9C01E90110E004C0F3
+:1017E00089910E94AB0B1F5F1B15D0F30E94A50BC4
+:1017F000DF91CF911F910F91FF90EF90DF90CF90ED
+:10180000BF900895DF92EF92FF920F931F937B0199
+:101810008C01D42E80E0E81680E0F80681E008070D
+:1018200080E0180710F082EA01C080EA0E94650B90
+:10183000882351F40E94AB0B8E2D0E94AB0B8D2D93
+:101840000E94AB0B0E94A50B1F910F91FF90EF9090
+:10185000DF9008956F927F928F929F92AF92BF9286
+:10186000CF92DF92FF920F931F93CF93DF934B01A1
+:101870005C0180E0881680E0980681E0A80680E0A0
+:10188000B80618F092EAF92E02C080EAF82E642E0B
+:101890007724C3010E94B70E8C016C01009769F197
+:1018A0008F2D0E94650B882319F0CC24DD2425C0E0
+:1018B00080E00E94AB0B882D0E94AB0B8F2D8160C6
+:1018C0000E94A20BFF2453010894A108B10806C08E
+:1018D0000E94B90BC00FD11F8883F394CF2DD0E0A5
+:1018E000CA15DB05ACF30E94C00B060D171D015095
+:1018F0001040F80180830E94A50BC601DF91CF91B3
+:101900001F910F91FF90DF90CF90BF90AF909F906D
+:101910008F907F906F900895DF92EF92FF920F93D8
+:101920001F937B018C0180E0E81680E0F80681E0DF
+:10193000080780E0180718F032EAD32E02C020EA28
+:10194000D22E8D2D0E94650B882311F010E00FC060
+:1019500080E00E94AB0B8E2D0E94AB0B8D2D816021
+:101960000E94A20B0E94C00B182F0E94A50B812F72
+:101970001F910F91FF90EF90DF900895CF93DF9329
+:1019800083E40E94650B882319F020E030E011C049
+:10199000CBE0D2E00E94B90B899382E0C131D80735
+:1019A000C9F70E94C00B88830E94A50B9E01265098
+:1019B0003040C901DF91CF91089583B78B6083BF19
+:1019C0008AEF8CBF89B7826089BF08951F920F92FA
+:1019D0000FB60F9211241F932F933F934F935F9352
+:1019E0006F937F938F939F93AF93BF93EF93FF93E7
+:1019F0008091820120918301309184014091850181
+:101A000060918601E0918701A09188011091890180
+:101A1000B82FBF5F91E0B81708F090E0F92FF20FF0
+:101A200081E0F21708F080E0782F730F81E07317E0
+:101A300008F080E0582F540F81E0541708F080E040
+:101A4000382F360F81E0361708F080E0282F2E0F50
+:101A500081E02E1708F080E0982F9A0F81E09A1706
+:101A600008F080E0810FB0938201F09383017093BE
+:101A700084015093850130938601209387019093D0
+:101A8000880180938901FF91EF91BF91AF919F9160
+:101A90008F917F916F915F914F913F912F911F9106
+:101AA0000F900FBE0F901F901895209182013091DA
+:101AB000830140918401509185016091860170916C
+:101AC0008701809188019091890108958E3110F0ED
+:101AD00080E00895682F70E06E5F7F4F882777FD64
+:101AE0008095982F0E948C0C08951F9360E070E001
+:101AF00080E090E00E948C0C182F61E070E080E0A4
+:101B000090E00E948C0C412F50E0382F20E0422BB7
+:101B1000532B87E0413E580710F040EE57E0CA01D2
+:101B20001F910895462F8E3150F4682F70E06E5F3C
+:101B30007F4F882777FD8095982F0E94020C08958B
+:101B40001F93482F192F60E070E080E090E00E9422
+:101B5000020C61E070E080E090E0412F0E94020CF6
+:101B60001F910895EF92FF920F931F93EE24FF248D
+:101B70008701C801B70140E00E94020C0894E11CF3
+:101B8000F11C011D111D80E0E81680E0F80682E0DE
+:101B9000080780E0180769F71F910F91FF90EF90F9
+:101BA00008950F931F93AB018C0126E0000F111FC6
+:101BB0002A95E1F7080F191F005E1F4F20E030E063
+:101BC000C901B80121E40E94C70B1F910F9108952C
+:101BD0009C0146E0220F331F4A95E1F7280F391F79
+:101BE000205E3F4F40E050E0CA01B90141E40E944D
+:101BF0002A0C08958A3248F4E82FF0E0EE0FFF1F18
+:101C0000E55EFB4F6591749104C0EFE6F4E06591E9
+:101C1000749182E192E00E94BC0F82E192E008950B
+:101C2000E7E0F0E0DF01A41BB109E21BF10923E0CA
+:101C3000EE0FFF1F2A95E1F7AE0FBF1FA80FB91FC8
+:101C400081E090E002C0880F991F6A95E2F72C911D
+:101C5000282B2C930895E7E0F0E0DF01A41BB109E5
+:101C6000E21BF10933E0EE0FFF1F3A95E1F7AE0FEB
+:101C7000BF1FA80FB91F81E090E002C0880F991F15
+:101C80006A95E2F780952C9128232C9308950E9461
+:101C9000640F089580E490E00E94B70E9C010097C5
+:101CA00009F4FFCFFC01805C9F4F1192E817F90700
+:101CB000E1F7C90108950895BF92CF92DF92EF92A4
+:101CC000FF920F931F93CF93DF936C010E944A0EF4
+:101CD0007C01C0E0D0E0F601EC0FFD1F80816FE1D8
+:101CE0000E94970EB82E00E00CC0C7016C2F412F48
+:101CF000202F0E94100E1F5F1B15BCF30F5F0830D2
+:101D000011F010E0F9CF2196C730D10521F7C701B6
+:101D10000E94120AC7010E94470EDF91CF911F91C6
+:101D20000F91FF90EF90DF90CF90BF900895991B97
+:101D300079E004C0991F961708F0961B881F7A95C2
+:101D4000C9F780950895AA1BBB1B51E107C0AA1FC4
+:101D5000BB1FA617B70710F0A61BB70B881F991F4C
+:101D60005A95A9F780959095BC01CD010895CF9320
+:101D7000DF93BC018230910510F462E070E0A09125
+:101D80005002B0915102ED01E0E0F0E040E050E09F
+:101D900021C0888199818617970769F48A819B8180
+:101DA000309719F09383828304C0909351028093FB
+:101DB0005002FE0134C06817790738F44115510507
+:101DC00019F08417950708F4AC01FE018A819B8104
+:101DD0009C01E9012097E9F641155105A9F1CA01D5
+:101DE000861B970B049708F4BA01E0E0F0E02AC0E4
+:101DF0008D919C91119784179507F9F464177507D5
+:101E000081F412968D919C911397309719F09383DA
+:101E1000828304C09093510280935002FD01329658
+:101E20004FC0CA01861B970BFD01E80FF91F619394
+:101E3000719302978D939C9343C0FD01828193819E
+:101E40009C01D9011097A1F680914E0290914F020A
+:101E5000892B41F480916A0190916B0190934F021C
+:101E600080934E0240916C0150916D0141155105D6
+:101E700041F44DB75EB78091680190916901481BAC
+:101E8000590B20914E0230914F0224173507B0F4C0
+:101E9000CA01821B930B8617970780F0AB014E5F38
+:101EA0005F4F8417950750F0420F531F50934F0216
+:101EB00040934E02F9016193719302C0E0E0F0E0BB
+:101EC000CF01DF91CF910895CF93DF93009709F46D
+:101ED00050C0EC0122971B821A82A0915002B0914F
+:101EE0005102109709F140E050E0AC17BD0708F12E
+:101EF000BB83AA83FE0121913191E20FF31FAE173C
+:101F0000BF0779F48D919C911197280F391F2E5F8F
+:101F10003F4F3983288312968D919C9113979B8311
+:101F20008A834115510571F4D0935102C093500238
+:101F300020C012968D919C911397AD01009711F0DE
+:101F4000DC01D3CFFA01D383C28321913191E20F17
+:101F5000F31FCE17DF0769F488819981280F391F95
+:101F60002E5F3F4FFA01318320838A819B819383C7
+:101F70008283DF91CF910895FB01DC0105900D92E2
+:0A1F80000020E1F70895F894FFCF68
+:101F8A0001FFFFFFFFFFFFFFFFFF81818181818149
+:101F9A00FFFF818181818181FFFF8181818181812F
+:101FAA00FFFF818181818181FFFF8181818181811F
+:101FBA00FFFF818181818181FFFFFFFFFFFFFFFF1B
+:101FCA00FFFF010101FF8080FFFF010101FF808007
+:101FDA00FFFF010101FF8080FFFF010101FF8080F7
+:101FEA00FFFF010101FF8080FFFF010101FF8080E7
+:101FFA00FFFF010101FF8080FFFF010101FF8080D7
+:10200A00FF7E818181FF8181817E818181FF818142
+:10201A00817E818181FF8181817E818181FF8181B0
+:10202A00817E818181FF8181817E818181FF8181A0
+:10203A00817E818181FF8181817E818181FF818190
+:10204A00811E2222221E0202021E2222221E0202B7
+:10205A00021E2222221E0202021E2222221E020226
+:10206A00021E2222221E0202021E2222221E020216
+:10207A00021E2222221E0202021E2222221E020206
+:0E208A0002A100E1002101012000520200002D
+:00000001FF

CubeFirmware/makefile

@@ -19,7 +19,7 @@
 # To rebuild project do "make clean" then "make all".
 #
 
-CDEFS = -D DEBUG
+#CDEFS = -D DEBUG
 
 # MCU name
 MCU = atmega32
@@ -262,7 +262,7 @@ ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
 
 
 # Default target.
-all: begin gccversion sizebefore build sizeafter finished end
+all: begin gccversion sizebefore build finished end clean
 
 build: elf hex eep lss sym
 
@@ -390,18 +390,12 @@ extcoff: $(TARGET).elf
 
 
 # Target: clean project.
-clean: begin clean_list2 finished end
-
-clean_list2: clean_list
-	$(REMOVE) $(TARGET).hex
+clean: begin clean_list finished end
 
 clean_list:
-	@echo
-	@echo $(MSG_CLEANING)
 	$(REMOVE) $(TARGET).eep
 	$(REMOVE) $(TARGET).obj
 	$(REMOVE) $(TARGET).cof
-	$(REMOVE) $(TARGET).elf
 	$(REMOVE) $(TARGET).map
 	$(REMOVE) $(TARGET).obj
 	$(REMOVE) $(TARGET).a90
@@ -413,8 +407,8 @@ clean_list:
 	$(REMOVE) $(SRC:.c=.s)
 	$(REMOVE) $(SRC:.c=.d)
 	$(REMOVE) .dep/*
-
-
+	@if [ -f $(TARGET).elf ]; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); fi
+	$(REMOVE) $(TARGET).elf
 
 # Include the dependency files.
 -include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)

CubeFirmware/strings.c

@@ -30,7 +30,7 @@ char stringVersion[] PROGMEM = "v2.3 Debug Build\nPROBABLY NOT COMPATIBLE WITH C
 char stringVersion[] PROGMEM = "v2.3 Release\n"; // 0
 #endif
 
-char stringInit[] PROGMEM = "\nInitialized: "; // 1
+char stringInit[] PROGMEM = "Initialized: "; // 1
 char stringSelfTestError[] PROGMEM = "Self-Test Error: 0b"; // 2
 char stringAudioError[] PROGMEM = " => No answer from Audio!\n"; // 3
 char stringMemError[] PROGMEM = " => No answer from Memory!\n"; // 4
@@ -69,10 +69,11 @@ char stringPowerOn[] PROGMEM = "Power-On Reset detected.\n"; // 36
 char stringMinute[] PROGMEM = "Yay! Another minute passed :)\n"; // 37
 char stringAudioMode[] PROGMEM = "Audio Mode!\n"; // 38
 char stringCubeMode[] PROGMEM = "Cube Mode!\n"; // 39
-char stringModeChange[] PROGMEM = "Cube mode changed!\n";
+char stringModeChange[] PROGMEM = "Cube mode entered!\n"; // 40
+char stringModeChange2[] PROGMEM = "Audio mode entered!\n"; // 41
 
 // Last index + 1
-#define STRINGNUM 41
+#define STRINGNUM 42
 
 PGM_P stringTable[STRINGNUM] PROGMEM = { stringVersion, stringSelfTestError, stringInit,
 								stringAudioError, stringMemError, stringMemWriteError,
@@ -84,7 +85,7 @@ PGM_P stringTable[STRINGNUM] PROGMEM = { stringVersion, stringSelfTestError, str
 								stringHelp9, stringInterrupts, stringFrames2, stringDeleted,
 								stringReset, stringWatchdog, stringBrownout, stringNothing,
 								stringExtern, stringJtag, stringPowerOn, stringMinute, stringAudioMode,
-								stringCubeMode, stringModeChange };
+								stringCubeMode, stringModeChange, stringModeChange2 };
 
 char stringNotFoundError[] PROGMEM = "String not found!\n";
 

CubeFirmware/visualizer.c

@@ -29,15 +29,20 @@
 
 void simpleVisualization(uint8_t *data) {
 	uint8_t *buff;
+	int8_t i, h, max, d;
 
 	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);
+
+	for(i = 0; i < 7; i++) {
+		max = data[i] / 31;
+		
+		for (d = 0; d < 8; d++) {
+			for (h = 0; h < max; h++) {
+				buffSetPixel(buff, i, h, d);
+			}
+		}
+	}
+
 	setImage(buff);
 	buffFree(buff);
 }