Browse Source

Extended new font.

Thomas Buck 12 years ago
parent
commit
b08b649efc
3 changed files with 182 additions and 183 deletions
  1. 99
    95
      CubeFirmware/font.c
  2. 73
    73
      CubeFirmware/main.hex
  3. 10
    15
      CubeFirmware/strings.c

+ 99
- 95
CubeFirmware/font.c View File

@@ -45,101 +45,105 @@ uint8_t *getFont(char c) {
45 45
 // Not really pretty on the cube, but enough for now.
46 46
 // I already replaced everything but lowercase letters
47 47
 uint8_t font[95][8] PROGMEM = {
48
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // 0x20 SPACE
49
-	{0x7e, 0x3c, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18}, // !
50
-	{0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00}, // "
51
-	{0x66, 0xff, 0xff, 0x66, 0x66, 0xff, 0xff, 0x66}, // #
52
-	{0x18, 0xff, 0x19, 0x19, 0xfe, 0x98, 0xff, 0x18}, // $
53
-	{0x87, 0x45, 0x27, 0x10, 0x08, 0xe4, 0xa2, 0xe1}, // %
54
-	{0x1e, 0x33, 0x33, 0xde, 0xee, 0x3b, 0x73, 0xdc}, // &
55
-	{0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00}, // '
56
-	{0x18, 0x0c, 0x06, 0x03, 0x03, 0x06, 0x0c, 0x18}, // (
57
-	{0x18, 0x38, 0x60, 0xc0, 0xc0, 0x60, 0x38, 0x18}, // )
58
-	{0x99, 0x5a, 0x3c, 0xff, 0xff, 0x3c, 0x5a, 0x99}, // *
59
-	{0x18, 0x18, 0x18, 0xff, 0xff, 0x18, 0x18, 0x18}, // +
60
-	{0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x0c}, // ,
61
-	{0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00}, // -
62
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00}, // .
63
-	{0xc0, 0xe0, 0x70, 0x38, 0x1c, 0x0e, 0x07, 0x03}, // /
64
-	{0x7e, 0xff, 0xe3, 0xd3, 0xcb, 0xc7, 0xff, 0x7e}, // 0
65
-	{0x38, 0x3c, 0x36, 0x33, 0x31, 0x30, 0x30, 0x30}, // 1
66
-	{0x7c, 0x7e, 0x62, 0x30, 0x18, 0x0c, 0x7e, 0x7e}, // 2
67
-	{0x7e, 0xff, 0xc0, 0x78, 0x78, 0xc0, 0xff, 0x7e}, // 3
68
-	{0xc3, 0xc3, 0xc3, 0xff, 0xff, 0xc0, 0xc0, 0xc0}, // 4
69
-	{0xff, 0xff, 0x03, 0x3f, 0x7e, 0xc0, 0x7f, 0x3f}, // 5
70
-	{0xfe, 0xff, 0x03, 0x7f, 0xff, 0xc3, 0xff, 0x7e}, // 6
71
-	{0x7e, 0xff, 0xe0, 0x70, 0xfe, 0x1c, 0x0e, 0x07}, // 7
72
-	{0x3c, 0x7e, 0xc3, 0x7e, 0x7e, 0xc3, 0x7e, 0x3c}, // 8
73
-	{0x7e, 0xff, 0xc3, 0xff, 0xbe, 0x80, 0xff, 0x7e}, // 9
74
-	{0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x00}, // :
75
-	{0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x0c}, // ;
76
-	{0xe0, 0x38, 0x0e, 0x03, 0x03, 0x0e, 0x38, 0xe0}, // <
77
-	{0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00}, // =
78
-	{0x07, 0x1c, 0x70, 0xc0, 0xc0, 0x70, 0x1c, 0x07}, // >
79
-	{0x3c, 0x66, 0x60, 0x30, 0x18, 0x00, 0x18, 0x18}, // ?
80
-	{0x7e, 0xff, 0xc3, 0x3b, 0x3b, 0x03, 0xff, 0x7e}, // @
81
-	{0x7e, 0xff, 0xc3, 0xc3, 0xff, 0xff, 0xc3, 0xc3}, // A
82
-	{0x7f, 0x83, 0x83, 0x83, 0x7f, 0x83, 0x83, 0x7f}, // B
83
-	{0x7e, 0xff, 0x03, 0x03, 0x03, 0x03, 0xff, 0x7e}, // C
84
-	{0x1e, 0x3f, 0x63, 0xc3, 0xc3, 0x63, 0x3f, 0x1e}, // D
85
-	{0xfe, 0xff, 0x03, 0x3f, 0x3f, 0x03, 0xff, 0xfe}, // E
86
-	{0xfe, 0xff, 0x03, 0x3f, 0x3f, 0x03, 0x03, 0x03}, // F
87
-	{0xfe, 0xff, 0x03, 0x63, 0xf3, 0xc3, 0xff, 0x7e}, // G
88
-	{0xc3, 0xc3, 0xc3, 0xff, 0xff, 0xc3, 0xc3, 0xc3}, // H
89
-	{0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c}, // I
90
-	{0xff, 0xff, 0xc0, 0xc0, 0xc0, 0xc6, 0x66, 0x3c}, // J
91
-	{0xc3, 0x63, 0x33, 0x1f, 0x1f, 0x33, 0x63, 0xc3}, // K
92
-	{0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0xff, 0xff}, // L
93
-	{0x66, 0xff, 0xdb, 0xdb, 0xdb, 0xdb, 0xc3, 0xc3}, // M
94
-	{0xc7, 0xcf, 0xcf, 0xdb, 0xdb, 0xf3, 0xf3, 0xe3}, // N
95
-	{0x7e, 0xff, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0x7e}, // O
96
-	{0x3e, 0x7f, 0xc3, 0xc3, 0x7f, 0x3f, 0x03, 0x03}, // P
97
-	{0x3c, 0x7e, 0xc3, 0xc3, 0xd3, 0xe3, 0x7e, 0xbc}, // Q
98
-	{0x3e, 0x7f, 0xc3, 0x7f, 0x3f, 0x1f, 0x3b, 0x73}, // R
99
-	{0xfe, 0xff, 0x03, 0x7f, 0xfe, 0x80, 0xff, 0x7f}, // S
100
-	{0xff, 0xff, 0x99, 0x18, 0x18, 0x18, 0x18, 0x3c}, // T
101
-	{0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0x7e}, // U
102
-	{0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0x66, 0x3c, 0x18}, // V
103
-	{0xc3, 0xc3, 0xc3, 0xdb, 0xdb, 0xdb, 0xff, 0x7e}, // W
104
-	{0xc3, 0xe7, 0x7e, 0x3c, 0x3c, 0x7e, 0xe7, 0xc3}, // X
105
-	{0x81, 0xc3, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18}, // Y
106
-	{0xfe, 0xff, 0x70, 0x38, 0x1c, 0x0e, 0xff, 0x7f}, // Z
107
-	{0xff, 0xff, 0x03, 0x03, 0x03, 0x03, 0xff, 0xff}, // [
108
-	{0x03, 0x07, 0x0e, 0x1c, 0x38, 0x70, 0xe0, 0xc0}, // \
109
-	{0xff, 0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0xff, 0xff}, // ]
110
-	{0x18, 0x3c, 0x66, 0xc3, 0x00, 0x00, 0x00, 0x00}, // ^
111
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff}, // _
112
-	{0x0e, 0x1c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00}, // `
48
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // 20 SPACE
49
+	{0x7e, 0x3c, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18}, // 21 !
50
+	{0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00}, // 22 "
51
+	{0x66, 0xff, 0xff, 0x66, 0x66, 0xff, 0xff, 0x66}, // 23 #
52
+	{0x18, 0xff, 0x19, 0x19, 0xfe, 0x98, 0xff, 0x18}, // 24 $
53
+	{0x87, 0x45, 0x27, 0x10, 0x08, 0xe4, 0xa2, 0xe1}, // 25 %
54
+	{0x1e, 0x33, 0x33, 0xde, 0xee, 0x3b, 0x73, 0xdc}, // 26 &
55
+	{0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00}, // 27 '
56
+	{0x18, 0x0c, 0x06, 0x03, 0x03, 0x06, 0x0c, 0x18}, // 28 (
57
+	{0x18, 0x38, 0x60, 0xc0, 0xc0, 0x60, 0x38, 0x18}, // 29 )
58
+	{0x99, 0x5a, 0x3c, 0xff, 0xff, 0x3c, 0x5a, 0x99}, // 2A *
59
+	{0x18, 0x18, 0x18, 0xff, 0xff, 0x18, 0x18, 0x18}, // 2B +
60
+	{0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x0c}, // 2C ,
61
+	{0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00}, // 2D -
62
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00}, // 2E .
63
+	{0xc0, 0xe0, 0x70, 0x38, 0x1c, 0x0e, 0x07, 0x03}, // 2F /
113 64
 
114
-	{0x00,0x00,0x1E,0x30,0x3E,0x33,0x6E,0x00},	// 0x61 a
115
-	{0x07,0x06,0x3E,0x66,0x66,0x66,0x3D,0x00},	// 0x62 b
116
-	{0x00,0x00,0x1E,0x33,0x03,0x33,0x1E,0x00},	// 0x63 c
117
-	{0x38,0x30,0x30,0x3E,0x33,0x33,0x6E,0x00},	// 0x64 d
118
-	{0x00,0x00,0x1E,0x33,0x3F,0x03,0x1E,0x00},	// 0x65 e
119
-	{0x1C,0x36,0x06,0x0F,0x06,0x06,0x0F,0x00},	// 0x66 f
120
-	{0x00,0x00,0x6E,0x33,0x33,0x3E,0x30,0x1F},	// 0x67 g
121
-	{0x07,0x06,0x36,0x6E,0x66,0x66,0x67,0x00},	// 0x68 h
122
-	{0x0C,0x00,0x0E,0x0C,0x0C,0x0C,0x1E,0x00},	// 0x69 i
123
-	{0x18,0x00,0x1E,0x18,0x18,0x18,0x1B,0x0E},	// 0x6A j
124
-	{0x07,0x06,0x66,0x36,0x1E,0x36,0x67,0x00},	// 0x6B k
125
-	{0x0E,0x0C,0x0C,0x0C,0x0C,0x0C,0x1E,0x00},	// 0x6C l
126
-	{0x00,0x00,0x37,0x7F,0x6B,0x63,0x63,0x00},	// 0x6D m
127
-	{0x00,0x00,0x1F,0x33,0x33,0x33,0x33,0x00},	// 0x6E n
128
-	{0x00,0x00,0x1E,0x33,0x33,0x33,0x1E,0x00},	// 0x6F o
129
-	{0x00,0x00,0x3B,0x66,0x66,0x3E,0x06,0x0F},	// 0x70 p
130
-	{0x00,0x00,0x6E,0x33,0x33,0x3E,0x30,0x78},	// 0x71 q
131
-	{0x00,0x00,0x1B,0x36,0x36,0x06,0x0F,0x00},	// 0x72 r
132
-	{0x00,0x00,0x3E,0x03,0x1E,0x30,0x1F,0x00},	// 0x73 s
133
-	{0x08,0x0C,0x3E,0x0C,0x0C,0x2C,0x18,0x00},	// 0x74 t
134
-	{0x00,0x00,0x33,0x33,0x33,0x33,0x6E,0x00},	// 0x75 u
135
-	{0x00,0x00,0x33,0x33,0x33,0x1E,0x0C,0x00},	// 0x76 v
136
-	{0x00,0x00,0x63,0x63,0x6B,0x7F,0x36,0x00},	// 0x77 w
137
-	{0x00,0x00,0x63,0x36,0x1C,0x36,0x63,0x00},	// 0x78 x
138
-	{0x00,0x00,0x33,0x33,0x33,0x3E,0x30,0x1F},	// 0x79 y
139
-	{0x00,0x00,0x3F,0x19,0x0C,0x26,0x3F,0x00},	// 0x7A z
65
+	{0x7e, 0xff, 0xe3, 0xd3, 0xcb, 0xc7, 0xff, 0x7e}, // 30 0
66
+	{0x38, 0x3c, 0x36, 0x33, 0x31, 0x30, 0x30, 0x30}, // 31 1
67
+	{0x7c, 0x7e, 0x62, 0x30, 0x18, 0x0c, 0x7e, 0x7e}, // 32 2
68
+	{0x7e, 0xff, 0xc0, 0x78, 0x78, 0xc0, 0xff, 0x7e}, // 33 3
69
+	{0xc3, 0xc3, 0xc3, 0xff, 0xff, 0xc0, 0xc0, 0xc0}, // 34 4
70
+	{0xff, 0xff, 0x03, 0x3f, 0x7e, 0xc0, 0x7f, 0x3f}, // 35 5
71
+	{0xfe, 0xff, 0x03, 0x7f, 0xff, 0xc3, 0xff, 0x7e}, // 36 6
72
+	{0x7e, 0xff, 0xe0, 0x70, 0xfe, 0x1c, 0x0e, 0x07}, // 37 7
73
+	{0x3c, 0x7e, 0xc3, 0x7e, 0x7e, 0xc3, 0x7e, 0x3c}, // 38 8
74
+	{0x7e, 0xff, 0xc3, 0xff, 0xbe, 0x80, 0xff, 0x7e}, // 39 9
140 75
 
141
-	{0xf8, 0xfc, 0x0c, 0x07, 0x07, 0x0c, 0xfc, 0xf8}, // {
142
-	{0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18}, // |
143
-	{0x1f, 0x3f, 0x30, 0xe0, 0xe0, 0x30, 0x3f, 0x1f}, // }
144
-	{0x00, 0x04, 0x0e, 0x0b, 0x99, 0xd0, 0x70, 0x20}, // ~
76
+	{0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x00}, // 3A :
77
+	{0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x0c}, // 3B ;
78
+	{0xe0, 0x38, 0x0e, 0x03, 0x03, 0x0e, 0x38, 0xe0}, // 3C <
79
+	{0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00}, // 3D =
80
+	{0x07, 0x1c, 0x70, 0xc0, 0xc0, 0x70, 0x1c, 0x07}, // 3E >
81
+	{0x3c, 0x66, 0x60, 0x30, 0x18, 0x00, 0x18, 0x18}, // 3F ?
82
+	{0x7e, 0xff, 0xc3, 0x3b, 0x3b, 0x03, 0xff, 0x7e}, // 40 @
83
+
84
+	{0x7e, 0xff, 0xc3, 0xc3, 0xff, 0xff, 0xc3, 0xc3}, // 41 A
85
+	{0x7f, 0x83, 0x83, 0x83, 0x7f, 0x83, 0x83, 0x7f}, // 42 B
86
+	{0x7e, 0xff, 0x03, 0x03, 0x03, 0x03, 0xff, 0x7e}, // 43 C
87
+	{0x1e, 0x3f, 0x63, 0xc3, 0xc3, 0x63, 0x3f, 0x1e}, // 44 D
88
+	{0xfe, 0xff, 0x03, 0x3f, 0x3f, 0x03, 0xff, 0xfe}, // 45 E
89
+	{0xfe, 0xff, 0x03, 0x3f, 0x3f, 0x03, 0x03, 0x03}, // 46 F
90
+	{0xfe, 0xff, 0x03, 0x63, 0xf3, 0xc3, 0xff, 0x7e}, // 47 G
91
+	{0xc3, 0xc3, 0xc3, 0xff, 0xff, 0xc3, 0xc3, 0xc3}, // 48 H
92
+	{0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c}, // 49 I
93
+	{0xff, 0xff, 0xc0, 0xc0, 0xc0, 0xc6, 0x66, 0x3c}, // 4A J
94
+	{0xc3, 0x63, 0x33, 0x1f, 0x1f, 0x33, 0x63, 0xc3}, // 4B K
95
+	{0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0xff, 0xff}, // 4C L
96
+	{0x66, 0xff, 0xdb, 0xdb, 0xdb, 0xdb, 0xc3, 0xc3}, // 4D M
97
+	{0xc7, 0xcf, 0xcf, 0xdb, 0xdb, 0xf3, 0xf3, 0xe3}, // 4E N
98
+	{0x7e, 0xff, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0x7e}, // 4F O
99
+	{0x3e, 0x7f, 0xc3, 0xc3, 0x7f, 0x3f, 0x03, 0x03}, // 50 P
100
+	{0x3c, 0x7e, 0xc3, 0xc3, 0xd3, 0xe3, 0x7e, 0xbc}, // 51 Q
101
+	{0x3e, 0x7f, 0xc3, 0x7f, 0x3f, 0x1f, 0x3b, 0x73}, // 52 R
102
+	{0xfe, 0xff, 0x03, 0x7f, 0xfe, 0x80, 0xff, 0x7f}, // 53 S
103
+	{0xff, 0xff, 0x99, 0x18, 0x18, 0x18, 0x18, 0x3c}, // 54 T
104
+	{0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0x7e}, // 55 U
105
+	{0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0x66, 0x3c, 0x18}, // 56 V
106
+	{0xc3, 0xc3, 0xc3, 0xdb, 0xdb, 0xdb, 0xff, 0x7e}, // 57 W
107
+	{0xc3, 0xe7, 0x7e, 0x3c, 0x3c, 0x7e, 0xe7, 0xc3}, // 58 X
108
+	{0x81, 0xc3, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18}, // 59 Y
109
+	{0xfe, 0xff, 0x70, 0x38, 0x1c, 0x0e, 0xff, 0x7f}, // 5A Z
110
+
111
+	{0xff, 0xff, 0x03, 0x03, 0x03, 0x03, 0xff, 0xff}, // 5B [
112
+	{0x03, 0x07, 0x0e, 0x1c, 0x38, 0x70, 0xe0, 0xc0}, // 5C Backslash
113
+	{0xff, 0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0xff, 0xff}, // 5D ]
114
+	{0x18, 0x3c, 0x66, 0xc3, 0x00, 0x00, 0x00, 0x00}, // 5E ^
115
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff}, // 5F _
116
+	{0x0e, 0x1c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00}, // 60 `
117
+
118
+	{0x00,0x00,0x1E,0x30,0x3E,0x33,0x6E,0x00},	// 61 a
119
+	{0x07,0x06,0x3E,0x66,0x66,0x66,0x3D,0x00},	// 62 b
120
+	{0x00,0x00,0x1E,0x33,0x03,0x33,0x1E,0x00},	// 63 c
121
+	{0x38,0x30,0x30,0x3E,0x33,0x33,0x6E,0x00},	// 64 d
122
+	{0x00,0x00,0x1E,0x33,0x3F,0x03,0x1E,0x00},	// 65 e
123
+	{0x1C,0x36,0x06,0x0F,0x06,0x06,0x0F,0x00},	// 66 f
124
+	{0x00,0x00,0x6E,0x33,0x33,0x3E,0x30,0x1F},	// 67 g
125
+	{0x07,0x06,0x36,0x6E,0x66,0x66,0x67,0x00},	// 68 h
126
+	{0x0C,0x00,0x0E,0x0C,0x0C,0x0C,0x1E,0x00},	// 69 i
127
+	{0x18,0x00,0x1E,0x18,0x18,0x18,0x1B,0x0E},	// 6A j
128
+	{0x07,0x06,0x66,0x36,0x1E,0x36,0x67,0x00},	// 6B k
129
+	{0x0E,0x0C,0x0C,0x0C,0x0C,0x0C,0x1E,0x00},	// 6C l
130
+	{0x00,0x00,0x37,0x7F,0x6B,0x63,0x63,0x00},	// 6D m
131
+	{0x00,0x00,0x1F,0x33,0x33,0x33,0x33,0x00},	// 6E n
132
+	{0x00,0x00,0x1E,0x33,0x33,0x33,0x1E,0x00},	// 6F o
133
+	{0x00,0x00,0x3B,0x66,0x66,0x3E,0x06,0x0F},	// 70 p
134
+	{0x00,0x00,0x6E,0x33,0x33,0x3E,0x30,0x78},	// 71 q
135
+	{0x00,0x00,0x1B,0x36,0x36,0x06,0x0F,0x00},	// 72 r
136
+	{0x00,0x00,0x3E,0x03,0x1E,0x30,0x1F,0x00},	// 73 s
137
+	{0x08,0x0C,0x3E,0x0C,0x0C,0x2C,0x18,0x00},	// 74 t
138
+	{0x00,0x00,0x33,0x33,0x33,0x33,0x6E,0x00},	// 75 u
139
+	{0x00,0x00,0x33,0x33,0x33,0x1E,0x0C,0x00},	// 76 v
140
+	{0x00,0x00,0x63,0x63,0x6B,0x7F,0x36,0x00},	// 77 w
141
+	{0x00,0x00,0x63,0x36,0x1C,0x36,0x63,0x00},	// 78 x
142
+	{0x00,0x00,0x33,0x33,0x33,0x3E,0x30,0x1F},	// 79 y
143
+	{0x00,0x00,0x3F,0x19,0x0C,0x26,0x3F,0x00},	// 7A z
144
+
145
+	{0xf8, 0xfc, 0x0c, 0x07, 0x07, 0x0c, 0xfc, 0xf8}, // 7B {
146
+	{0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18}, // 7C |
147
+	{0x1f, 0x3f, 0x30, 0xe0, 0xe0, 0x30, 0x3f, 0x1f}, // 7D }
148
+	{0x00, 0x04, 0x0e, 0x0b, 0x99, 0xd0, 0x70, 0x20}, // 7E ~
145 149
 };

+ 73
- 73
CubeFirmware/main.hex View File

@@ -28,67 +28,67 @@
28 28
 :1001B0002363A3E33373B3F3074787C7175797D76F
29 29
 :1001C0002767A7E73777B7F70B4B8BCB1B5B9BDB1F
30 30
 :1001D0002B6BABEB3B7BBBFB0F4F8FCF1F5F9FDFCF
31
-:1001E0002F6FAFEF3F7FBFFF76322E350A0053658A
32
-:1001F0006C662D54657374204572726F723A2030AC
33
-:100200006200496E697469616C697A6564210A00EB
34
-:10021000203D3E204E6F20616E73776572206672BE
35
-:100220006F6D20417564696F210A00203D3E204EAC
36
-:100230006F20616E737765722066726F6D204D65F9
37
-:100240006D6F7279210A00203D3E2043616E277454
38
-:1002500020777269746520746F204D656D6F7279B7
39
-:10026000210A00286429656C6574652C202867299B
40
-:10027000657420616E696D732C2028732965742064
41
-:10028000616E696D732C20287629657273696F6EB3
42
-:100290000A00287429696D652C2028612975646914
43
-:1002A0006F2C202863296F756E742C2028782943C1
44
-:1002B0007573746F6D20636F756E740A00287929E9
45
-:1002C0005365742061206672616D652C2073696DC1
46
-:1002D0002870296C6520616E696D0A007428652993
47
-:1002E00073742C20286D296F64652C20642875296F
48
-:1002F0006D700A00506C61792053286E29616B651E
49
-:100300000A00416C6C204C454473204F66662F4FA9
50
-:100310006E2028302F31290A002832293A205465CE
51
-:10032000737420416E696D2E20310A002833293AFA
52
-:1003300020466F6E7420546573740A005379737489
53
-:10034000656D2054696D653A2000204672616D65C7
54
-:10035000732073746F7265640A004E657720616E56
55
-:10036000696D6174696F6E20636F756E743A2000F9
56
-:10037000647572617469286F296E0A004672616D36
57
-:100380006520746F206368616E67653A200053656D
58
-:100390006C662D546573743A203062004B696C6C46
59
-:1003A000656420416E696D6174696F6E20436F757D
60
-:1003B0006E746572210A00436F756C64206E6F74F1
61
-:1003C0002061636365737320646576696365210AE0
62
-:1003D00000417564696F20446174613A0A00436F9B
63
-:1003E0006E74726F6C733A20572041205320442062
64
-:1003F0005120452C207820746F20717569740A0093
65
-:1004000052616E206F7574206F662048656170219F
66
-:100410000A00416E696D6174696F6E2061626F726E
67
-:10042000746564210A002869296E7465727275709A
68
-:100430007420636F756E742C20287229616E646F4E
69
-:100440006D2C2028712972657365740A0020496E2D
70
-:100450007465727275707473206166746572203190
71
-:100460003030306D7365630A00204672616D6573CC
72
-:1004700020706572205365636F6E640A004D656D70
73
-:100480006F72792064656C65746564210A00526539
74
-:1004900073657420696E203530306D732E2042797B
75
-:1004A00065210A00456E746572206672616D652073
76
-:1004B000746F2064756D703A2000466F726D6174C0
77
-:1004C00074696E67206D656D6F72792E2E2E200017
78
-:1004D000446F6E65210A002866296F726D61742071
79
-:1004E0006D656D6F72792C2028772972697465208B
80
-:1004F000746578740A004475726174696F6E3A208D
31
+:1001E0002F6FAFEF3F7FBFFF76332E300A002864BA
32
+:1001F00029656C6574652C20286729657420616EFB
33
+:10020000696D732C20287329657420616E696D7384
34
+:100210002C20287629657273696F6E0A002874296C
35
+:10022000696D652C202861297564696F2C2028630D
36
+:10023000296F756E742C20287829437573746F6D3F
37
+:1002400020636F756E740A002879295365742061E4
38
+:10025000206672616D652C2073696D2870296C654C
39
+:1002600020616E696D0A007428652973742C20283A
40
+:100270006D296F64652C20642875296D700A005003
41
+:100280006C61792053286E29616B650A0028692901
42
+:100290006E7465727275707420636F756E742C2045
43
+:1002A000287229616E646F6D2C2028712972657324
44
+:1002B00065740A002866296F726D6174206D656D22
45
+:1002C0006F72792C2028772972697465207465789B
46
+:1002D000740A00647572617469286F296E0A00419E
47
+:1002E0006C6C204C454473204F66662F4F6E20285F
48
+:1002F000302F31290A002832293A2054657374209E
49
+:10030000416E696D2E20310A002833293A20466F4C
50
+:100310006E7420546573740A0053656C662D5465C1
51
+:100320007374204572726F723A20306200496E69B0
52
+:100330007469616C697A6564210A00203D3E204E33
53
+:100340006F20616E737765722066726F6D204175E4
54
+:1003500064696F210A00203D3E204E6F20616E735C
55
+:100360007765722066726F6D204D656D6F727921B1
56
+:100370000A00203D3E2043616E2774207772697425
57
+:100380006520746F204D656D6F7279210A00537975
58
+:100390007374656D2054696D653A20002046726162
59
+:1003A0006D65732073746F7265640A004E65772003
60
+:1003B000616E696D6174696F6E20636F756E743AFA
61
+:1003C00020004672616D6520746F206368616E67FE
62
+:1003D000653A200053656C662D546573743A20307D
63
+:1003E00062004B696C6C656420416E696D61746973
64
+:1003F0006F6E20436F756E746572210A00436F75CE
65
+:100400006C64206E6F742061636365737320646530
66
+:1004100076696365210A00417564696F20446174DF
67
+:10042000613A0A00436F6E74726F6C733A20572002
68
+:100430004120532044205120452C207820746F20E7
69
+:10044000717569740A0052616E206F7574206F6651
70
+:100450002048656170210A00416E696D6174696FA1
71
+:100460006E2061626F72746564210A0020496E74A7
72
+:1004700065727275707473206166746572203130B4
73
+:1004800030306D7365630A00204672616D657320BC
74
+:10049000706572205365636F6E640A004D656D6F01
75
+:1004A00072792064656C65746564210A0052657315
76
+:1004B000657420696E203530306D732E2042796569
77
+:1004C000210A00456E746572206672616D65207444
78
+:1004D0006F2064756D703A2000466F726D617474A0
79
+:1004E000696E67206D656D6F72792E2E2E20004427
80
+:1004F0006F6E65210A004475726174696F6E3A20EF
81 81
 :100500000053746172743A200038204C617965722E
82 82
 :1005100062797465732E2E2E0A0053746F72696EA1
83 83
 :100520006720696E2038206672616D65732E2E2EED
84 84
 :100530000A00456E64653A200043756265206D6F60
85 85
 :10054000646520656E7465726564210A0041756496
86 86
 :10055000696F206D6F646520656E746572656421D6
87
-:100560000A00546578743A2000E801EE0102021096
88
-:10057000022B02470263029202BD02DC02F4020275
89
-:100580000319032C033C034A035A0370037C038EB4
90
-:10059000039C03B703D103DE030004120426044DB9
91
-:1005A0000469047D048E04A404BA04D004D704F6BC
87
+:100560000A00546578743A2000E80119032D033B12
88
+:100570000356037203EE011D02480267027F02DF89
89
+:1005800002F60209038E039C03AC03D302C203D418
90
+:1005900003E203FD0317042404460458048D026C8F
91
+:1005A0000488049C04AD04C304D904EF04B402F627
92 92
 :1005B00004010509051A05320539054D0562055383
93 93
 :1005C0007472696E67206E6F7420666F756E642139
94 94
 :1005D0000A0000000000000000007E3C181818000F
@@ -121,24 +121,24 @@
121 121
 :10078000FF7EC3C3C3C3C3663C18C3C3C3DBDBDB89
122 122
 :10079000FF7EC3E77E3C3C7EE7C381C3663C1818FE
123 123
 :1007A0001818FEFF70381C0EFF7FFFFF03030303C2
124
-:1007B000FFFF03070E1C3870E0C0183C66C3000042
125
-:1007C0000000000000000000FFFF0E1C38000000C9
126
-:1007D000000000001E303E336E0007063E6666666F
127
-:1007E0003D0000001E3303331E003830303E3333EB
128
-:1007F0006E0000001E333F031E001C36060F060667
129
-:100800000F0000006E33333E301F0706366E6666FB
130
-:1008100067000C000E0C0C0C1E0018001E18181897
131
-:100820001B0E070666361E3667000E0C0C0C0C0CF1
132
-:100830001E000000377F6B63630000001F333333FB
133
-:10084000330000001E3333331E0000003B66663E5B
134
-:10085000060F00006E33333E307800001B3636063C
135
-:100860000F0000003E031E301F00080C3E0C0C2C35
136
-:1008700018000000333333336E0000003333331E6F
137
-:100880000C00000063636B7F3600000063361C368B
138
-:10089000630000003333333E301F00003F190C2645
139
-:1008A0003F00F8FC0C07070CFCF81818181818186B
140
-:1008B00018181F3F30E0E0303F1F00040E0B99D0A6
141
-:1008C0007020000000000000000011241FBECFE5D2
124
+:1007B000FFFF03070E1C3870E0C0FFFFC0C0C0C0C1
125
+:1007C000FFFF183C66C300000000000000000000AE
126
+:1007D000FFFF0E1C38000000000000001E303E33FA
127
+:1007E0006E0007063E6666663D0000001E3303335A
128
+:1007F0001E003830303E33336E0000001E333F039E
129
+:100800001E001C36060F06060F0000006E33333E36
130
+:10081000301F0706366E666667000C000E0C0C0C67
131
+:100820001E0018001E1818181B0E070666361E3606
132
+:1008300067000E0C0C0C0C0C1E000000377F6B6365
133
+:10084000630000001F333333330000001E333333A3
134
+:100850001E0000003B66663E060F00006E33333E0E
135
+:10086000307800001B3636060F0000003E031E30B5
136
+:100870001F00080C3E0C0C2C1800000033333333DF
137
+:100880006E0000003333331E0C00000063636B7F87
138
+:100890003600000063361C36630000003333333EFD
139
+:1008A000301F00003F190C263F00F8FC0C07070C16
140
+:1008B000FCF818181818181818181F3F30E0E03006
141
+:1008C0003F1F00040E0B99D0702011241FBECFE5EE
142 142
 :1008D000D8E0DEBFCDBF11E0A0E6B0E0EAE0F3E58E
143 143
 :1008E00002C005900D92A83DB107D9F712E0A8ED1E
144 144
 :1008F000B1E001C01D92AF3DB107E1F70E940907C9

+ 10
- 15
CubeFirmware/strings.c View File

@@ -21,28 +21,29 @@
21 21
 #include <avr/pgmspace.h>
22 22
 #include "transmit.h"
23 23
 
24
-const char stringVersion[] PROGMEM = "v2.5\n"; // 0
25
-const char stringSelfTestError[] PROGMEM = "Self-Test Error: 0b"; // 1
26
-const char stringInit[] PROGMEM = "Initialized!\n"; // 2
27
-const char stringAudioError[] PROGMEM = " => No answer from Audio!\n"; // 3
28
-const char stringMemError[] PROGMEM = " => No answer from Memory!\n"; // 4
29
-const char stringMemWriteError[] PROGMEM = " => Can't write to Memory!\n"; // 5
24
+const char stringVersion[] PROGMEM = "v3.0\n"; // 0
30 25
 
26
+// Help Text
31 27
 const char stringHelp1[] PROGMEM = "(d)elete, (g)et anims, (s)et anims, (v)ersion\n"; // 6
32 28
 const char stringHelp2[] PROGMEM = "(t)ime, (a)udio, (c)ount, (x)Custom count\n"; // 7
33 29
 const char stringHelp3[] PROGMEM = "(y)Set a frame, sim(p)le anim\n"; // 8
34 30
 const char stringHelp4[] PROGMEM = "t(e)st, (m)ode, d(u)mp\n"; // 9
35 31
 const char stringHelp5[] PROGMEM = "Play S(n)ake\n"; // 10
32
+const char stringHelp9[] PROGMEM = "(i)nterrupt count, (r)andom, (q)reset\n"; // 26
33
+const char stringExtern[] PROGMEM = "(f)ormat memory, (w)rite text\n"; // 34
34
+const char stringWritten[] PROGMEM = "durati(o)n\n"; // 17
36 35
 const char stringHelp6[] PROGMEM = "All LEDs Off/On (0/1)\n"; // 11
37 36
 const char stringHelp7[] PROGMEM = "(2): Test Anim. 1\n"; // 12
38 37
 const char stringHelp8[] PROGMEM = "(3): Font Test\n"; // 13
39 38
 
39
+const char stringSelfTestError[] PROGMEM = "Self-Test Error: 0b"; // 1
40
+const char stringInit[] PROGMEM = "Initialized!\n"; // 2
41
+const char stringAudioError[] PROGMEM = " => No answer from Audio!\n"; // 3
42
+const char stringMemError[] PROGMEM = " => No answer from Memory!\n"; // 4
43
+const char stringMemWriteError[] PROGMEM = " => Can't write to Memory!\n"; // 5
40 44
 const char stringTime[] PROGMEM = "System Time: "; // 14
41 45
 const char stringFrames[] PROGMEM = " Frames stored\n"; // 15
42 46
 const char stringByte[] PROGMEM = "New animation count: "; // 16
43
-
44
-const char stringWritten[] PROGMEM = "durati(o)n\n"; // 17
45
-
46 47
 const char stringCount[] PROGMEM = "Frame to change: "; // 18
47 48
 const char stringSelfTest[] PROGMEM = "Self-Test: 0b"; // 19
48 49
 const char stringKillCount[] PROGMEM = "Killed Animation Counter!\n"; // 20
@@ -51,9 +52,6 @@ const char stringAudioData[] PROGMEM = "Audio Data:\n"; // 22
51 52
 const char stringSnakeControl[] PROGMEM = "Controls: W A S D Q E, x to quit\n"; // 23
52 53
 const char stringNoMoreHeap[] PROGMEM = "Ran out of Heap!\n"; // 24
53 54
 const char stringKilledAnimation[] PROGMEM = "Animation aborted!\n"; // 25
54
-
55
-const char stringHelp9[] PROGMEM = "(i)nterrupt count, (r)andom, (q)reset\n"; // 26
56
-
57 55
 const char stringInterrupts[] PROGMEM = " Interrupts after 1000msec\n"; // 27
58 56
 const char stringFrames2[] PROGMEM = " Frames per Second\n"; // 28
59 57
 const char stringDeleted[] PROGMEM = "Memory deleted!\n"; // 29
@@ -61,9 +59,6 @@ const char stringReset[] PROGMEM = "Reset in 500ms. Bye!\n"; // 30
61 59
 const char stringWatchdog[] PROGMEM = "Enter frame to dump: "; // 31
62 60
 const char stringBrownout[] PROGMEM = "Formatting memory... "; // 32
63 61
 const char stringNothing[] PROGMEM = "Done!\n"; // 33
64
-
65
-const char stringExtern[] PROGMEM = "(f)ormat memory, (w)rite text\n"; // 34
66
-
67 62
 const char stringJtag[] PROGMEM = "Duration: "; // 35
68 63
 const char stringPowerOn[] PROGMEM = "Start: "; // 36
69 64
 const char stringMinute[] PROGMEM = "8 Layerbytes...\n"; // 37

Loading…
Cancel
Save