vfx: code clean up

redchenjs · redchenjs · commit a9fd9281252a · 2020-04-08T18:06:43.000+08:00
diff --git a/main/src/user/vfx.c b/main/src/user/vfx.c
@@ -187,12 +187,12 @@ 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++ == 511) {
+                    if ((color_h++) == 512) {
                         color_h = 0;
                     }
                 }
 
-                if (color_tmp++ == 511) {
+                if ((color_tmp++) == 512) {
                     color_h = 0;
                 } else {
                     color_h = color_tmp;
@@ -516,12 +516,12 @@ 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++ == 511) {
+                    if ((color_h++) == 512) {
                         color_h = 0;
                     }
                 }
 
-                if (color_tmp++ == 511) {
+                if ((color_tmp++) == 512) {
                     color_h = 0;
                 } else {
                     color_h = color_tmp;
@@ -621,7 +621,7 @@ static void vfx_task(void *pvParameter)
                     gdispGFillArea(vfx_gdisp, fill_x, fill_y, fill_cx, fill_cy, pixel_color);
 
                     if ((color_h += 8) == 512) {
-                        color_h = 511;
+                        color_h = 0;
                     }
                 }
 
@@ -802,7 +802,7 @@ static void vfx_task(void *pvParameter)
                         }
                     }
 
-                    if (color_h++ == 511) {
+                    if ((color_h++) == 512) {
                         color_h = 0;
                     }
                 }
@@ -842,12 +842,12 @@ static void vfx_task(void *pvParameter)
                         }
                     }
 
-                    if (color_h++ == 511) {
+                    if ((color_h++) == 512) {
                         color_h = 0;
                     }
                 }
 
-                if (color_tmp++ == 511) {
+                if ((color_tmp++) == 512) {
                     color_h = 0;
                 } else {
                     color_h = color_tmp;
@@ -873,7 +873,7 @@ static void vfx_task(void *pvParameter)
 
                 vfx_fill_cube(0, 0, 0, 8, 8, 8, color_h, color_l);
 
-                if (color_h++ == 511) {
+                if ((color_h++) == 512) {
                     color_h = 0;
                 }
 
@@ -928,19 +928,19 @@ static void vfx_task(void *pvParameter)
 
             gdispGSetBacklight(vfx_gdisp, vfx.backlight);
 
-            for (uint16_t i=0; i<=511; i++) {
+            for (uint16_t i=0; i<512; i++) {
                 led_idx[i] = i;
                 color_h[i] = i % 80 + 432;
             }
 
-            for (uint16_t i=0; i<=511; i++) {
+            for (uint16_t i=0; i<512; i++) {
                 uint16_t rnd = esp_random() % 512;
                 uint16_t tmp = led_idx[rnd];
                 led_idx[rnd] = led_idx[i];
                 led_idx[i] = tmp;
             }
 
-            for (uint16_t i=0; i<=511; i++) {
+            for (uint16_t i=0; i<512; i++) {
                 uint16_t rnd = esp_random() % 512;
                 uint16_t tmp = color_h[rnd];
                 color_h[rnd] = color_h[i];
@@ -964,7 +964,7 @@ static void vfx_task(void *pvParameter)
                         vfx_draw_pixel(x, y, z, color_h[idx_base], color_l - i);
                     }
 
-                    if ((idx_base + led_num) <= 511) {
+                    if ((idx_base + led_num) < 512) {
                         x = (led_idx[idx_base + led_num] % 64) % 8;
                         y = (led_idx[idx_base + led_num] % 64) / 8;
                         z = led_idx[idx_base + led_num] / 64;
@@ -974,7 +974,7 @@ static void vfx_task(void *pvParameter)
                     vTaskDelayUntil(&xLastWakeTime, 8 / portTICK_RATE_MS);
                 }
 
-                if (idx_base++ == 511) {
+                if ((idx_base++) == 512) {
                     idx_base = -led_num;
                 }
             }
@@ -993,19 +993,19 @@ static void vfx_task(void *pvParameter)
 
             gdispGSetBacklight(vfx_gdisp, vfx.backlight);
 
-            for (uint16_t i=0; i<=511; i++) {
+            for (uint16_t i=0; i<512; i++) {
                 led_idx[i] = i;
                 color_h[i] = i % 85 + 80;
             }
 
-            for (uint16_t i=0; i<=511; i++) {
+            for (uint16_t i=0; i<512; i++) {
                 uint16_t rnd = esp_random() % 512;
                 uint16_t tmp = led_idx[rnd];
                 led_idx[rnd] = led_idx[i];
                 led_idx[i] = tmp;
             }
 
-            for (uint16_t i=0; i<=511; i++) {
+            for (uint16_t i=0; i<512; i++) {
                 uint16_t rnd = esp_random() % 512;
                 uint16_t tmp = color_h[rnd];
                 color_h[rnd] = color_h[i];
@@ -1029,7 +1029,7 @@ static void vfx_task(void *pvParameter)
                         vfx_draw_pixel(x, y, z, color_h[idx_base], color_l - i);
                     }
 
-                    if ((idx_base + led_num) <= 511) {
+                    if ((idx_base + led_num) < 512) {
                         x = (led_idx[idx_base + led_num] % 64) % 8;
                         y = (led_idx[idx_base + led_num] % 64) / 8;
                         z = led_idx[idx_base + led_num] / 64;
@@ -1039,7 +1039,7 @@ static void vfx_task(void *pvParameter)
                     vTaskDelayUntil(&xLastWakeTime, 8 / portTICK_RATE_MS);
                 }
 
-                if (idx_base++ == 511) {
+                if ((idx_base++) == 512) {
                     idx_base = -led_num;
                 }
             }
@@ -1058,19 +1058,19 @@ static void vfx_task(void *pvParameter)
 
             gdispGSetBacklight(vfx_gdisp, vfx.backlight);
 
-            for (uint16_t i=0; i<=511; i++) {
+            for (uint16_t i=0; i<512; i++) {
                 led_idx[i] = i;
                 color_h[i] = i % 80 + 260;
             }
 
-            for (uint16_t i=0; i<=511; i++) {
+            for (uint16_t i=0; i<512; i++) {
                 uint16_t rnd = esp_random() % 512;
                 uint16_t tmp = led_idx[rnd];
                 led_idx[rnd] = led_idx[i];
                 led_idx[i] = tmp;
             }
 
-            for (uint16_t i=0; i<=511; i++) {
+            for (uint16_t i=0; i<512; i++) {
                 uint16_t rnd = esp_random() % 512;
                 uint16_t tmp = color_h[rnd];
                 color_h[rnd] = color_h[i];
@@ -1094,7 +1094,7 @@ static void vfx_task(void *pvParameter)
                         vfx_draw_pixel(x, y, z, color_h[idx_base], color_l - i);
                     }
 
-                    if ((idx_base + led_num) <= 511) {
+                    if ((idx_base + led_num) < 512) {
                         x = (led_idx[idx_base + led_num] % 64) % 8;
                         y = (led_idx[idx_base + led_num] % 64) / 8;
                         z = led_idx[idx_base + led_num] / 64;
@@ -1104,7 +1104,7 @@ static void vfx_task(void *pvParameter)
                     vTaskDelayUntil(&xLastWakeTime, 8 / portTICK_RATE_MS);
                 }
 
-                if (idx_base++ == 511) {
+                if ((idx_base++) == 512) {
                     idx_base = -led_num;
                 }
             }
@@ -1197,7 +1197,7 @@ static void vfx_task(void *pvParameter)
                     }
                 }
 
-                if (color_h++ == 511) {
+                if ((color_h++) == 512) {
                     color_h = 0;
                 }
 
@@ -1609,7 +1609,7 @@ static void vfx_task(void *pvParameter)
                                   color_h[i], color_l[i]);
 
                     if (color_flg) {
-                        if (color_h[i]++ == 511) {
+                        if ((color_h[i]++) == 512) {
                             color_h[i] = 0;
                         }
                     }
@@ -1940,7 +1940,7 @@ static void vfx_task(void *pvParameter)
                                   color_h[i], color_l[i]);
 
                     if (color_flg) {
-                        if (color_h[i]++ == 511) {
+                        if ((color_h[i]++) == 512) {
                             color_h[i] = 0;
                         }
                     }
diff --git a/main/src/user/vfx_core.c b/main/src/user/vfx_core.c
@@ -125,17 +125,15 @@ void vfx_draw_cube_bitmap(const uint8_t *bitmap, uint16_t color_l)
                     }
                 }
 
-                if (color_h++ == 511) {
+                if ((color_h++) == 512) {
                     color_h = 0;
                 }
             }
         }
     }
 
-    if (color_pre == 510) {
+    if ((color_h = color_pre + 1) == 512) {
         color_h = 0;
-    } else {
-        color_h = color_pre + 2;
     }
 }
 
@@ -167,16 +165,14 @@ void vfx_draw_layer_bitmap(uint8_t layer, const uint8_t *bitmap, uint16_t color_
                 }
             }
 
-            if (color_h++ == 511) {
+            if ((color_h++) == 512) {
                 color_h = 0;
             }
         }
     }
 
-    if (color_pre == 511) {
+    if ((color_h = color_pre + 1) == 512) {
         color_h = 0;
-    } else {
-        color_h = color_pre + 1;
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -187,12 +187,12 @@ static void vfx_task(void *pvParameter)`
`187`	`187`	`gdispGFillArea(vfx_gdisp, clear_x, clear_y, clear_cx, clear_cy, 0x000000);`
`188`	`188`	`gdispGFillArea(vfx_gdisp, fill_x, fill_y, fill_cx, fill_cy, pixel_color);`
`189`	`189`
`190`		`- if (color_h++ == 511) {`
	`190`	`+ if ((color_h++) == 512) {`
`191`	`191`	`color_h = 0;`
`192`	`192`	`}`
`193`	`193`	`}`
`194`	`194`
`195`		`- if (color_tmp++ == 511) {`
	`195`	`+ if ((color_tmp++) == 512) {`
`196`	`196`	`color_h = 0;`
`197`	`197`	`} else {`
`198`	`198`	`color_h = color_tmp;`
`@@ -516,12 +516,12 @@ static void vfx_task(void *pvParameter)`
`516`	`516`	`gdispGFillArea(vfx_gdisp, clear_x, clear_d_y, clear_cx, clear_cy, 0x000000);`
`517`	`517`	`gdispGFillArea(vfx_gdisp, fill_x, fill_y, fill_cx, fill_cy, pixel_color);`
`518`	`518`
`519`		`- if (color_h++ == 511) {`
	`519`	`+ if ((color_h++) == 512) {`
`520`	`520`	`color_h = 0;`
`521`	`521`	`}`
`522`	`522`	`}`
`523`	`523`
`524`		`- if (color_tmp++ == 511) {`
	`524`	`+ if ((color_tmp++) == 512) {`
`525`	`525`	`color_h = 0;`
`526`	`526`	`} else {`
`527`	`527`	`color_h = color_tmp;`
`@@ -621,7 +621,7 @@ static void vfx_task(void *pvParameter)`
`621`	`621`	`gdispGFillArea(vfx_gdisp, fill_x, fill_y, fill_cx, fill_cy, pixel_color);`
`622`	`622`
`623`	`623`	`if ((color_h += 8) == 512) {`
`624`		`- color_h = 511;`
	`624`	`+ color_h = 0;`
`625`	`625`	`}`
`626`	`626`	`}`
`627`	`627`
`@@ -802,7 +802,7 @@ static void vfx_task(void *pvParameter)`
`802`	`802`	`}`
`803`	`803`	`}`
`804`	`804`
`805`		`- if (color_h++ == 511) {`
	`805`	`+ if ((color_h++) == 512) {`
`806`	`806`	`color_h = 0;`
`807`	`807`	`}`
`808`	`808`	`}`
`@@ -842,12 +842,12 @@ static void vfx_task(void *pvParameter)`
`842`	`842`	`}`
`843`	`843`	`}`
`844`	`844`
`845`		`- if (color_h++ == 511) {`
	`845`	`+ if ((color_h++) == 512) {`
`846`	`846`	`color_h = 0;`
`847`	`847`	`}`
`848`	`848`	`}`
`849`	`849`
`850`		`- if (color_tmp++ == 511) {`
	`850`	`+ if ((color_tmp++) == 512) {`
`851`	`851`	`color_h = 0;`
`852`	`852`	`} else {`
`853`	`853`	`color_h = color_tmp;`
`@@ -873,7 +873,7 @@ static void vfx_task(void *pvParameter)`
`873`	`873`
`874`	`874`	`vfx_fill_cube(0, 0, 0, 8, 8, 8, color_h, color_l);`
`875`	`875`
`876`		`- if (color_h++ == 511) {`
	`876`	`+ if ((color_h++) == 512) {`
`877`	`877`	`color_h = 0;`
`878`	`878`	`}`
`879`	`879`
`@@ -928,19 +928,19 @@ static void vfx_task(void *pvParameter)`
`928`	`928`
`929`	`929`	`gdispGSetBacklight(vfx_gdisp, vfx.backlight);`
`930`	`930`
`931`		`- for (uint16_t i=0; i<=511; i++) {`
	`931`	`+ for (uint16_t i=0; i<512; i++) {`
`932`	`932`	`led_idx[i] = i;`
`933`	`933`	`color_h[i] = i % 80 + 432;`
`934`	`934`	`}`
`935`	`935`
`936`		`- for (uint16_t i=0; i<=511; i++) {`
	`936`	`+ for (uint16_t i=0; i<512; i++) {`
`937`	`937`	`uint16_t rnd = esp_random() % 512;`
`938`	`938`	`uint16_t tmp = led_idx[rnd];`
`939`	`939`	`led_idx[rnd] = led_idx[i];`
`940`	`940`	`led_idx[i] = tmp;`
`941`	`941`	`}`
`942`	`942`
`943`		`- for (uint16_t i=0; i<=511; i++) {`
	`943`	`+ for (uint16_t i=0; i<512; i++) {`
`944`	`944`	`uint16_t rnd = esp_random() % 512;`
`945`	`945`	`uint16_t tmp = color_h[rnd];`
`946`	`946`	`color_h[rnd] = color_h[i];`
`@@ -964,7 +964,7 @@ static void vfx_task(void *pvParameter)`
`964`	`964`	`vfx_draw_pixel(x, y, z, color_h[idx_base], color_l - i);`
`965`	`965`	`}`
`966`	`966`
`967`		`- if ((idx_base + led_num) <= 511) {`
	`967`	`+ if ((idx_base + led_num) < 512) {`
`968`	`968`	`x = (led_idx[idx_base + led_num] % 64) % 8;`
`969`	`969`	`y = (led_idx[idx_base + led_num] % 64) / 8;`
`970`	`970`	`z = led_idx[idx_base + led_num] / 64;`
`@@ -974,7 +974,7 @@ static void vfx_task(void *pvParameter)`
`974`	`974`	`vTaskDelayUntil(&xLastWakeTime, 8 / portTICK_RATE_MS);`
`975`	`975`	`}`
`976`	`976`
`977`		`- if (idx_base++ == 511) {`
	`977`	`+ if ((idx_base++) == 512) {`
`978`	`978`	`idx_base = -led_num;`
`979`	`979`	`}`
`980`	`980`	`}`
`@@ -993,19 +993,19 @@ static void vfx_task(void *pvParameter)`
`993`	`993`
`994`	`994`	`gdispGSetBacklight(vfx_gdisp, vfx.backlight);`
`995`	`995`
`996`		`- for (uint16_t i=0; i<=511; i++) {`
	`996`	`+ for (uint16_t i=0; i<512; i++) {`
`997`	`997`	`led_idx[i] = i;`
`998`	`998`	`color_h[i] = i % 85 + 80;`
`999`	`999`	`}`
`1000`	`1000`
`1001`		`- for (uint16_t i=0; i<=511; i++) {`
	`1001`	`+ for (uint16_t i=0; i<512; i++) {`
`1002`	`1002`	`uint16_t rnd = esp_random() % 512;`
`1003`	`1003`	`uint16_t tmp = led_idx[rnd];`
`1004`	`1004`	`led_idx[rnd] = led_idx[i];`
`1005`	`1005`	`led_idx[i] = tmp;`
`1006`	`1006`	`}`
`1007`	`1007`
`1008`		`- for (uint16_t i=0; i<=511; i++) {`
	`1008`	`+ for (uint16_t i=0; i<512; i++) {`
`1009`	`1009`	`uint16_t rnd = esp_random() % 512;`
`1010`	`1010`	`uint16_t tmp = color_h[rnd];`
`1011`	`1011`	`color_h[rnd] = color_h[i];`
`@@ -1029,7 +1029,7 @@ static void vfx_task(void *pvParameter)`
`1029`	`1029`	`vfx_draw_pixel(x, y, z, color_h[idx_base], color_l - i);`
`1030`	`1030`	`}`
`1031`	`1031`
`1032`		`- if ((idx_base + led_num) <= 511) {`
	`1032`	`+ if ((idx_base + led_num) < 512) {`
`1033`	`1033`	`x = (led_idx[idx_base + led_num] % 64) % 8;`
`1034`	`1034`	`y = (led_idx[idx_base + led_num] % 64) / 8;`
`1035`	`1035`	`z = led_idx[idx_base + led_num] / 64;`
`@@ -1039,7 +1039,7 @@ static void vfx_task(void *pvParameter)`
`1039`	`1039`	`vTaskDelayUntil(&xLastWakeTime, 8 / portTICK_RATE_MS);`
`1040`	`1040`	`}`
`1041`	`1041`
`1042`		`- if (idx_base++ == 511) {`
	`1042`	`+ if ((idx_base++) == 512) {`
`1043`	`1043`	`idx_base = -led_num;`
`1044`	`1044`	`}`
`1045`	`1045`	`}`
`@@ -1058,19 +1058,19 @@ static void vfx_task(void *pvParameter)`
`1058`	`1058`
`1059`	`1059`	`gdispGSetBacklight(vfx_gdisp, vfx.backlight);`
`1060`	`1060`
`1061`		`- for (uint16_t i=0; i<=511; i++) {`
	`1061`	`+ for (uint16_t i=0; i<512; i++) {`
`1062`	`1062`	`led_idx[i] = i;`
`1063`	`1063`	`color_h[i] = i % 80 + 260;`
`1064`	`1064`	`}`
`1065`	`1065`
`1066`		`- for (uint16_t i=0; i<=511; i++) {`
	`1066`	`+ for (uint16_t i=0; i<512; i++) {`
`1067`	`1067`	`uint16_t rnd = esp_random() % 512;`
`1068`	`1068`	`uint16_t tmp = led_idx[rnd];`
`1069`	`1069`	`led_idx[rnd] = led_idx[i];`
`1070`	`1070`	`led_idx[i] = tmp;`
`1071`	`1071`	`}`
`1072`	`1072`
`1073`		`- for (uint16_t i=0; i<=511; i++) {`
	`1073`	`+ for (uint16_t i=0; i<512; i++) {`
`1074`	`1074`	`uint16_t rnd = esp_random() % 512;`
`1075`	`1075`	`uint16_t tmp = color_h[rnd];`
`1076`	`1076`	`color_h[rnd] = color_h[i];`
`@@ -1094,7 +1094,7 @@ static void vfx_task(void *pvParameter)`
`1094`	`1094`	`vfx_draw_pixel(x, y, z, color_h[idx_base], color_l - i);`
`1095`	`1095`	`}`
`1096`	`1096`
`1097`		`- if ((idx_base + led_num) <= 511) {`
	`1097`	`+ if ((idx_base + led_num) < 512) {`
`1098`	`1098`	`x = (led_idx[idx_base + led_num] % 64) % 8;`
`1099`	`1099`	`y = (led_idx[idx_base + led_num] % 64) / 8;`
`1100`	`1100`	`z = led_idx[idx_base + led_num] / 64;`
`@@ -1104,7 +1104,7 @@ static void vfx_task(void *pvParameter)`
`1104`	`1104`	`vTaskDelayUntil(&xLastWakeTime, 8 / portTICK_RATE_MS);`
`1105`	`1105`	`}`
`1106`	`1106`
`1107`		`- if (idx_base++ == 511) {`
	`1107`	`+ if ((idx_base++) == 512) {`
`1108`	`1108`	`idx_base = -led_num;`
`1109`	`1109`	`}`
`1110`	`1110`	`}`
`@@ -1197,7 +1197,7 @@ static void vfx_task(void *pvParameter)`
`1197`	`1197`	`}`
`1198`	`1198`	`}`
`1199`	`1199`
`1200`		`- if (color_h++ == 511) {`
	`1200`	`+ if ((color_h++) == 512) {`
`1201`	`1201`	`color_h = 0;`
`1202`	`1202`	`}`
`1203`	`1203`
`@@ -1609,7 +1609,7 @@ 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]++ == 511) {`
	`1612`	`+ if ((color_h[i]++) == 512) {`
`1613`	`1613`	`color_h[i] = 0;`
`1614`	`1614`	`}`
`1615`	`1615`	`}`
`@@ -1940,7 +1940,7 @@ 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]++ == 511) {`
	`1943`	`+ if ((color_h[i]++) == 512) {`
`1944`	`1944`	`color_h[i] = 0;`
`1945`	`1945`	`}`
`1946`	`1946`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,17 +125,15 @@ void vfx_draw_cube_bitmap(const uint8_t *bitmap, uint16_t color_l)`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`
`128`		`- if (color_h++ == 511) {`
	`128`	`+ if ((color_h++) == 512) {`
`129`	`129`	`color_h = 0;`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`
`135`		`- if (color_pre == 510) {`
	`135`	`+ if ((color_h = color_pre + 1) == 512) {`
`136`	`136`	`color_h = 0;`
`137`		`- } else {`
`138`		`- color_h = color_pre + 2;`
`139`	`137`	`}`
`140`	`138`	`}`
`141`	`139`
`@@ -167,16 +165,14 @@ void vfx_draw_layer_bitmap(uint8_t layer, const uint8_t *bitmap, uint16_t color_`
`167`	`165`	`}`
`168`	`166`	`}`
`169`	`167`
`170`		`- if (color_h++ == 511) {`
	`168`	`+ if ((color_h++) == 512) {`
`171`	`169`	`color_h = 0;`
`172`	`170`	`}`
`173`	`171`	`}`
`174`	`172`	`}`
`175`	`173`
`176`		`- if (color_pre == 511) {`
	`174`	`+ if ((color_h = color_pre + 1) == 512) {`
`177`	`175`	`color_h = 0;`
`178`		`- } else {`
`179`		`- color_h = color_pre + 1;`
`180`	`176`	`}`
`181`	`177`	`}`
`182`	`178`