Browse Source

Fixed Winavr compiler error.

Thomas Buck 12 years ago
parent
commit
7b63d567bf
2 changed files with 43 additions and 44 deletions
  1. 0
    1
      CubeFirmware/main.c
  2. 43
    43
      CubeFirmware/strings.c

+ 0
- 1
CubeFirmware/main.c View File

@@ -201,7 +201,6 @@ int main(void) {
201 201
 					} else {
202 202
 						// Show idle frames
203 203
 						if (isFinished() >= IDLELENGTH) {
204
-							// Should happen every half second
205 204
 							setImage(idleAnimation[idleCounter]);
206 205
 							if (idleCounter < (IDLEANIMATIONCOUNT - 1)) {
207 206
 								idleCounter++;

+ 43
- 43
CubeFirmware/strings.c View File

@@ -25,52 +25,52 @@
25 25
 char buffer[60];
26 26
 
27 27
 #ifdef DEBUG
28
-char stringVersion[] PROGMEM = "v2.3 Debug Build\nPROBABLY NOT COMPATIBLE WITH CubeControl Software!\n"; // 0
28
+const char stringVersion[] PROGMEM = "v2.3 Debug Build\nPROBABLY NOT COMPATIBLE WITH CubeControl Software!\n"; // 0
29 29
 #else
30
-char stringVersion[] PROGMEM = "v2.3 Release\n"; // 0
30
+const char stringVersion[] PROGMEM = "v2.3 Release\n"; // 0
31 31
 #endif
32 32
 
33
-char stringInit[] PROGMEM = "Initialized: "; // 1
34
-char stringSelfTestError[] PROGMEM = "Self-Test Error: 0b"; // 2
35
-char stringAudioError[] PROGMEM = " => No answer from Audio!\n"; // 3
36
-char stringMemError[] PROGMEM = " => No answer from Memory!\n"; // 4
37
-char stringMemWriteError[] PROGMEM = " => Can't write to Memory!\n"; // 5
38
-char stringHelp1[] PROGMEM = "(d)elete, (g)et anims, (s)et anims, (v)ersion\n"; // 6
39
-char stringHelp2[] PROGMEM = "(t)ime, (a)udio, (c)ount, (x)Custom count\n"; // 7
40
-char stringHelp3[] PROGMEM = "(y)Set fixed animation count\n"; // 8
41
-char stringHelp4[] PROGMEM = "S(e)lf Test, (m)ode\n"; // 9
42
-char stringHelp5[] PROGMEM = "Play S(n)ake\n"; // 10
43
-char stringHelp6[] PROGMEM = "All LEDs Off/On (0/1)\n"; // 11
44
-char stringHelp7[] PROGMEM = "(2): Test Anim. 1\n"; // 12
45
-char stringHelp8[] PROGMEM = "(3): All Surface LEDs on\n"; // 13
46
-char stringTime[] PROGMEM = "System Time: "; // 14
47
-char stringFrames[] PROGMEM = " Frames stored\n"; // 15
48
-char stringByte[] PROGMEM = "Send a byte... "; // 16
49
-char stringWritten[] PROGMEM = " written!\n"; // 17
50
-char stringCount[] PROGMEM = "Animation count now 8705!\n"; // 18
51
-char stringSelfTest[] PROGMEM = "Self-Test: 0b"; // 19
52
-char stringKillCount[] PROGMEM = "Killed Animation Counter!\n"; // 20
53
-char stringAccessError[] PROGMEM = "Could not access device!\n"; // 21
54
-char stringAudioData[] PROGMEM = "Audio Data:\n"; // 22
55
-char stringSnakeControl[] PROGMEM = "Controls: W A S D Q E, x to quit\n"; // 23
56
-char stringNoMoreHeap[] PROGMEM = "Ran out of Heap!\n"; // 24
57
-char stringKilledAnimation[] PROGMEM = "Animation aborted!\n"; // 25
58
-char stringHelp9[] PROGMEM = "(i)nterrupt count, (r)andom, (q)reset\n"; // 26
59
-char stringInterrupts[] PROGMEM = " Interrupts after 1000msec\n"; // 27
60
-char stringFrames2[] PROGMEM = " Frames per Second\n"; // 28
61
-char stringDeleted[] PROGMEM = "Memory deleted!\n"; // 29
62
-char stringReset[] PROGMEM = "Reset in 500ms. Bye!\n"; // 30
63
-char stringWatchdog[] PROGMEM = "Watchdog Reset detected.\n"; // 31
64
-char stringBrownout[] PROGMEM = "Brown-Out Reset detected.\n"; // 32
65
-char stringNothing[] PROGMEM = "No Reset reason detected.\n"; // 33
66
-char stringExtern[] PROGMEM = "External Reset detected.\n"; // 34
67
-char stringJtag[] PROGMEM = "JTAG Reset detected.\n"; // 35
68
-char stringPowerOn[] PROGMEM = "Power-On Reset detected.\n"; // 36
69
-char stringMinute[] PROGMEM = "Yay! Another minute passed :)\n"; // 37
70
-char stringAudioMode[] PROGMEM = "Audio Mode!\n"; // 38
71
-char stringCubeMode[] PROGMEM = "Cube Mode!\n"; // 39
72
-char stringModeChange[] PROGMEM = "Cube mode entered!\n"; // 40
73
-char stringModeChange2[] PROGMEM = "Audio mode entered!\n"; // 41
33
+const char stringInit[] PROGMEM = "Initialized: "; // 1
34
+const char stringSelfTestError[] PROGMEM = "Self-Test Error: 0b"; // 2
35
+const char stringAudioError[] PROGMEM = " => No answer from Audio!\n"; // 3
36
+const char stringMemError[] PROGMEM = " => No answer from Memory!\n"; // 4
37
+const char stringMemWriteError[] PROGMEM = " => Can't write to Memory!\n"; // 5
38
+const char stringHelp1[] PROGMEM = "(d)elete, (g)et anims, (s)et anims, (v)ersion\n"; // 6
39
+const char stringHelp2[] PROGMEM = "(t)ime, (a)udio, (c)ount, (x)Custom count\n"; // 7
40
+const char stringHelp3[] PROGMEM = "(y)Set fixed animation count\n"; // 8
41
+const char stringHelp4[] PROGMEM = "S(e)lf Test, (m)ode\n"; // 9
42
+const char stringHelp5[] PROGMEM = "Play S(n)ake\n"; // 10
43
+const char stringHelp6[] PROGMEM = "All LEDs Off/On (0/1)\n"; // 11
44
+const char stringHelp7[] PROGMEM = "(2): Test Anim. 1\n"; // 12
45
+const char stringHelp8[] PROGMEM = "(3): All Surface LEDs on\n"; // 13
46
+const char stringTime[] PROGMEM = "System Time: "; // 14
47
+const char stringFrames[] PROGMEM = " Frames stored\n"; // 15
48
+const char stringByte[] PROGMEM = "Send a byte... "; // 16
49
+const char stringWritten[] PROGMEM = " written!\n"; // 17
50
+const char stringCount[] PROGMEM = "Animation count now 8705!\n"; // 18
51
+const char stringSelfTest[] PROGMEM = "Self-Test: 0b"; // 19
52
+const char stringKillCount[] PROGMEM = "Killed Animation Counter!\n"; // 20
53
+const char stringAccessError[] PROGMEM = "Could not access device!\n"; // 21
54
+const char stringAudioData[] PROGMEM = "Audio Data:\n"; // 22
55
+const char stringSnakeControl[] PROGMEM = "Controls: W A S D Q E, x to quit\n"; // 23
56
+const char stringNoMoreHeap[] PROGMEM = "Ran out of Heap!\n"; // 24
57
+const char stringKilledAnimation[] PROGMEM = "Animation aborted!\n"; // 25
58
+const char stringHelp9[] PROGMEM = "(i)nterrupt count, (r)andom, (q)reset\n"; // 26
59
+const char stringInterrupts[] PROGMEM = " Interrupts after 1000msec\n"; // 27
60
+const char stringFrames2[] PROGMEM = " Frames per Second\n"; // 28
61
+const char stringDeleted[] PROGMEM = "Memory deleted!\n"; // 29
62
+const char stringReset[] PROGMEM = "Reset in 500ms. Bye!\n"; // 30
63
+const char stringWatchdog[] PROGMEM = "Watchdog Reset detected.\n"; // 31
64
+const char stringBrownout[] PROGMEM = "Brown-Out Reset detected.\n"; // 32
65
+const char stringNothing[] PROGMEM = "No Reset reason detected.\n"; // 33
66
+const char stringExtern[] PROGMEM = "External Reset detected.\n"; // 34
67
+const char stringJtag[] PROGMEM = "JTAG Reset detected.\n"; // 35
68
+const char stringPowerOn[] PROGMEM = "Power-On Reset detected.\n"; // 36
69
+const char stringMinute[] PROGMEM = "Yay! Another minute passed :)\n"; // 37
70
+const char stringAudioMode[] PROGMEM = "Audio Mode!\n"; // 38
71
+const char stringCubeMode[] PROGMEM = "Cube Mode!\n"; // 39
72
+const char stringModeChange[] PROGMEM = "Cube mode entered!\n"; // 40
73
+const char stringModeChange2[] PROGMEM = "Audio mode entered!\n"; // 41
74 74
 
75 75
 // Last index + 1
76 76
 #define STRINGNUM 42

Loading…
Cancel
Save