Removed Debug build

CubeFirmware/audio.c

@@ -26,9 +26,6 @@
 
 #include "twi.h"
 #include "audio.h"
-#ifdef DEBUG
-#include "serial.h"
-#endif
 
 uint8_t ret[7]; // Buffer for data
 

CubeFirmware/buffhelp.c

@@ -30,9 +30,7 @@ uint8_t *buffNew(void) {
 	uint8_t i;
 	uint8_t *tmp = (uint8_t *)malloc(64);
 	if (tmp == NULL) {
-#ifdef DEBUG
-		serialWriteString(getString(24));
-#endif
+		serialWriteString(getString(24)); // Display warning, don't care for CubeControl
 		while(1); // Ran out of heap => Watchdog Reset
 	}
 	for (i = 0; i < 64; i++) {

CubeFirmware/cube.c

@@ -26,10 +26,6 @@
 #include <stdlib.h>
 #include <util/atomic.h>
 
-#ifdef DEBUG
-#include "serial.h"
-#include "strings.h"
-#endif
 #include "cube.h"
 
 #ifndef F_CPU
@@ -161,9 +157,6 @@ void initCube(void) {
 				toggleFlag = COUNT2; // Ensure next interrupts starts displaying
 			}
 			while(imgFlag < 1); // Wait for frame to display
-			/* ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
-				imgBuffer[x][y] |= (0xFF); // Clear pixel
-			} */
 		}
 	}
 

CubeFirmware/header/cube.h

@@ -35,7 +35,4 @@ extern void close(void);
 
 extern void fillBuffer(uint8_t val);
 
-// For debugging, not normal operation:
-extern void setFet(uint8_t data);
-extern void setLatch(uint8_t latchNr, uint8_t data);
 extern uint32_t getTriggerCount(void);

CubeFirmware/header/transmit.h

@@ -23,7 +23,4 @@
 
 void recieveAnimations(void);
 void transmitAnimations(void);
-
-#ifdef DEBUG
-void sendAudioData(void);
-#endif
+void sendAudioData(void);

CubeFirmware/main.c

@@ -63,19 +63,16 @@
 
 void serialHandler(char c);
 uint8_t audioModeSelected(void);
-#ifdef DEBUG
 void printErrors(uint8_t e);
 uint8_t selfTest(void);
 void printTime(void);
 
-#include "snake.c"
-#endif
+// #include "snake.c"
 
 uint8_t shouldRestart = 0;
 uint8_t refreshAnimationCount = 1;
 uint8_t lastButtonState = 0;
 uint8_t maxButtonState = 0;
-uint8_t mcusr_mirror;
 char buffer[11];
 
 #include "builtInFrames.c"
@@ -90,11 +87,8 @@ int main(void) {
 	uint16_t count;
 	uint64_t lastChecked;
 	uint8_t idleCounter = 0;
-#ifdef DEBUG
 	uint32_t temp;
-#endif
 
-	mcusr_mirror = MCUCSR;
 	MCUCSR = 0;
 	wdt_disable();
 
@@ -113,37 +107,17 @@ int main(void) {
 
 	wdt_enable(WDTO_1S); // Watchdog reset after 1 second
 
-#ifdef DEBUG
-	// Kill animation counter in debug mode
-	// => Don't preserve animations while power down
-	setAnimationCount(0);
-
-	serialWriteString(getString(2));
+	serialWriteString(getString(2)); // "Initialized: "
 
 	i = selfTest();
 	if (i) {
-		serialWriteString(getString(1));
+		serialWriteString(getString(1)); // Selftest error
 		serialWriteString(itoa(i, buffer, 2));
 		serialWrite('\n');
 		printErrors(i);
 	}
 
-	serialWriteString(getString(0));
-
-	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
+	serialWriteString(getString(0)); // Version
 
 	maxButtonState = numberOfVisualizations() + 1; // All visualizations and anim mode
 
@@ -219,8 +193,7 @@ int main(void) {
 			serialHandler((char)(serialGet()));
 		}
 
-#ifdef DEBUG
-		// Print frames per second
+		// Print fps after one second
 		if ((getSystemTime() >= 1000) && ((DebugDone & 1) == 0)) {
 			temp = getTriggerCount();
 			serialWriteString(ltoa(temp, buffer, 10));
@@ -229,7 +202,6 @@ int main(void) {
 			serialWriteString(getString(28));
 			DebugDone |= 1;
 		}
-#endif
 
 		if ((getSystemTime() - lastChecked) > 150) { // Check button state every 150ms
 			audioModeSelected();
@@ -252,19 +224,10 @@ uint8_t audioModeSelected(void) {
 			lastButtonState = 0;
 		}
 
-#ifdef DEBUG
-		if (lastButtonState) {
-			serialWriteString(getString(38));
-		} else {
-			serialWriteString(getString(39));
-		}
-#endif
-
 	}
 	return lastButtonState;
 }
 
-#ifdef DEBUG
 uint8_t selfTest(void) {
 	uint8_t result = NOERROR;
 	
@@ -329,16 +292,11 @@ void randomAnimation(void) {
 	}
 	free(b);
 }
-#endif
 
 void serialHandler(char c) {
 	// Used letters:
 	// 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);
-	serialWriteString(": ");
-#endif
 
 	switch(c) {
 	case OK:
@@ -347,7 +305,6 @@ void serialHandler(char c) {
 
 	case 'h': case 'H': case '?':
 		serialWriteString(getString(6));
-#ifdef DEBUG
 		serialWriteString(getString(7));
 		serialWriteString(getString(8));
 		serialWriteString(getString(9));
@@ -356,20 +313,13 @@ void serialHandler(char c) {
 		serialWriteString(getString(12));
 		serialWriteString(getString(13));
 		serialWriteString(getString(26));
-#endif
 		break;
 
 	case 'd': case 'D':
 		clearMem();
-#ifndef DEBUG
 		serialWrite(OK);
-#endif
-#ifdef DEBUG
-		serialWriteString(getString(29));
-#endif
 		break;
 
-#ifndef DEBUG
 	case 'g': case 'G':
 		transmitAnimations();
 		break;
@@ -377,13 +327,11 @@ void serialHandler(char c) {
 	case 's': case 'S':
 		recieveAnimations();
 		break;
-#endif
 
 	case 'v': case 'V':
 		serialWriteString(getString(0));
 		break;
 
-#ifdef DEBUG
 	case 'm': case 'M':
 		lastButtonState = !lastButtonState;
 		if (lastButtonState) {
@@ -439,7 +387,7 @@ void serialHandler(char c) {
 		break;
 
 	case 'n': case 'N':
-		snake();
+		// snake();
 		break;
 
 	case '0':
@@ -492,7 +440,6 @@ killMeForIt:
 		serialWriteString(ltoa(getTriggerCount(), buffer, 10));
 		serialWrite('\n');
 		break;
-#endif
 
 	default:
 		serialWrite(ERROR);
@@ -501,7 +448,6 @@ killMeForIt:
 	// c was used as temp var and does not contain the char anymore...!
 }
 
-#ifdef DEBUG
 void printTime(void) {
 	serialWriteString(getString(14));
 	serialWriteString(ltoa(getSystemTime(), buffer, 10));
@@ -528,4 +474,3 @@ void printTime(void) {
 		serialWrite('\n');
 	}
 }
-#endif

CubeFirmware/mem.c

@@ -26,10 +26,8 @@
 #include <stdint.h>
 #include "twi.h"
 #include "mem.h"
-#ifdef DEBUG
 #include "serial.h"
 #include "strings.h"
-#endif
 
 // address is a number between (inclusive) zero and 131071
 uint8_t memGetByte(uint32_t address) {
@@ -65,9 +63,7 @@ uint8_t *memGetBytes(uint32_t address, uint8_t length) {
 	addB = address & 0xFF;
 	ret = (uint8_t *)malloc(length); // Allocate memory for values read
 	if (ret == NULL) {
-#ifdef DEBUG
 		serialWriteString(getString(24));
-#endif
 		return NULL;
 	}
 

CubeFirmware/strings.c

@@ -24,12 +24,7 @@
 
 char buffer[60];
 
-#ifdef DEBUG
-const char stringVersion[] PROGMEM = "v2.3 Debug Build\nPROBABLY NOT COMPATIBLE WITH CubeControl Software!\n"; // 0
-#else
-const char stringVersion[] PROGMEM = "v2.3 Release\n"; // 0
-#endif
-
+const char stringVersion[] PROGMEM = "v2.4\n"; // 0
 const char stringSelfTestError[] PROGMEM = "Self-Test Error: 0b"; // 1
 const char stringInit[] PROGMEM = "Initialized: "; // 2
 const char stringAudioError[] PROGMEM = " => No answer from Audio!\n"; // 3
@@ -60,15 +55,15 @@ const char stringInterrupts[] PROGMEM = " Interrupts after 1000msec\n"; // 27
 const char stringFrames2[] PROGMEM = " Frames per Second\n"; // 28
 const char stringDeleted[] PROGMEM = "Memory deleted!\n"; // 29
 const char stringReset[] PROGMEM = "Reset in 500ms. Bye!\n"; // 30
-const char stringWatchdog[] PROGMEM = "Watchdog Reset detected.\n"; // 31
-const char stringBrownout[] PROGMEM = "Brown-Out Reset detected.\n"; // 32
-const char stringNothing[] PROGMEM = "No Reset reason detected.\n"; // 33
-const char stringExtern[] PROGMEM = "External Reset detected.\n"; // 34
-const char stringJtag[] PROGMEM = "JTAG Reset detected.\n"; // 35
-const char stringPowerOn[] PROGMEM = "Power-On Reset detected.\n"; // 36
+const char stringWatchdog[] PROGMEM = ""; // 31
+const char stringBrownout[] PROGMEM = ""; // 32
+const char stringNothing[] PROGMEM = ""; // 33
+const char stringExtern[] PROGMEM = ""; // 34
+const char stringJtag[] PROGMEM = ""; // 35
+const char stringPowerOn[] PROGMEM = ""; // 36
 const char stringMinute[] PROGMEM = "Yay! Another minute passed :)\n"; // 37
-const char stringAudioMode[] PROGMEM = "Audio Mode!\n"; // 38
-const char stringCubeMode[] PROGMEM = "Cube Mode!\n"; // 39
+const char stringAudioMode[] PROGMEM = ""; // 38
+const char stringCubeMode[] PROGMEM = ""; // 39
 const char stringModeChange[] PROGMEM = "Cube mode entered!\n"; // 40
 const char stringModeChange2[] PROGMEM = "Audio mode entered!\n"; // 41
 

README.md

@@ -8,8 +8,7 @@ You can find the schematic as png and Eagle file in this directory.
 
 ## Firmware
 
-The firmware of the Controller is yet to be tested...
-It uses [Peter Fleury's TWI Library](http://homepage.hispeed.ch/peterfleury/avr-software.html).
+2 Firmwares, for the AtMega8 TWI Slave and for the Atmega32. Currently in development.
 
 ## Cube Control