vfx: fix BREATHING mode

Author: redchenjs

main/inc/user/vfx_core.h

@@ -10,12 +10,12 @@
 
 #include <stdint.h>
 
-extern uint32_t vfx_get_color(uint16_t color_idx, uint16_t color_ctr);
+extern uint32_t vfx_get_color(float color_h, float color_l);
 
-extern void vfx_draw_pixel(uint8_t x, uint8_t y, uint8_t z, uint16_t color_idx, uint16_t color_ctr);
-extern void vfx_fill_cube(uint8_t x, uint8_t y, uint8_t z, uint8_t cx, uint8_t cy, uint8_t cz, uint16_t color_idx, uint16_t color_ctr);
-extern void vfx_draw_cube_bitmap(const uint8_t *bitmap, uint16_t color_ctr);
-extern void vfx_draw_layer_bitmap(uint8_t layer, const uint8_t *bitmap, uint16_t color_ctr);
-extern void vfx_draw_layer_number(uint8_t num, uint8_t layer, uint16_t color_idx, uint16_t color_ctr);
+extern void vfx_draw_pixel(uint8_t x, uint8_t y, uint8_t z, float color_h, float color_l);
+extern void vfx_fill_cube(uint8_t x, uint8_t y, uint8_t z, uint8_t cx, uint8_t cy, uint8_t cz, float color_h, float color_l);
+extern void vfx_draw_cube_bitmap(const uint8_t *bitmap, float color_l);
+extern void vfx_draw_layer_bitmap(uint8_t layer, const uint8_t *bitmap, float color_l);
+extern void vfx_draw_layer_number(uint8_t num, uint8_t layer, float color_h, float color_l);
 
 #endif /* INC_USER_VFX_CORE_H_ */

main/src/user/vfx.c

@@ -883,8 +883,9 @@ static void vfx_task(void *pvParameter)
         }
         case VFX_MODE_IDX_BREATHING: {   // 呼吸
             uint8_t scale_dir = 0;
+            uint16_t fade_cnt = 0;
             uint16_t color_h = esp_random() % 512;
-            uint16_t color_l = 0;
+            float color_l = vfx.lightness / 256.0;
 
             gdispGSetBacklight(vfx_gdisp, vfx.backlight);
 
@@ -896,22 +897,20 @@ static void vfx_task(void *pvParameter)
                     break;
                 }
 
-                vfx_fill_cube(0, 0, 0, 8, 8, 8, color_h, color_l);
+                vfx_fill_cube(0, 0, 0, 8, 8, 8, color_h, fade_cnt * color_l);
 
                 if (scale_dir == 0) {   // 暗->明
-                    if (color_l++ == vfx.lightness) {
-                        color_l = vfx.lightness;
+                    if (++fade_cnt == 256) {
                         scale_dir = 1;
                     }
                 } else {                // 明->暗
-                    if (color_l-- == 0) {
-                        color_l = 0;
+                    if (--fade_cnt == 0) {
                         scale_dir = 0;
                         color_h = esp_random() % 512;
                     }
                 }
 
-                vTaskDelayUntil(&xLastWakeTime, 16 / portTICK_RATE_MS);
+                vTaskDelayUntil(&xLastWakeTime, 8 / portTICK_RATE_MS);
             }
             break;
         }

main/src/user/vfx_core.c

@@ -61,13 +61,13 @@ static uint32_t hsl2rgb(float H, float S, float L)
     return (uint32_t)(R << 16 | G << 8 | B);
 }
 
-uint32_t vfx_get_color(uint16_t color_h, uint16_t color_l)
+uint32_t vfx_get_color(float color_h, float color_l)
 {
     return hsl2rgb(color_h / 511.0, 1.0, color_l / 2047.0);
 }
 
 #ifndef CONFIG_SCREEN_PANEL_OUTPUT_VFX
-void vfx_draw_pixel(uint8_t x, uint8_t y, uint8_t z, uint16_t color_h, uint16_t color_l)
+void vfx_draw_pixel(uint8_t x, uint8_t y, uint8_t z, float color_h, float color_l)
 {
     uint32_t pixel_color = vfx_get_color(color_h, color_l);
     uint8_t pixel_x = x + y * 8;
@@ -90,7 +90,7 @@ void vfx_draw_pixel(uint8_t x, uint8_t y, uint8_t z, uint16_t color_h, uint16_t
 #endif
 }
 
-void vfx_fill_cube(uint8_t x, uint8_t y, uint8_t z, uint8_t cx, uint8_t cy, uint8_t cz, uint16_t color_h, uint16_t color_l)
+void vfx_fill_cube(uint8_t x, uint8_t y, uint8_t z, uint8_t cx, uint8_t cy, uint8_t cz, float color_h, float color_l)
 {
     for (uint8_t i=0; i<cx; i++) {
         for (uint8_t j=0; j<cy; j++) {
@@ -101,7 +101,7 @@ void vfx_fill_cube(uint8_t x, uint8_t y, uint8_t z, uint8_t cx, uint8_t cy, uint
     }
 }
 
-void vfx_draw_cube_bitmap(const uint8_t *bitmap, uint16_t color_l)
+void vfx_draw_cube_bitmap(const uint8_t *bitmap, float color_l)
 {
     uint8_t x = 0;
     uint8_t y = 0;
@@ -144,7 +144,7 @@ void vfx_draw_cube_bitmap(const uint8_t *bitmap, uint16_t color_l)
     }
 }
 
-void vfx_draw_layer_bitmap(uint8_t layer, const uint8_t *bitmap, uint16_t color_l)
+void vfx_draw_layer_bitmap(uint8_t layer, const uint8_t *bitmap, float color_l)
 {
     uint8_t x = 0;
     uint8_t y = 0;
@@ -183,7 +183,7 @@ void vfx_draw_layer_bitmap(uint8_t layer, const uint8_t *bitmap, uint16_t color_
     }
 }
 
-void vfx_draw_layer_number(uint8_t num, uint8_t layer, uint16_t color_h, uint16_t color_l)
+void vfx_draw_layer_number(uint8_t num, uint8_t layer, float color_h, float color_l)
 {
     uint8_t x = 0;
     uint8_t y = layer;