Strings now in program memory.

CubeFirmware/main.c

@@ -28,12 +28,6 @@
 #define OK 0x42
 #define ERROR 0x23
 
-#ifdef DEBUG
-#define VERSION "v2 (Debug Build)\nNOT COMPATIBLE WITH CubeControl!\n"
-#else
-#define VERSION "v2 Release\n"
-#endif
-
 #include <avr/io.h>
 #include <util/delay.h>
 #include <avr/interrupt.h>
@@ -48,6 +42,7 @@
 #include "mem.h"
 #include "memLayer.h"
 #include "twi.h"
+#include "strings.h"
 
 #define NOERROR 0
 // Audio does not answer
@@ -114,7 +109,7 @@ int main(void) {
 
 	i = selfTest();
 	if (i) {
-		serialWriteString("Self-Test Error: 0b");
+		serialWriteString(getString(1));
 		serialWriteString(itoa(i, buffer, 2));
 		serialWrite('\n');
 		printErrors(i);
@@ -122,8 +117,8 @@ int main(void) {
 #endif
 
 #ifdef DEBUG
-	serialWriteString("\n\nInitialized: ");
-	serialWriteString(VERSION);
+	serialWriteString(getString(2));
+	serialWriteString(getString(0));
 	serialWriteString("Took ");
 	serialWriteString(itoa(getSystemTime(), buffer, 10));
 	serialWriteString(" ms!\n");
@@ -214,13 +209,13 @@ uint8_t selfTest(void) {
 
 void printErrors(uint8_t e) {
 	if (ISERROR(e, AUDIOERROR)) {
-		serialWriteString(" => No answer from Audio!\n");
+		serialWriteString(getString(3));
 	}
 	if (ISERROR(e, MEMORYERROR)) {
-		serialWriteString(" => No answer from Memory!\n");
+		serialWriteString(getString(4));
 	}
 	if (ISERROR(e, MEMORYWRITEERROR)) {
-		serialWriteString(" => Can't write to Memory!\n");
+		serialWriteString(getString(5));
 	}
 }
 #endif
@@ -228,6 +223,7 @@ void printErrors(uint8_t e) {
 void serialHandler(char c) {
 	// Used letters:
 	// a, c, d, g, s, t, v, x
+	uint8_t i, y, z;
 #ifdef DEBUG
 	serialWrite(c);
 	serialWriteString(": ");
@@ -239,14 +235,15 @@ void serialHandler(char c) {
 		break;
 
 	case 'h': case 'H': case '?':
-		serialWriteString("(d)elete, (g)et anims, (s)et anims, (v)ersion\n");
+		serialWriteString(getString(6));
 #ifdef DEBUG
-		serialWriteString("(t)ime, (a)udio, (c)ount, (x)Custom count\n");
-		serialWriteString("(y)Set fixed animation count\n");
-		serialWriteString("S(e)lf Test\n");
-		serialWriteString("Play S(n)ake\n");
-		serialWriteString("(0): All LEDs Off\n");
-		serialWriteString("(1): All LEDs On\n");
+		serialWriteString(getString(7));
+		serialWriteString(getString(8));
+		serialWriteString(getString(9));
+		serialWriteString(getString(10));
+		serialWriteString(getString(11));
+		serialWriteString(getString(12));
+		serialWriteString(getString(13));
 #endif
 		break;
 
@@ -264,12 +261,12 @@ void serialHandler(char c) {
 		break;
 
 	case 'v': case 'V':
-		serialWriteString(VERSION);
+		serialWriteString(getString(0));
 		break;
 
 #ifdef DEBUG
 	case 't': case 'T':
-		serialWriteString("System Time: ");
+		serialWriteString(getString(14));
 		serialWriteString(ltoa(getSystemTime(), buffer, 10));
 		serialWriteString("ms");
 		if (getSystemTime() > 1000) {
@@ -296,27 +293,27 @@ void serialHandler(char c) {
 
 	case 'c': case 'C':
 		serialWriteString(itoa(getAnimationCount(), buffer, 10));
-		serialWriteString(" Frames stored\n");
+		serialWriteString(getString(15));
 		break;
 
 	case 'x': case 'X':
 		// Get byte, store as animation count
-		serialWriteString("Send a byte... ");
+		serialWriteString(getString(16));
 		while (!serialHasChar());
 		c = serialGet();
 		setAnimationCount(c);
 		serialWriteString(itoa(c, buffer, 10));
-		serialWriteString(" written!\n");
+		serialWriteString(getString(17));
 		break;
 
 	case 'y': case 'Y':
 		setAnimationCount(0x2201);
-		serialWriteString("Animation count now 8705!\n");
+		serialWriteString(getString(18));
 		break;
 
 	case 'e': case 'E':
 		c = selfTest();
-		serialWriteString("Self-Test: 0b");
+		serialWriteString(getString(19));
 		serialWriteString(itoa(c, buffer, 2));
 		serialWrite('\n');
 		printErrors(c);
@@ -327,17 +324,40 @@ void serialHandler(char c) {
 		break;
 
 	case '0':
-		fillBuffer(0x00);
+		fillBuffer(0);
 		setAnimationCount(0);
 		refreshAnimationCount = 1;
-		serialWriteString("Killed Animation Counter!\n");
+		serialWriteString(getString(20));
 		break;
 
 	case '1':
 		fillBuffer(0xFF);
 		setAnimationCount(0);
 		refreshAnimationCount = 1;
-		serialWriteString("Killed Animation Counter!\n");
+		serialWriteString(getString(20));
+		break;
+
+	case '2':
+		fillBuffer(0);
+		for (i = 0; i < 64; i++) {
+			defaultImage[i] = 0;
+		}
+		while(1) {
+			for (i = 0; i < 8; i++) {
+				for (y = 0; y < 8; y++) {
+					defaultImage[y + (i * 8)] = 0;
+					for (z = 0; z < 8; z++) {
+						defaultImage[y + (i * 8)] |= (1 << z);
+						setImage(defaultImage);
+						while (isFinished() == 0);
+					}
+					defaultImage[y + (i * 8)] = 0;
+				}
+			}
+			if (serialHasChar()) {
+				break;
+			}
+		}
 		break;
 #endif
 
@@ -353,9 +373,9 @@ void sendAudioData(void) {
 	uint8_t i;
 	uint8_t *audioData = getAudioData();
 	if (audioData == NULL) {
-		serialWriteString("Could not access device!\n");
+		serialWriteString(getString(21));
 	} else {
-		serialWriteString("Audio Data:\n");
+		serialWriteString(getString(22));
 		for (i = 0; i < 7; i++) {
 			serialWrite(i + '0');
 			serialWriteString(": ");

CubeFirmware/makefile

@@ -44,6 +44,7 @@ SRC += mem.c
 SRC += audio.c
 SRC += time.c
 SRC += memLayer.c
+SRC += strings.c
 
 # List Assembler source files here.
 # Make them always end in a capital .S.  Files ending in a lowercase .s

CubeFirmware/snake.c

@@ -1,3 +1,25 @@
+/*
+ * snake.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/>.
+ */
 #define UP 1
 #define DOWN 2
 #define LEFT 3
@@ -136,7 +158,7 @@ void snake() {
 	}
 	setPixel(3, 3, 3, snake);
 
-	serialWriteString("Controls: W A S D Q E, x to quit\n");
+	serialWriteString(getString(23));
 
 	while(1) {
 		if (serialHasChar()) {

CubeFirmware/strings.c

@@ -0,0 +1,75 @@
+/*
+ * strings.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/>.
+ */
+#include <avr/pgmspace.h>
+
+char buffer[60];
+
+#ifdef DEBUG
+char stringVersion[] PROGMEM = "v2 (Debug Build)\nNOT COMPATIBLE WITH CubeControl!\n"; // 0
+#else
+char stringVersion[] PROGMEM = "v2 Release\n" // 0
+#endif
+
+char stringInit[] PROGMEM = "\n\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
+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 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 stringTime[] PROGMEM = "System Time: "; // 14
+char stringFrames[] PROGMEM = " Frames stored\n"; // 15
+char stringByte[] PROGMEM = "Send a byte... "; // 16
+char stringWritten[] PROGMEM = " written!\n"; // 17
+char stringCount[] PROGMEM = "Animation count now 8705!\n"; // 18
+char stringSelfTest[] PROGMEM = "Self-Test: 0b"; // 19
+char stringKillCount[] PROGMEM = "Killed Animation Counter!\n"; // 20
+char stringAccessError[] PROGMEM = "Could not access device!\n"; // 21
+char stringAudioData[] PROGMEM = "Audio Data:\n"; // 22
+char stringSnakeControl[] PROGMEM = "Controls: W A S D Q E, x to quit\n"; // 23
+
+#define STRINGNUM 24
+
+PGM_P stringTable[STRINGNUM] PROGMEM = { stringVersion, stringSelfTestError, stringInit,
+								stringAudioError, stringMemError, stringMemWriteError,
+								stringHelp1, stringHelp2, stringHelp3, stringHelp4, stringHelp5,
+								stringHelp6, stringHelp7, stringHelp8, stringTime, stringFrames,
+								stringByte, stringWritten, stringCount, stringSelfTest,
+								stringKillCount, stringAccessError, stringAudioData, stringSnakeControl };
+
+char stringNotFoundError[] PROGMEM = "String not found!\n";
+
+char *getString(uint8_t id) {
+	if (id < STRINGNUM) {
+		strcpy_P(buffer, (PGM_P)pgm_read_word(&(stringTable[id])));
+	} else {
+		strcpy_P(buffer, (PGM_P)pgm_read_word(&stringNotFoundError));
+	}
+	return buffer;
+}

CubeFirmware/strings.h

@@ -0,0 +1,24 @@
+/*
+ * strings.h
+ *
+ * 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/>.
+ */
+
+char *getString(uint8_t id);

CubeFirmware/time.h

@@ -1,5 +1,5 @@
 /*
- * time.c
+ * time.h
  *
  * Copyright 2011 Thomas Buck <xythobuz@me.com>
  * Copyright 2011 Max Nuding <max.nuding@gmail.com>