ソースを参照

Prettier names for animationa

Max Nuding 12年前
コミット
be142a6329
1個のファイルの変更23行の追加23行の削除
  1. 23
    23
      CubeFirmware/animations.c

+ 23
- 23
CubeFirmware/animations.c ファイルの表示

@@ -39,23 +39,23 @@ D)	Implement your animation!
39 39
 */
40 40
 
41 41
 // Prototypes for all animations
42
-void simpleAnimationA(void);
43
-void simpleAnimationB(void);
44
-void simpleAnimationC(void);
45
-void simpleAnimationD(void);
46
-void simpleAnimationE(void);
47
-void simpleAnimationF(void);
48
-void simpleAnimationG(void);
49
-void simpleAnimationH(void);
50
-void simpleAnimationI(void);
51
-void simpleAnimationJ(void);
42
+void upWave(void);
43
+void downWave(void);
44
+void xWave1(void);
45
+void xWave2(void);
46
+void zWave1(void);
47
+void zWave2(void);
48
+void tinyCube(void);
49
+void smallCube(void);
50
+void bigCube(void);
51
+void fullCube(void);
52 52
 
53 53
 
54 54
 // Array of animation functions
55 55
 #define NUMOFANIMATIONS 10
56
-void (*animations[NUMOFANIMATIONS])(void) = { &simpleAnimationA, &simpleAnimationB,
57
-								&simpleAnimationC, &simpleAnimationD, &simpleAnimationE,
58
-								&simpleAnimationF, &simpleAnimationG, &simpleAnimationH, &simpleAnimationI, &simpleAnimationJ };
56
+void (*animations[NUMOFANIMATIONS])(void) = { &upWave, &downWave,
57
+								&xWave1, &xWave2, &zWave1,
58
+								&zWave2, &tinyCube, &smallCube, &bigCube, &fullCube };
59 59
 
60 60
 #define WAVELENGTH 2
61 61
 
@@ -69,7 +69,7 @@ void executeAnimation(uint8_t id) {
69 69
 	}
70 70
 }
71 71
 
72
-void simpleAnimationA(void) {
72
+void upWave(void) {
73 73
 	uint8_t *buff;
74 74
 	int8_t x, y, z;
75 75
 
@@ -90,7 +90,7 @@ void simpleAnimationA(void) {
90 90
 	free(buff);
91 91
 }
92 92
 
93
-void simpleAnimationB(void) {
93
+void downWave(void) {
94 94
 	uint8_t *buff;
95 95
 	int8_t x, y, z;
96 96
 
@@ -111,7 +111,7 @@ void simpleAnimationB(void) {
111 111
 	free(buff);
112 112
 }
113 113
 
114
-void simpleAnimationC(void) {
114
+void xWave1(void) {
115 115
 	uint8_t *buff;
116 116
 	int8_t x, y, z;
117 117
 
@@ -132,7 +132,7 @@ void simpleAnimationC(void) {
132 132
 	free(buff);
133 133
 }
134 134
 
135
-void simpleAnimationD(void) {
135
+void xWave2(void) {
136 136
 	uint8_t *buff;
137 137
 	int8_t x, y, z;
138 138
 
@@ -152,7 +152,7 @@ void simpleAnimationD(void) {
152 152
 	free(buff);
153 153
 }
154 154
 
155
-void simpleAnimationE(void) {
155
+void zWave1(void) {
156 156
 	uint8_t *buff;
157 157
 	int8_t x, y, z;
158 158
 
@@ -173,7 +173,7 @@ void simpleAnimationE(void) {
173 173
 	free(buff);
174 174
 }
175 175
 
176
-void simpleAnimationF(void) {
176
+void zWave2(void) {
177 177
 	uint8_t *buff;
178 178
 	int8_t x, y, z;
179 179
 
@@ -193,7 +193,7 @@ void simpleAnimationF(void) {
193 193
 	free(buff);
194 194
 }
195 195
 
196
-void simpleAnimationG(void) {
196
+void tinyCube(void) {
197 197
 	uint8_t *buff;
198 198
 	int8_t x, y, z;
199 199
 
@@ -213,7 +213,7 @@ void simpleAnimationG(void) {
213 213
 	free(buff);
214 214
 }
215 215
 
216
-void simpleAnimationH (void){
216
+void smallCube (void){
217 217
 	uint8_t *buff;
218 218
 	int8_t x, y, z;
219 219
 
@@ -245,7 +245,7 @@ void simpleAnimationH (void){
245 245
 	buffClearAllPixels(buff);
246 246
 	free(buff);
247 247
 }
248
-void simpleAnimationI (void) {
248
+void bigCube (void) {
249 249
 	uint8_t *buff;
250 250
 	int8_t x, y, z;
251 251
 
@@ -278,7 +278,7 @@ void simpleAnimationI (void) {
278 278
 
279 279
 	free(buff);
280 280
 }
281
-void simpleAnimationJ (void) {
281
+void fullCube (void) {
282 282
 	uint8_t *buff;
283 283
 	int8_t x, y, z;
284 284
 

読み込み中…
キャンセル
保存