Added Watchdog timer.

CubeFirmware/main.c

@@ -34,6 +34,7 @@
 #include <avr/pgmspace.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include <avr/wdt.h>
 
 #include "serial.h"
 #include "cube.h"
@@ -73,8 +74,10 @@ void printTime(void);
 #include "snake.c"
 #endif
 
+uint8_t shouldRestart = 0;
 uint8_t refreshAnimationCount = 1;
 uint8_t lastButtonState = 0;
+uint8_t mcusr_mirror;
 char buffer[11];
 
 uint8_t defaultImage[64] = 	{	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -97,12 +100,18 @@ int main(void) {
 	uint64_t lastChecked;
 	uint32_t temp;
 
+	mcusr_mirror = MCUCSR;
+	MCUCSR = 0;
+	wdt_disable();
+
 	initCube();
 	serialInit(25, 8, NONE, 1);
 	i2c_init();
 	initSystemTimer();
 	sei(); // Enable Interrupts
 
+	wdt_enable(WDTO_500MS); // Enable watchdog reset after 500ms
+
 	DDRD = 0xFC; // Mosfets as Output
 	DDRB = 0xFE;
 	DDRC = 0xFF; // Latch Enable
@@ -122,14 +131,26 @@ int main(void) {
 		serialWrite('\n');
 		printErrors(i);
 	}
-#endif
 
-#ifdef DEBUG
 	serialWriteString(getString(2));
 	serialWriteString(getString(0));
 	serialWriteString("Took ");
 	serialWriteString(itoa(getSystemTime(), buffer, 10));
 	serialWriteString(" ms!\n");
+
+	if (mcusr_mirror & WDRF) {
+		serialWriteString(getString(31));
+	} else if (mcusr_mirror & BORF) {
+		serialWriteString(getString(32));
+	} else if (mcusr_mirror & EXTRF) {
+		serialWriteString(getString(34));
+	} else if (mcusr_mirror & JTRF) {
+		serialWriteString(getString(35));
+	} else if (mcusr_mirror & PORF) {
+		serialWriteString(getString(36));
+	} else {
+		serialWriteString(getString(33));
+	}
 #endif
 
 	lastMode = audioModeSelected();
@@ -138,6 +159,11 @@ int main(void) {
 	i = 0;
 	count = getAnimationCount();
 	while (1) {
+		// Reset if requested
+		if (!shouldRestart) {
+			wdt_reset();
+		}
+
 		if(lastMode) {
 			// Get Audio Data and visualize it
 			if (isFinished()) {
@@ -197,6 +223,8 @@ int main(void) {
 			serialHandler((char)(serialGet()));
 		}
 
+#ifdef DEBUG
+		// Print frames per second
 		if ((getSystemTime() >= 1000) && ((DebugDone & 1) == 0)) {
 			temp = getTriggerCount();
 			serialWriteString(ltoa(temp, buffer, 10));
@@ -206,6 +234,13 @@ int main(void) {
 			DebugDone |= 1;
 		}
 
+		// Show how stable we are running :)
+		if (((getSystemTime() % 60000) == 0) && (getSystemTime() > 0)) {
+			serialWriteString(getString(37));
+			printTime();
+		}
+#endif
+
 		if ((getSystemTime() - lastChecked) > 150) {
 			lastMode = audioModeSelected();
 			lastChecked = getSystemTime();
@@ -285,7 +320,7 @@ void randomAnimation(void) {
 
 void serialHandler(char c) {
 	// Used letters:
-	// a, c, d, e, g, i, n, r, s, t, v, x, y, 0, 1, 2
+	// a, c, d, e, g, i, n, q, r, s, t, v, x, y, 0, 1, 2
 	uint8_t i, y, z;
 #ifdef DEBUG
 	serialWrite(c);
@@ -336,6 +371,11 @@ void serialHandler(char c) {
 		break;
 
 #ifdef DEBUG
+	case 'q': case 'Q':
+		shouldRestart = 1;
+		serialWriteString(getString(30));
+		break;
+
 	case 'r': case 'R':
 		randomAnimation();
 		break;
@@ -438,6 +478,11 @@ void printTime(void) {
 	serialWriteString(getString(14));
 	serialWriteString(ltoa(getSystemTime(), buffer, 10));
 	serialWriteString("ms");
+	if (getSystemTime() > 60000) {
+		serialWriteString(" (");
+		serialWriteString(itoa(getSystemTime() / 60000, buffer, 10));
+		serialWriteString(" min)");
+	}
 	if (getSystemTime() > 1000) {
 		serialWriteString(" (");
 		serialWriteString(itoa(getSystemTime() / 1000, buffer, 10));

CubeFirmware/strings.c

@@ -30,7 +30,7 @@ char stringVersion[] PROGMEM = "v2 (Debug Build)\nNOT COMPATIBLE WITH CubeContro
 char stringVersion[] PROGMEM = "v2 Release\n"; // 0
 #endif
 
-char stringInit[] PROGMEM = "\n\nInitialized: "; // 1
+char stringInit[] PROGMEM = "\nInitialized: "; // 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
@@ -55,13 +55,21 @@ char stringAudioData[] PROGMEM = "Audio Data:\n"; // 22
 char stringSnakeControl[] PROGMEM = "Controls: W A S D Q E, x to quit\n"; // 23
 char stringNoMoreHeap[] PROGMEM = "Ran out of Heap!\n"; // 24
 char stringKilledAnimation[] PROGMEM = "Animation aborted!\n"; // 25
-char stringHelp9[] PROGMEM = "(i)nterrupt count, (r)andom\n"; // 26
+char stringHelp9[] PROGMEM = "(i)nterrupt count, (r)andom, (q)reset\n"; // 26
 char stringInterrupts[] PROGMEM = " Interrupts after 1000msec\n"; // 27
 char stringFrames2[] PROGMEM = " Frames per Second\n"; // 28
 char stringDeleted[] PROGMEM = "Memory deleted!\n"; // 29
+char stringReset[] PROGMEM = "Reset in 500ms. Bye!\n"; // 30
+char stringWatchdog[] PROGMEM = "Watchdog Reset detected.\n"; // 31
+char stringBrownout[] PROGMEM = "Brown-Out Reset detected.\n"; // 32
+char stringNothing[] PROGMEM = "No Reset reason detected.\n"; // 33
+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
 
 // Last index + 1
-#define STRINGNUM 30
+#define STRINGNUM 38
 
 PGM_P stringTable[STRINGNUM] PROGMEM = { stringVersion, stringSelfTestError, stringInit,
 								stringAudioError, stringMemError, stringMemWriteError,
@@ -70,7 +78,9 @@ PGM_P stringTable[STRINGNUM] PROGMEM = { stringVersion, stringSelfTestError, str
 								stringByte, stringWritten, stringCount, stringSelfTest,
 								stringKillCount, stringAccessError, stringAudioData,
 								stringSnakeControl, stringNoMoreHeap, stringKilledAnimation,
-								stringHelp9, stringInterrupts, stringFrames2, stringDeleted };
+								stringHelp9, stringInterrupts, stringFrames2, stringDeleted,
+								stringReset, stringWatchdog, stringBrownout, stringNothing,
+								stringExtern, stringJtag, stringPowerOn, stringMinute };
 
 char stringNotFoundError[] PROGMEM = "String not found!\n";
 

Hardware/Parts.txt

@@ -18,7 +18,7 @@ Quant.	Value			Device
 1		4k7R			0603
 64		120R			0603
 
-64		PNP				PNP
+64		PNP				BC 860CW
 8		IRF530			IRF530
 8		74HC573D		74HC573D
 1		MEGA8-AI		MEGA8-AI