vfx: fix color error

redchenjs · redchenjs · commit 750cdc572957 · 2020-04-08T06:59:31.000+08:00
diff --git a/main/src/user/vfx.c b/main/src/user/vfx.c
@@ -258,7 +258,7 @@ static void vfx_task(void *pvParameter)
                     }
                 }
 
-                color_h = 511;
+                color_h = 0;
                 for (uint16_t i=0; i<vfx_disp_width; i++) {
                     uint32_t pixel_color = vfx_get_color(color_h, color_l);
 
@@ -287,8 +287,8 @@ static void vfx_task(void *pvParameter)
                     gdispGFillArea(vfx_gdisp, clear_x, clear_y, clear_cx, clear_cy, 0x000000);
                     gdispGFillArea(vfx_gdisp, fill_x, fill_y, fill_cx, fill_cy, pixel_color);
 
-                    if ((color_h -= 8) == 7) {
-                        color_h = 511;
+                    if ((color_h += 8) == 512) {
+                        color_h = 0;
                     }
                 }
 
@@ -401,10 +401,10 @@ static void vfx_task(void *pvParameter)
                         gdispGFillArea(vfx_gdisp, i*vu_width+1, (vu_val_max-vu_peak_value[i])*vu_height+1, vu_width-2, vu_height-2, 0x000000);
                     }
 
-                    uint32_t peak_color = vfx_get_color(80, color_l);
+                    uint32_t peak_color = vfx_get_color(432, color_l);
                     gdispGFillArea(vfx_gdisp, i*vu_width+1, (vu_val_max-vu_peak_value[i])*vu_height+1, vu_width-2, vu_height-2, peak_color);
 
-                    color_h = 511;
+                    color_h = 0;
                     for (int8_t j=vu_val_max; j>=vu_val_min; j--) {
                         uint32_t pixel_color = vfx_get_color(color_h, color_l);
 
@@ -418,7 +418,7 @@ static void vfx_task(void *pvParameter)
                             gdispGFillArea(vfx_gdisp, i*vu_width+1, (vu_val_max-j)*vu_height+1, vu_width-2, vu_height-2, pixel_color);
                         }
 
-                        color_h -= vu_step;
+                        color_h += vu_step;
                     }
                 }
 
@@ -588,7 +588,7 @@ static void vfx_task(void *pvParameter)
                     }
                 }
 
-                color_h = 511;
+                color_h = 0;
                 for (uint16_t i=0; i<vfx_disp_width; i++) {
                     uint32_t pixel_color = vfx_get_color(color_h, color_l);
 
@@ -620,7 +620,7 @@ static void vfx_task(void *pvParameter)
                     gdispGFillArea(vfx_gdisp, clear_x, clear_d_y, clear_cx, clear_cy, 0x000000);
                     gdispGFillArea(vfx_gdisp, fill_x, fill_y, fill_cx, fill_cy, pixel_color);
 
-                    if ((color_h -= 8) == 7) {
+                    if ((color_h += 8) == 512) {
                         color_h = 511;
                     }
                 }
@@ -734,10 +734,10 @@ static void vfx_task(void *pvParameter)
                         gdispGFillArea(vfx_gdisp, i*vu_width+1, (vu_val_max-vu_peak_value[i])*vu_height+1, vu_width-2, vu_height-2, 0x000000);
                     }
 
-                    uint32_t peak_color = vfx_get_color(80, color_l);
+                    uint32_t peak_color = vfx_get_color(432, color_l);
                     gdispGFillArea(vfx_gdisp, i*vu_width+1, (vu_val_max-vu_peak_value[i])*vu_height+1, vu_width-2, vu_height-2, peak_color);
 
-                    color_h = 511;
+                    color_h = 0;
                     for (int8_t j=vu_val_max; j>=vu_val_min; j--) {
                         uint32_t pixel_color = vfx_get_color(color_h, color_l);
 
@@ -751,7 +751,7 @@ static void vfx_task(void *pvParameter)
                             gdispGFillArea(vfx_gdisp, i*vu_width+1, (vu_val_max-j)*vu_height+1, vu_width-2, vu_height-2, pixel_color);
                         }
 
-                        color_h -= vu_step;
+                        color_h += vu_step;
                     }
                 }
 
@@ -930,7 +930,7 @@ static void vfx_task(void *pvParameter)
 
             for (uint16_t i=0; i<=511; i++) {
                 led_idx[i] = i;
-                color_h[i] = i % 80;
+                color_h[i] = i % 80 + 432;
             }
 
             for (uint16_t i=0; i<=511; i++) {
@@ -995,7 +995,7 @@ static void vfx_task(void *pvParameter)
 
             for (uint16_t i=0; i<=511; i++) {
                 led_idx[i] = i;
-                color_h[i] = i % 85 + 345;
+                color_h[i] = i % 85 + 80;
             }
 
             for (uint16_t i=0; i<=511; i++) {
@@ -1060,7 +1060,7 @@ static void vfx_task(void *pvParameter)
 
             for (uint16_t i=0; i<=511; i++) {
                 led_idx[i] = i;
-                color_h[i] = i % 80 + 170;
+                color_h[i] = i % 80 + 260;
             }
 
             for (uint16_t i=0; i<=511; i++) {
@@ -1355,7 +1355,7 @@ static void vfx_task(void *pvParameter)
                     }
                 }
 
-                color_h = 511;
+                color_h = 0;
                 for (uint16_t i=0; i<canvas_width; i++) {
                     uint8_t clear_x  = x;
                     uint8_t clear_cx = 1;
@@ -1385,8 +1385,8 @@ static void vfx_task(void *pvParameter)
                         }
                     }
 
-                    if ((color_h -= 8) == 7) {
-                        color_h = 511;
+                    if ((color_h += 8) == 512) {
+                        color_h = 0;
                     }
                 }
 
@@ -1609,8 +1609,8 @@ static void vfx_task(void *pvParameter)
                                   color_h[i], color_l[i]);
 
                     if (color_flg) {
-                        if (color_h[i]-- == 0) {
-                            color_h[i] = 511;
+                        if (color_h[i]++ == 511) {
+                            color_h[i] = 0;
                         }
                     }
                 }
@@ -1686,7 +1686,7 @@ static void vfx_task(void *pvParameter)
                     }
                 }
 
-                color_h = 511;
+                color_h = 0;
                 for (uint16_t i=0; i<canvas_width; i++) {
                     uint8_t clear_x  = x;
                     uint8_t clear_cx = 1;
@@ -1716,8 +1716,8 @@ static void vfx_task(void *pvParameter)
                         }
                     }
 
-                    if ((color_h -= 8) == 7) {
-                        color_h = 511;
+                    if ((color_h += 8) == 512) {
+                        color_h = 0;
                     }
                 }
 
@@ -1940,8 +1940,8 @@ static void vfx_task(void *pvParameter)
                                   color_h[i], color_l[i]);
 
                     if (color_flg) {
-                        if (color_h[i]-- == 0) {
-                            color_h[i] = 511;
+                        if (color_h[i]++ == 511) {
+                            color_h[i] = 0;
                         }
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ static void vfx_task(void *pvParameter)`
`258`	`258`	`}`
`259`	`259`	`}`
`260`	`260`
`261`		`- color_h = 511;`
	`261`	`+ color_h = 0;`
`262`	`262`	`for (uint16_t i=0; i<vfx_disp_width; i++) {`
`263`	`263`	`uint32_t pixel_color = vfx_get_color(color_h, color_l);`
`264`	`264`
`@@ -287,8 +287,8 @@ static void vfx_task(void *pvParameter)`
`287`	`287`	`gdispGFillArea(vfx_gdisp, clear_x, clear_y, clear_cx, clear_cy, 0x000000);`
`288`	`288`	`gdispGFillArea(vfx_gdisp, fill_x, fill_y, fill_cx, fill_cy, pixel_color);`
`289`	`289`
`290`		`- if ((color_h -= 8) == 7) {`
`291`		`- color_h = 511;`
	`290`	`+ if ((color_h += 8) == 512) {`
	`291`	`+ color_h = 0;`
`292`	`292`	`}`
`293`	`293`	`}`
`294`	`294`
`@@ -401,10 +401,10 @@ static void vfx_task(void *pvParameter)`
`401`	`401`	`gdispGFillArea(vfx_gdisp, ivu_width+1, (vu_val_max-vu_peak_value[i])vu_height+1, vu_width-2, vu_height-2, 0x000000);`
`402`	`402`	`}`
`403`	`403`
`404`		`- uint32_t peak_color = vfx_get_color(80, color_l);`
	`404`	`+ uint32_t peak_color = vfx_get_color(432, color_l);`
`405`	`405`	`gdispGFillArea(vfx_gdisp, ivu_width+1, (vu_val_max-vu_peak_value[i])vu_height+1, vu_width-2, vu_height-2, peak_color);`
`406`	`406`
`407`		`- color_h = 511;`
	`407`	`+ color_h = 0;`
`408`	`408`	`for (int8_t j=vu_val_max; j>=vu_val_min; j--) {`
`409`	`409`	`uint32_t pixel_color = vfx_get_color(color_h, color_l);`
`410`	`410`
`@@ -418,7 +418,7 @@ static void vfx_task(void *pvParameter)`
`418`	`418`	`gdispGFillArea(vfx_gdisp, ivu_width+1, (vu_val_max-j)vu_height+1, vu_width-2, vu_height-2, pixel_color);`
`419`	`419`	`}`
`420`	`420`
`421`		`- color_h -= vu_step;`
	`421`	`+ color_h += vu_step;`
`422`	`422`	`}`
`423`	`423`	`}`
`424`	`424`
`@@ -588,7 +588,7 @@ static void vfx_task(void *pvParameter)`
`588`	`588`	`}`
`589`	`589`	`}`
`590`	`590`
`591`		`- color_h = 511;`
	`591`	`+ color_h = 0;`
`592`	`592`	`for (uint16_t i=0; i<vfx_disp_width; i++) {`
`593`	`593`	`uint32_t pixel_color = vfx_get_color(color_h, color_l);`
`594`	`594`
`@@ -620,7 +620,7 @@ static void vfx_task(void *pvParameter)`
`620`	`620`	`gdispGFillArea(vfx_gdisp, clear_x, clear_d_y, clear_cx, clear_cy, 0x000000);`
`621`	`621`	`gdispGFillArea(vfx_gdisp, fill_x, fill_y, fill_cx, fill_cy, pixel_color);`
`622`	`622`
`623`		`- if ((color_h -= 8) == 7) {`
	`623`	`+ if ((color_h += 8) == 512) {`
`624`	`624`	`color_h = 511;`
`625`	`625`	`}`
`626`	`626`	`}`
`@@ -734,10 +734,10 @@ static void vfx_task(void *pvParameter)`
`734`	`734`	`gdispGFillArea(vfx_gdisp, ivu_width+1, (vu_val_max-vu_peak_value[i])vu_height+1, vu_width-2, vu_height-2, 0x000000);`
`735`	`735`	`}`
`736`	`736`
`737`		`- uint32_t peak_color = vfx_get_color(80, color_l);`
	`737`	`+ uint32_t peak_color = vfx_get_color(432, color_l);`
`738`	`738`	`gdispGFillArea(vfx_gdisp, ivu_width+1, (vu_val_max-vu_peak_value[i])vu_height+1, vu_width-2, vu_height-2, peak_color);`
`739`	`739`
`740`		`- color_h = 511;`
	`740`	`+ color_h = 0;`
`741`	`741`	`for (int8_t j=vu_val_max; j>=vu_val_min; j--) {`
`742`	`742`	`uint32_t pixel_color = vfx_get_color(color_h, color_l);`
`743`	`743`
`@@ -751,7 +751,7 @@ static void vfx_task(void *pvParameter)`
`751`	`751`	`gdispGFillArea(vfx_gdisp, ivu_width+1, (vu_val_max-j)vu_height+1, vu_width-2, vu_height-2, pixel_color);`
`752`	`752`	`}`
`753`	`753`
`754`		`- color_h -= vu_step;`
	`754`	`+ color_h += vu_step;`
`755`	`755`	`}`
`756`	`756`	`}`
`757`	`757`
`@@ -930,7 +930,7 @@ static void vfx_task(void *pvParameter)`
`930`	`930`
`931`	`931`	`for (uint16_t i=0; i<=511; i++) {`
`932`	`932`	`led_idx[i] = i;`
`933`		`- color_h[i] = i % 80;`
	`933`	`+ color_h[i] = i % 80 + 432;`
`934`	`934`	`}`
`935`	`935`
`936`	`936`	`for (uint16_t i=0; i<=511; i++) {`
`@@ -995,7 +995,7 @@ static void vfx_task(void *pvParameter)`
`995`	`995`
`996`	`996`	`for (uint16_t i=0; i<=511; i++) {`
`997`	`997`	`led_idx[i] = i;`
`998`		`- color_h[i] = i % 85 + 345;`
	`998`	`+ color_h[i] = i % 85 + 80;`
`999`	`999`	`}`
`1000`	`1000`
`1001`	`1001`	`for (uint16_t i=0; i<=511; i++) {`
`@@ -1060,7 +1060,7 @@ static void vfx_task(void *pvParameter)`
`1060`	`1060`
`1061`	`1061`	`for (uint16_t i=0; i<=511; i++) {`
`1062`	`1062`	`led_idx[i] = i;`
`1063`		`- color_h[i] = i % 80 + 170;`
	`1063`	`+ color_h[i] = i % 80 + 260;`
`1064`	`1064`	`}`
`1065`	`1065`
`1066`	`1066`	`for (uint16_t i=0; i<=511; i++) {`
`@@ -1355,7 +1355,7 @@ static void vfx_task(void *pvParameter)`
`1355`	`1355`	`}`
`1356`	`1356`	`}`
`1357`	`1357`
`1358`		`- color_h = 511;`
	`1358`	`+ color_h = 0;`
`1359`	`1359`	`for (uint16_t i=0; i<canvas_width; i++) {`
`1360`	`1360`	`uint8_t clear_x = x;`
`1361`	`1361`	`uint8_t clear_cx = 1;`
`@@ -1385,8 +1385,8 @@ static void vfx_task(void *pvParameter)`
`1385`	`1385`	`}`
`1386`	`1386`	`}`
`1387`	`1387`
`1388`		`- if ((color_h -= 8) == 7) {`
`1389`		`- color_h = 511;`
	`1388`	`+ if ((color_h += 8) == 512) {`
	`1389`	`+ color_h = 0;`
`1390`	`1390`	`}`
`1391`	`1391`	`}`
`1392`	`1392`
`@@ -1609,8 +1609,8 @@ static void vfx_task(void *pvParameter)`
`1609`	`1609`	`color_h[i], color_l[i]);`
`1610`	`1610`
`1611`	`1611`	`if (color_flg) {`
`1612`		`- if (color_h[i]-- == 0) {`
`1613`		`- color_h[i] = 511;`
	`1612`	`+ if (color_h[i]++ == 511) {`
	`1613`	`+ color_h[i] = 0;`
`1614`	`1614`	`}`
`1615`	`1615`	`}`
`1616`	`1616`	`}`
`@@ -1686,7 +1686,7 @@ static void vfx_task(void *pvParameter)`
`1686`	`1686`	`}`
`1687`	`1687`	`}`
`1688`	`1688`
`1689`		`- color_h = 511;`
	`1689`	`+ color_h = 0;`
`1690`	`1690`	`for (uint16_t i=0; i<canvas_width; i++) {`
`1691`	`1691`	`uint8_t clear_x = x;`
`1692`	`1692`	`uint8_t clear_cx = 1;`
`@@ -1716,8 +1716,8 @@ static void vfx_task(void *pvParameter)`
`1716`	`1716`	`}`
`1717`	`1717`	`}`
`1718`	`1718`
`1719`		`- if ((color_h -= 8) == 7) {`
`1720`		`- color_h = 511;`
	`1719`	`+ if ((color_h += 8) == 512) {`
	`1720`	`+ color_h = 0;`
`1721`	`1721`	`}`
`1722`	`1722`	`}`
`1723`	`1723`
`@@ -1940,8 +1940,8 @@ static void vfx_task(void *pvParameter)`
`1940`	`1940`	`color_h[i], color_l[i]);`
`1941`	`1941`
`1942`	`1942`	`if (color_flg) {`
`1943`		`- if (color_h[i]-- == 0) {`
`1944`		`- color_h[i] = 511;`
	`1943`	`+ if (color_h[i]++ == 511) {`
	`1944`	`+ color_h[i] = 0;`
`1945`	`1945`	`}`
`1946`	`1946`	`}`
`1947`	`1947`	`}`