ugfx: update WS2812 driver

Author: redchenjs

components/ugfx/drivers/gdisp/CUBE0414/gdisp_lld_CUBE0414.c

@@ -47,7 +47,7 @@
 #include "CUBE0414.h"
 
 static const uint8_t ram_addr_table[64] = {
-#ifdef CONFIG_CUBE0414_LINE_S_CURVE
+#ifdef CONFIG_LED_SCAN_S_CURVE
     0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x0f,
     0x10, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
     0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x1f,

components/ugfx/drivers/gdisp/WS2812/gdisp_lld_WS2812.c

@@ -44,6 +44,28 @@
 
 #define GDISP_FLG_NEEDFLUSH         (GDISP_FLG_DRIVER << 0)
 
+static const uint8_t ram_addr_table[64] = {
+#ifdef CONFIG_LED_SCAN_S_CURVE
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+    0x1f, 0x1e, 0x1d, 0x1c, 0x1b, 0x1a, 0x19, 0x18,
+    0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+    0x2f, 0x2e, 0x2d, 0x2c, 0x2b, 0x2a, 0x29, 0x28,
+    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+    0x3f, 0x3e, 0x3d, 0x3c, 0x3b, 0x3a, 0x39, 0x38
+#else
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+    0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+    0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+    0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f
+#endif
+};
+
 LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
     g->priv = gfxAlloc(GDISP_SCREEN_WIDTH * GDISP_SCREEN_HEIGHT * 3);
     if (g->priv == NULL) {
@@ -90,7 +112,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
         write_cy = g->p.cy;
     }
     LLDSPEC void gdisp_lld_write_color(GDisplay *g) {
-        uint16_t pos = write_y * g->g.Width + write_x;
+        uint16_t pos = write_y * g->g.Width + ram_addr_table[write_x];
         LLDCOLOR_TYPE c = gdispColor2Native(g->p.color);
 #ifdef CONFIG_LED_COLOR_ODR_GRB
         *((uint8_t *)g->priv + pos * 3 + 0) = c >> 8;
@@ -129,7 +151,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
         read_cy = g->p.cy;
     }
     LLDSPEC color_t gdisp_lld_read_color(GDisplay *g) {
-        uint16_t pos = read_y * g->g.Width + read_x;
+        uint16_t pos = read_y * g->g.Width + ram_addr_table[read_x];
 #ifdef CONFIG_LED_COLOR_ODR_GRB
         LLDCOLOR_TYPE c = (*((uint8_t *)g->priv + pos * 3 + 0) << 8)
                         | (*((uint8_t *)g->priv + pos * 3 + 1) << 16)

main/Kconfig.projbuild

@@ -179,17 +179,6 @@ config CUBE0414_RTL_REV_3
     bool "Rev 3"
 endchoice
 
-choice CUBE0414_LINE_TYPE
-    prompt "CUBE0414 Line Type"
-    default CUBE0414_LINE_S_CURVE
-    depends on ENABLE_VFX && VFX_OUTPUT_CUBE0414
-
-config CUBE0414_LINE_NORMAL
-    bool "Normal"
-config CUBE0414_LINE_S_CURVE
-    bool "S Curve"
-endchoice
-
 choice LCD_ORIENTATION
     prompt "LCD Orientation"
     default LCD_ORIENTATION_NORMAL
@@ -206,11 +195,16 @@ config LCD_ROTATION_DEGREE
     default  90 if LCD_ORIENTATION_NORMAL
     default 270 if LCD_ORIENTATION_UPSIDE_DOWN
 
-config LED_PANEL_CASCADE
-    int "LED Panel Cascade"
-    default 1
-    range 1 8
-    depends on ENABLE_VFX && VFX_OUTPUT_WS2812
+choice LED_SCAN_TYPE
+    prompt "LED Scan Type"
+    default LED_SCAN_S_CURVE
+    depends on ENABLE_VFX && (VFX_OUTPUT_WS2812 || VFX_OUTPUT_CUBE0414)
+
+config LED_SCAN_S_CURVE
+    bool "S Curve"
+config LED_SCAN_LINE_BY_LINE
+    bool "Line by line"
+endchoice
 
 choice LED_COLOR_ORDER
     prompt "LED Color Order"
@@ -257,6 +251,12 @@ config LED_LAYER_INV_Z
     default n
     depends on ENABLE_VFX && (VFX_OUTPUT_WS2812 || VFX_OUTPUT_CUBE0414)
 
+config LED_PANEL_CASCADE
+    int "LED Panel Cascade"
+    default 1
+    range 1 8
+    depends on ENABLE_VFX && VFX_OUTPUT_WS2812
+
 config LED_T0H_TIME
     int "LED T0H Time (10 ns)"
     default 40