Misc Firmware fixes.

Audio Firmware now with Watchdog. Removed unused code. Fixed compiler
warnings. Fixed cube coordinate system problems. Fixed audio display
rotation. Nicer Idle Display with SAP Logo. Increased Firmware Version
Number. Debug Build even more talky.

AudioFirmware/eq.c

@@ -46,25 +46,6 @@ void equalizerInit(void) {
 
 }
 
-void eqLed(uint8_t *d) {
-	uint8_t pins[7] = { PD2, PD3, PD4, PD5, PD6, PD7, PB0 };
-	uint8_t i;
-
-	for (i = 0; i < 7; i++) {
-		if (d[i] >= 127) {
-			if (i < 6)
-				PORTD |= (1 << pins[i]);
-			else
-				PORTB |= (1 << pins[i]);
-		} else {
-			if (i < 6)
-				PORTD &= ~(1 << pins[i]);
-			else
-				PORTB &= ~(1 << pins[i]);
-		}
-	}
-}
-
 uint8_t *equalizerGet(void) {
 	uint8_t *result = (uint8_t *)malloc(7); // Has to work... If not, were screwed anyway :)
 	uint8_t i, offset = getOffset();
@@ -78,7 +59,7 @@ uint8_t *equalizerGet(void) {
 		PORTC &= ~(1 << PC2);
 		adcStartConversion(0x00);
 		_delay_us(READDELAY); // Wait for result to appear
-		result[i] = offset + adcGetByte(); // This line hangs
+		result[i] = offset + adcGetByte();
 		_delay_us(STROBEDELAY);
 	}
 

AudioFirmware/main.c

@@ -24,6 +24,7 @@
 #include <stdint.h>
 #include <avr/io.h>
 #include <util/delay.h>
+#include <avr/wdt.h>
 
 #include "adc.h"
 #include "eq.h"
@@ -34,24 +35,20 @@
 #endif
 
 void blinkStatus(void) {
-	// uint8_t i, mem[7] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
-
 	PORTB |= (1 << PB2);
 	PORTB &= ~(1 << PB1);
-	// eqLed(mem);
 	_delay_ms(250);
 	PORTB &= ~(1 << PB2);
 	PORTB |= (1 << PB1);
-	// for (i = 0; i < 7; i++) {
-	// 	mem[i] = 0x00;
-	// }
-	// eqLed(mem);
 	_delay_ms(250);
 }
 
 int main(void) {
 	uint8_t *music;
 
+	MCUCSR = 0;
+	wdt_disable();
+
 	DDRB = 0x3F;
 	DDRC = 0x0C;
 	DDRD = 0xFF;
@@ -63,23 +60,27 @@ int main(void) {
 	blinkStatus();
 	blinkStatus();
 
+	wdt_enable(WDTO_500MS); // Enable watchdog reset after 500ms
+
 	music = equalizerGet();
 	twiSetDataToSend(music);
 	free(music);
 
 	while (1) {
-		music = equalizerGet();
 		if (twiDataWasSent()) {
 			PORTB ^= (1 << PB2); // Toggle for every transaction
+			
+			music = equalizerGet();
 			twiSetDataToSend(music);
+			free(music);
 		}
-		// eqLed(music);
-		free(music);
 
 		// Heartbeat
 		PORTB ^= (1 << PB1);
 		_delay_ms(1); // Everything locks if this is removed :(
 		// still don't know why...
+
+		wdt_reset();
 	}
 
 	return 0;

AudioFirmware/twislave.c

@@ -82,7 +82,7 @@ void twiSetDataToSend(uint8_t *d) { // 7 bytes
 	}
 }
 
-uint8_t twiDataWasSent() {
+uint8_t twiDataWasSent(void) {
 	if (dataSent != 0) {
 		dataSent = 0;
 		return 1;

CubeFirmware/cube.c

@@ -85,7 +85,7 @@ void setImage(uint8_t *img) {
 		imgFlag = 0;
 		for (i = 0; i < 8; i++) {
 			for (j = 0; j < 8; j++) {
-				imgBuffer[i][j] = ~(img[j + (i * 8)]);
+				imgBuffer[j][i] = ~(img[j + (i * 8)]);
 			}
 		}
 	}

CubeFirmware/main.c

@@ -80,16 +80,37 @@ uint8_t lastButtonState = 0;
 uint8_t mcusr_mirror;
 char buffer[11];
 
-uint8_t defaultImage[64] = 	{	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-								0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-								0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-								0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-								0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-								0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-								0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-								0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
-
-uint8_t DebugDone = 0; // Bit 0: 10s int. count, Bit 1: switch idle display
+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 };
+
+uint8_t DebugDone = 0; // Bit 0: 10s int. count, Bit 1: unused
 					   // Bit 2: state changed, disable idle
 
 int main(void) {
@@ -98,7 +119,10 @@ int main(void) {
 	uint8_t i, length = 0, lastMode;
 	uint16_t count;
 	uint64_t lastChecked;
+	uint8_t idleCounter = 0;
+#ifdef DEBUG
 	uint32_t temp;
+#endif
 
 	mcusr_mirror = MCUCSR;
 	MCUCSR = 0;
@@ -110,14 +134,15 @@ int main(void) {
 	initSystemTimer();
 	sei(); // Enable Interrupts
 
-	wdt_enable(WDTO_500MS); // Enable watchdog reset after 500ms
+	// wdt_enable(WDTO_500MS); // Enable watchdog reset after 500ms
+	wdt_enable(WDTO_1S); // Watchdog reset after 1 second
 
 	DDRA = 0xFF; // Latch Data Bus as Output
 	DDRD = 0xFC; DDRB = 24; // Mosfets as Output
 	DDRC = 0xFC; DDRB |= 6; // Latch Enable as Output
 	DDRB &= ~(1 << PB0); // Pushbutton as Input
 
-	setImage(defaultImage); // Display something
+	setImage(defaultImageA); // Display something
 
 #ifdef DEBUG
 	// Kill animation counter in debug mode
@@ -167,14 +192,14 @@ int main(void) {
 		if(lastMode) {
 			// Get Audio Data and visualize it
 			if (isFinished()) {
-				audioData = getAudioData();
+				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);
+						while(1); // Ran out of heap => Watchdog Reset
 					}
 					visualizeAudioData(audioData, imageData);
 					setImage(imageData);
@@ -204,15 +229,14 @@ int main(void) {
 					free(imageData);
 				}
 			} else {
-				if (!(DebugDone & 4)) {
+				if (!(DebugDone & 4)) { // Idle animation allowed
 					if (isFinished() >= IDLELENGTH) {
 						// Should happen every half second
-						if (DebugDone & 2) {
-							fillBuffer(0);
-							DebugDone &= ~(2);
+						setImage(idleAnimation[idleCounter]);
+						if (idleCounter < (IDLEANIMATIONCOUNT - 1)) {
+							idleCounter++;
 						} else {
-							fillBuffer(0xFF);
-							DebugDone |= 2;
+							idleCounter = 0;
 						}
 					}
 				}
@@ -269,8 +293,8 @@ uint8_t selfTest(void) {
 		free(data);
 	}
 
-	setGeneralPurposeByte(0, 0x42);
-	if (getGeneralPurposeByte(0) != 0x42) {
+	setGeneralPurposeByte(0, 0x23);
+	if (getGeneralPurposeByte(0) != 0x23) {
 		result |= MEMORYWRITEERROR;
 	}
 
@@ -321,8 +345,8 @@ 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
-	uint8_t i, y, z;
 #ifdef DEBUG
+	uint8_t i, y, z;
 	serialWrite(c);
 	serialWriteString(": ");
 #endif
@@ -371,6 +395,11 @@ void serialHandler(char c) {
 		break;
 
 #ifdef DEBUG
+	case 'm': case 'M':
+		lastButtonState = !lastButtonState;
+		serialWriteString(getString(40));
+		break;
+
 	case 'q': case 'Q':
 		shouldRestart = 1;
 		serialWriteString(getString(30));
@@ -434,15 +463,15 @@ void serialHandler(char c) {
 		DebugDone |= 4;
 		fillBuffer(0);
 		for (i = 0; i < 64; i++) {
-			defaultImage[i] = 0;
+			defaultImageA[i] = 0;
 		}
 		while(1) {
 			for (i = 0; i < 8; i++) {
 				for (y = 0; y < 8; y++) {
-					defaultImage[y + (i * 8)] = 0;
+					defaultImageA[y + (i * 8)] = 0;
 					for (z = 0; z < 8; z++) {
-						defaultImage[y + (i * 8)] |= (1 << z);
-						setImage(defaultImage);
+						defaultImageA[y + (i * 8)] |= (1 << z);
+						setImage(defaultImageA);
 						while (isFinished() == 0) {
 							if (serialHasChar()) {
 								goto killMeForIt; // Yes I know...
@@ -450,7 +479,7 @@ void serialHandler(char c) {
 							}
 						}
 					}
-					defaultImage[y + (i * 8)] = 0;
+					defaultImageA[y + (i * 8)] = 0;
 				}
 			}
 		}
@@ -669,9 +698,11 @@ uint8_t audioModeSelected(void) {
 		}
 
 #ifdef DEBUG
-		serialWriteString("New State (");
-		serialWriteString(itoa(lastButtonState, buffer, 10));
-		serialWriteString(")\n");
+		if (lastButtonState) {
+			serialWriteString(getString(38));
+		} else {
+			serialWriteString(getString(39));
+		}
 #endif
 
 	}
@@ -686,7 +717,7 @@ void setRow(uint8_t x, uint8_t z, uint8_t height, uint8_t *buf) {
 }
 
 void setPixelBuffer(uint8_t x, uint8_t y, uint8_t z, uint8_t *buf) {
-	buf[(8 * z) + y] |= (1 << x);
+	buf[(8 * z) + (7 - y)] |= (1 << x);
 }
 
 void visualizeAudioData(uint8_t *audioData, uint8_t *imageData) {

CubeFirmware/strings.c

@@ -25,9 +25,9 @@
 char buffer[60];
 
 #ifdef DEBUG
-char stringVersion[] PROGMEM = "v2 (Debug Build)\nNOT COMPATIBLE WITH CubeControl!\n"; // 0
+char stringVersion[] PROGMEM = "v2.3 Debug Build\nPROBABLY NOT COMPATIBLE WITH CubeControl Software!\n"; // 0
 #else
-char stringVersion[] PROGMEM = "v2 Release\n"; // 0
+char stringVersion[] PROGMEM = "v2.3 Release\n"; // 0
 #endif
 
 char stringInit[] PROGMEM = "\nInitialized: "; // 1
@@ -38,7 +38,7 @@ char stringMemWriteError[] PROGMEM = " => Can't write to Memory!\n"; // 5
 char stringHelp1[] PROGMEM = "(d)elete, (g)et anims, (s)et anims, (v)ersion\n"; // 6
 char stringHelp2[] PROGMEM = "(t)ime, (a)udio, (c)ount, (x)Custom count\n"; // 7
 char stringHelp3[] PROGMEM = "(y)Set fixed animation count\n"; // 8
-char stringHelp4[] PROGMEM = "S(e)lf Test\n"; // 9
+char stringHelp4[] PROGMEM = "S(e)lf Test, (m)ode\n"; // 9
 char stringHelp5[] PROGMEM = "Play S(n)ake\n"; // 10
 char stringHelp6[] PROGMEM = "(0): All LEDs Off\n"; // 11
 char stringHelp7[] PROGMEM = "(1): All LEDs On\n"; // 12
@@ -67,9 +67,12 @@ char stringExtern[] PROGMEM = "External Reset detected.\n"; // 34
 char stringJtag[] PROGMEM = "JTAG Reset detected.\n"; // 35
 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";
 
 // Last index + 1
-#define STRINGNUM 38
+#define STRINGNUM 41
 
 PGM_P stringTable[STRINGNUM] PROGMEM = { stringVersion, stringSelfTestError, stringInit,
 								stringAudioError, stringMemError, stringMemWriteError,
@@ -80,7 +83,8 @@ PGM_P stringTable[STRINGNUM] PROGMEM = { stringVersion, stringSelfTestError, str
 								stringSnakeControl, stringNoMoreHeap, stringKilledAnimation,
 								stringHelp9, stringInterrupts, stringFrames2, stringDeleted,
 								stringReset, stringWatchdog, stringBrownout, stringNothing,
-								stringExtern, stringJtag, stringPowerOn, stringMinute };
+								stringExtern, stringJtag, stringPowerOn, stringMinute, stringAudioMode,
+								stringCubeMode, stringModeChange };
 
 char stringNotFoundError[] PROGMEM = "String not found!\n";