Skip to content

Commit 1eb80e9

Browse files
redchenjsredchenjs
committed
vfx: switch to basic color
1 parent 505d5d5 commit 1eb80e9

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

‎main/src/user/vfx.c

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ static void vfx_task(void *pvParameter)
132132

133133
xEventGroupClearBits(user_event_group, VFX_FFT_NULL_BIT);
134134

135-
gdispGClear(vfx_gdisp, 0x000000);
135+
gdispGClear(vfx_gdisp, Black);
136136
gtimerJab(&vfx_flush_timer);
137137

138138
gdispGSetBacklight(vfx_gdisp, vfx.backlight);
@@ -201,7 +201,7 @@ static void vfx_task(void *pvParameter)
201201
uint16_t fill_cy = fft_out[i];
202202
#endif
203203

204-
gdispGFillArea(vfx_gdisp, clear_x, clear_y, clear_cx, clear_cy, 0x000000);
204+
gdispGFillArea(vfx_gdisp, clear_x, clear_y, clear_cx, clear_cy, Black);
205205
gdispGFillArea(vfx_gdisp, fill_x, fill_y, fill_cx, fill_cy, pixel_color);
206206

207207
if (++color_h == 512) {
@@ -236,7 +236,7 @@ static void vfx_task(void *pvParameter)
236236

237237
xEventGroupClearBits(user_event_group, VFX_FFT_NULL_BIT);
238238

239-
gdispGClear(vfx_gdisp, 0x000000);
239+
gdispGClear(vfx_gdisp, Black);
240240
gtimerJab(&vfx_flush_timer);
241241

242242
gdispGSetBacklight(vfx_gdisp, vfx.backlight);
@@ -305,7 +305,7 @@ static void vfx_task(void *pvParameter)
305305
uint16_t fill_cy = fft_out[i];
306306
#endif
307307

308-
gdispGFillArea(vfx_gdisp, clear_x, clear_y, clear_cx, clear_cy, 0x000000);
308+
gdispGFillArea(vfx_gdisp, clear_x, clear_y, clear_cx, clear_cy, Black);
309309
gdispGFillArea(vfx_gdisp, fill_x, fill_y, fill_cx, fill_cy, pixel_color);
310310

311311
if ((color_h += 8) == 512) {
@@ -356,7 +356,7 @@ static void vfx_task(void *pvParameter)
356356

357357
xEventGroupClearBits(user_event_group, VFX_FFT_NULL_BIT);
358358

359-
gdispGClear(vfx_gdisp, 0x000000);
359+
gdispGClear(vfx_gdisp, Black);
360360
gtimerJab(&vfx_flush_timer);
361361

362362
gdispGSetBacklight(vfx_gdisp, vfx.backlight);
@@ -423,7 +423,7 @@ static void vfx_task(void *pvParameter)
423423
vu_peak_delay[i] = vu_peak_delay_init - 1 + vu_peak_delay[i] % vu_drop_delay_init;
424424
}
425425
if (vu_peak_value[i] != vu_val_out) {
426-
gdispGFillArea(vfx_gdisp, i*vu_width+1, (vu_val_max-vu_peak_value[i])*vu_height+1, vu_width-2, vu_height-2, 0x000000);
426+
gdispGFillArea(vfx_gdisp, i*vu_width+1, (vu_val_max-vu_peak_value[i])*vu_height+1, vu_width-2, vu_height-2, Black);
427427
}
428428

429429
uint32_t peak_color = vfx_get_color(432, color_l);
@@ -438,7 +438,7 @@ static void vfx_task(void *pvParameter)
438438
}
439439

440440
if (j > vu_val_out || ((j == 0) && (vu_val_out == 0))) { // Upside
441-
gdispGFillArea(vfx_gdisp, i*vu_width+1, (vu_val_max-j)*vu_height+1, vu_width-2, vu_height-2, 0x000000);
441+
gdispGFillArea(vfx_gdisp, i*vu_width+1, (vu_val_max-j)*vu_height+1, vu_width-2, vu_height-2, Black);
442442
} else { // Underside
443443
gdispGFillArea(vfx_gdisp, i*vu_width+1, (vu_val_max-j)*vu_height+1, vu_width-2, vu_height-2, pixel_color);
444444
}
@@ -470,7 +470,7 @@ static void vfx_task(void *pvParameter)
470470

471471
xEventGroupClearBits(user_event_group, VFX_FFT_NULL_BIT);
472472

473-
gdispGClear(vfx_gdisp, 0x000000);
473+
gdispGClear(vfx_gdisp, Black);
474474
gtimerJab(&vfx_flush_timer);
475475

476476
gdispGSetBacklight(vfx_gdisp, vfx.backlight);
@@ -541,8 +541,8 @@ static void vfx_task(void *pvParameter)
541541
uint16_t fill_cy = fft_out[i] * 2 + 1;
542542
#endif
543543

544-
gdispGFillArea(vfx_gdisp, clear_x, clear_u_y, clear_cx, clear_cy, 0x000000);
545-
gdispGFillArea(vfx_gdisp, clear_x, clear_d_y, clear_cx, clear_cy, 0x000000);
544+
gdispGFillArea(vfx_gdisp, clear_x, clear_u_y, clear_cx, clear_cy, Black);
545+
gdispGFillArea(vfx_gdisp, clear_x, clear_d_y, clear_cx, clear_cy, Black);
546546
gdispGFillArea(vfx_gdisp, fill_x, fill_y, fill_cx, fill_cy, pixel_color);
547547

548548
if (++color_h == 512) {
@@ -578,7 +578,7 @@ static void vfx_task(void *pvParameter)
578578

579579
xEventGroupClearBits(user_event_group, VFX_FFT_NULL_BIT);
580580

581-
gdispGClear(vfx_gdisp, 0x000000);
581+
gdispGClear(vfx_gdisp, Black);
582582
gtimerJab(&vfx_flush_timer);
583583

584584
gdispGSetBacklight(vfx_gdisp, vfx.backlight);
@@ -649,8 +649,8 @@ static void vfx_task(void *pvParameter)
649649
uint16_t fill_cy = fft_out[i] * 2 + 1;
650650
#endif
651651

652-
gdispGFillArea(vfx_gdisp, clear_x, clear_u_y, clear_cx, clear_cy, 0x000000);
653-
gdispGFillArea(vfx_gdisp, clear_x, clear_d_y, clear_cx, clear_cy, 0x000000);
652+
gdispGFillArea(vfx_gdisp, clear_x, clear_u_y, clear_cx, clear_cy, Black);
653+
gdispGFillArea(vfx_gdisp, clear_x, clear_d_y, clear_cx, clear_cy, Black);
654654
gdispGFillArea(vfx_gdisp, fill_x, fill_y, fill_cx, fill_cy, pixel_color);
655655

656656
if ((color_h += 8) == 512) {
@@ -701,7 +701,7 @@ static void vfx_task(void *pvParameter)
701701

702702
xEventGroupClearBits(user_event_group, VFX_FFT_NULL_BIT);
703703

704-
gdispGClear(vfx_gdisp, 0x000000);
704+
gdispGClear(vfx_gdisp, Black);
705705
gtimerJab(&vfx_flush_timer);
706706

707707
gdispGSetBacklight(vfx_gdisp, vfx.backlight);
@@ -768,7 +768,7 @@ static void vfx_task(void *pvParameter)
768768
vu_peak_delay[i] = vu_peak_delay_init - 1 + vu_peak_delay[i] % vu_drop_delay_init;
769769
}
770770
if (vu_peak_value[i] != vu_val_out) {
771-
gdispGFillArea(vfx_gdisp, i*vu_width+1, (vu_val_max-vu_peak_value[i])*vu_height+1, vu_width-2, vu_height-2, 0x000000);
771+
gdispGFillArea(vfx_gdisp, i*vu_width+1, (vu_val_max-vu_peak_value[i])*vu_height+1, vu_width-2, vu_height-2, Black);
772772
}
773773

774774
uint32_t peak_color = vfx_get_color(432, color_l);
@@ -783,7 +783,7 @@ static void vfx_task(void *pvParameter)
783783
}
784784

785785
if (j > vu_val_out || ((j == 0) && (vu_val_out == 0))) { // Upside
786-
gdispGFillArea(vfx_gdisp, i*vu_width+1, (vu_val_max-j)*vu_height+1, vu_width-2, vu_height-2, 0x000000);
786+
gdispGFillArea(vfx_gdisp, i*vu_width+1, (vu_val_max-j)*vu_height+1, vu_width-2, vu_height-2, Black);
787787
} else { // Underside
788788
gdispGFillArea(vfx_gdisp, i*vu_width+1, (vu_val_max-j)*vu_height+1, vu_width-2, vu_height-2, pixel_color);
789789
}
@@ -967,7 +967,7 @@ static void vfx_task(void *pvParameter)
967967
float color_l = vfx.lightness / 256.0;
968968
const uint16_t flush_period = 8;
969969

970-
gdispGClear(vfx_gdisp, 0x000000);
970+
gdispGClear(vfx_gdisp, Black);
971971
gtimerJab(&vfx_flush_timer);
972972

973973
for (uint16_t i=0; i<512; i++) {
@@ -1034,7 +1034,7 @@ static void vfx_task(void *pvParameter)
10341034
float color_l = vfx.lightness / 256.0;
10351035
const uint16_t flush_period = 8;
10361036

1037-
gdispGClear(vfx_gdisp, 0x000000);
1037+
gdispGClear(vfx_gdisp, Black);
10381038
gtimerJab(&vfx_flush_timer);
10391039

10401040
for (uint16_t i=0; i<512; i++) {
@@ -1101,7 +1101,7 @@ static void vfx_task(void *pvParameter)
11011101
float color_l = vfx.lightness / 256.0;
11021102
const uint16_t flush_period = 8;
11031103

1104-
gdispGClear(vfx_gdisp, 0x000000);
1104+
gdispGClear(vfx_gdisp, Black);
11051105
gtimerJab(&vfx_flush_timer);
11061106

11071107
for (uint16_t i=0; i<512; i++) {
@@ -1165,7 +1165,7 @@ static void vfx_task(void *pvParameter)
11651165
uint16_t color_l = vfx.lightness;
11661166
const uint16_t flush_period = 1000;
11671167

1168-
gdispGClear(vfx_gdisp, 0x000000);
1168+
gdispGClear(vfx_gdisp, Black);
11691169
gtimerJab(&vfx_flush_timer);
11701170

11711171
while (1) {
@@ -1203,7 +1203,7 @@ static void vfx_task(void *pvParameter)
12031203
uint16_t color_l = vfx.lightness;
12041204
const uint16_t flush_period = 80;
12051205

1206-
gdispGClear(vfx_gdisp, 0x000000);
1206+
gdispGClear(vfx_gdisp, Black);
12071207
gtimerJab(&vfx_flush_timer);
12081208

12091209
while (1) {
@@ -1261,7 +1261,7 @@ static void vfx_task(void *pvParameter)
12611261
uint16_t frame_idx = 0;
12621262
const uint16_t flush_period = 16;
12631263

1264-
gdispGClear(vfx_gdisp, 0x000000);
1264+
gdispGClear(vfx_gdisp, Black);
12651265
gtimerJab(&vfx_flush_timer);
12661266

12671267
while (1) {
@@ -1289,7 +1289,7 @@ static void vfx_task(void *pvParameter)
12891289
uint16_t frame_idx = 0;
12901290
const uint16_t flush_period = 40;
12911291

1292-
gdispGClear(vfx_gdisp, 0x000000);
1292+
gdispGClear(vfx_gdisp, Black);
12931293
gtimerJab(&vfx_flush_timer);
12941294

12951295
while (1) {
@@ -1326,7 +1326,7 @@ static void vfx_task(void *pvParameter)
13261326
uint16_t frame_idx = 0;
13271327
const uint16_t flush_period = 40;
13281328

1329-
gdispGClear(vfx_gdisp, 0x000000);
1329+
gdispGClear(vfx_gdisp, Black);
13301330
gtimerJab(&vfx_flush_timer);
13311331

13321332
while (1) {
@@ -1372,7 +1372,7 @@ static void vfx_task(void *pvParameter)
13721372

13731373
xEventGroupClearBits(user_event_group, VFX_FFT_NULL_BIT);
13741374

1375-
gdispGClear(vfx_gdisp, 0x000000);
1375+
gdispGClear(vfx_gdisp, Black);
13761376
gtimerJab(&vfx_flush_timer);
13771377

13781378
memset(vfx_fft_input, 0x00, sizeof(vfx_fft_input));
@@ -1475,7 +1475,7 @@ static void vfx_task(void *pvParameter)
14751475

14761476
xEventGroupClearBits(user_event_group, VFX_FFT_NULL_BIT);
14771477

1478-
gdispGClear(vfx_gdisp, 0x000000);
1478+
gdispGClear(vfx_gdisp, Black);
14791479
gtimerJab(&vfx_flush_timer);
14801480

14811481
memset(vfx_fft_input, 0x00, sizeof(vfx_fft_input));
@@ -1599,7 +1599,7 @@ static void vfx_task(void *pvParameter)
15991599

16001600
xEventGroupClearBits(user_event_group, VFX_FFT_NULL_BIT);
16011601

1602-
gdispGClear(vfx_gdisp, 0x000000);
1602+
gdispGClear(vfx_gdisp, Black);
16031603
gtimerJab(&vfx_flush_timer);
16041604

16051605
for (uint16_t i=0; i<64; i++) {
@@ -1709,7 +1709,7 @@ static void vfx_task(void *pvParameter)
17091709

17101710
xEventGroupClearBits(user_event_group, VFX_FFT_NULL_BIT);
17111711

1712-
gdispGClear(vfx_gdisp, 0x000000);
1712+
gdispGClear(vfx_gdisp, Black);
17131713
gtimerJab(&vfx_flush_timer);
17141714

17151715
memset(vfx_fft_input, 0x00, sizeof(vfx_fft_input));
@@ -1812,7 +1812,7 @@ static void vfx_task(void *pvParameter)
18121812

18131813
xEventGroupClearBits(user_event_group, VFX_FFT_NULL_BIT);
18141814

1815-
gdispGClear(vfx_gdisp, 0x000000);
1815+
gdispGClear(vfx_gdisp, Black);
18161816
gtimerJab(&vfx_flush_timer);
18171817

18181818
memset(vfx_fft_input, 0x00, sizeof(vfx_fft_input));
@@ -1936,7 +1936,7 @@ static void vfx_task(void *pvParameter)
19361936

19371937
xEventGroupClearBits(user_event_group, VFX_FFT_NULL_BIT);
19381938

1939-
gdispGClear(vfx_gdisp, 0x000000);
1939+
gdispGClear(vfx_gdisp, Black);
19401940
gtimerJab(&vfx_flush_timer);
19411941

19421942
for (uint16_t i=0; i<64; i++) {
@@ -2049,7 +2049,7 @@ static void vfx_task(void *pvParameter)
20492049

20502050
vTaskDelay(500 / portTICK_RATE_MS);
20512051

2052-
gdispGClear(vfx_gdisp, 0x000000);
2052+
gdispGClear(vfx_gdisp, Black);
20532053
gtimerJab(&vfx_flush_timer);
20542054

20552055
xEventGroupWaitBits(

0 commit comments

Comments
 (0)