Misc work.

Changed some more faulty transistors. cubeInit now displays short test
animation. Moved header files in own folder.

CubeFirmware/cube.c

@@ -83,6 +83,7 @@ void setImage(uint8_t *img) {
 	ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
 		changedFlag = 1;
 		imgFlag = 0;
+		toggleFlag = 0;
 		for (i = 0; i < 8; i++) {
 			for (j = 0; j < 8; j++) {
 				imgBuffer[j][i] = ~(img[j + (i * 8)]);
@@ -96,6 +97,7 @@ void fillBuffer(uint8_t val) {
 	ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
 		changedFlag = 1;
 		imgFlag = 0;
+		toggleFlag = 0;
 		for (i = 0; i < 8; i++) {
 			for (j = 0; j < 8; j++) {
 				imgBuffer[i][j] = ~(val);
@@ -109,9 +111,36 @@ uint8_t isFinished(void) {
 }
 
 void initCube(void) {
+	uint8_t x, y;
+
 	TCCR1B |= (1 << CS10) | (1 << WGM12); // Prescaler: 1, CTC Mode
 	OCR1A = COUNT;
 	TIMSK = (1 << OCIE1A); // Enable Output Compare Interrupt
+
+	fillBuffer(0); // Clear memory
+	sei(); // Enable interrupts
+
+	// Show test animation
+	for (x = 0; x < 8; x++) {
+		for (y = 0; y < 8; y++) {
+			ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
+				imgBuffer[x][y] &= ~(0xFF); // Set a pixel
+				changedFlag = 1;
+				imgFlag = 0;
+				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
+			} */
+		}
+	}
+
+	cli(); // Disable interrupts
+
+	timesTriggered = 0;
+	imgFlag = 0;
+	toggleFlag = 0;
 }
 
 void close(void) {

CubeFirmware/main.c

@@ -56,7 +56,7 @@
 #define ISERROR(x, e) ((x) & (e))
 
 // Length of an idle animation frame, 24 -> 1 second
-#define IDLELENGTH 24
+#define IDLELENGTH 48
 
 void serialHandler(char c);
 void sendAudioData(void);
@@ -107,6 +107,15 @@ 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 };
 
+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 };
 
@@ -128,21 +137,23 @@ int main(void) {
 	MCUCSR = 0;
 	wdt_disable();
 
+	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
+
 	initCube();
 	serialInit(25, 8, NONE, 1);
 	i2c_init();
 	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
 
-	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(defaultImageA); // Display something
+	setImage(defaultImageCube); // Display something
 
 #ifdef DEBUG
 	// Kill animation counter in debug mode
@@ -344,7 +355,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
+	// a, 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);
@@ -459,6 +470,11 @@ void serialHandler(char c) {
 		DebugDone |= 4;
 		break;
 
+	case '3':
+		setImage(defaultImageCube);
+		DebugDone |= 4;
+		break;
+
 	case '2':
 		DebugDone |= 4;
 		fillBuffer(0);

CubeFirmware/makefile

@@ -69,7 +69,7 @@ OPT = s
 
 # List any extra directories to look for include files here.
 #     Each directory must be seperated by a space.
-EXTRAINCDIRS = 
+EXTRAINCDIRS = header
 
 
 # Compiler flag to set the C Standard level.

CubeFirmware/strings.c

@@ -40,9 +40,9 @@ 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, (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
-char stringHelp8[] PROGMEM = "(2): Test Anim. 1\n"; // 13
+char stringHelp6[] PROGMEM = "All LEDs Off/On (0/1)\n"; // 11
+char stringHelp7[] PROGMEM = "(2): Test Anim. 1\n"; // 12
+char stringHelp8[] PROGMEM = "(3): All Surface LEDs on\n"; // 13
 char stringTime[] PROGMEM = "System Time: "; // 14
 char stringFrames[] PROGMEM = " Frames stored\n"; // 15
 char stringByte[] PROGMEM = "Send a byte... "; // 16