From f209c00a8bb65bdf27e11736b5926b674ee4dbe5 Mon Sep 17 00:00:00 2001 From: Tester23 <85486843+openshwprojects@users.noreply.github.com> Date: Wed, 22 Jan 2025 09:13:57 +0100 Subject: [PATCH] fix rgb pr --- src/driver/drv_sm16703P.c | 10 +++++----- src/selftest/selftest_ws2812b.c | 22 +++++++++++++++------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/driver/drv_sm16703P.c b/src/driver/drv_sm16703P.c index 42eaa76e2..b4d875833 100644 --- a/src/driver/drv_sm16703P.c +++ b/src/driver/drv_sm16703P.c @@ -62,27 +62,27 @@ void SM16703P_setPixel(int pixel, int r, int g, int b) { b1 = g; b2 = b; } - if (color_order == SM16703P_COLOR_ORDER_RBG) { + else if (color_order == SM16703P_COLOR_ORDER_RBG) { b0 = r; b1 = b; b2 = g; } - if (color_order == SM16703P_COLOR_ORDER_BRG) { + else if (color_order == SM16703P_COLOR_ORDER_BRG) { b0 = b; b1 = r; b2 = g; } - if (color_order == SM16703P_COLOR_ORDER_BGR) { + else if (color_order == SM16703P_COLOR_ORDER_BGR) { b0 = b; b1 = g; b2 = r; } - if (color_order == SM16703P_COLOR_ORDER_GRB) { + else if (color_order == SM16703P_COLOR_ORDER_GRB) { b0 = g; b1 = r; b2 = b; } - if (color_order == SM16703P_COLOR_ORDER_GBR) { + else if (color_order == SM16703P_COLOR_ORDER_GBR) { b0 = g; b1 = b; b2 = r; diff --git a/src/selftest/selftest_ws2812b.c b/src/selftest/selftest_ws2812b.c index f8b10d4ee..7685fac4b 100644 --- a/src/selftest/selftest_ws2812b.c +++ b/src/selftest/selftest_ws2812b.c @@ -31,7 +31,9 @@ void Test_WS2812B() { // fake 3 pixels data { // RGB CMD_ExecuteCommand("SM16703P_Init 3 RGB", 0); - uint8_t dat[9] = { 255, 0, 0, 0, 255, 0, 0, 0, 255 }; + uint8_t dat[9] = { 255, 0, 0, + 0, 255, 0, + 0, 0, 255 }; SM16703P_setMultiplePixel(3, dat, false); SELFTEST_ASSERT_PIXEL(0, 255, 0, 0); SELFTEST_ASSERT_PIXEL(1, 0, 255, 0); @@ -39,7 +41,9 @@ void Test_WS2812B() { } { // BGR CMD_ExecuteCommand("SM16703P_Init 3 BGR", 0); - uint8_t dat[9] = { 255, 0, 0, 0, 255, 0, 0, 0, 255 }; + uint8_t dat[9] = { 255, 0, 0, + 0, 255, 0, + 0, 0, 255 }; SM16703P_setMultiplePixel(3, dat, false); SELFTEST_ASSERT_PIXEL(0, 0, 0, 255); SELFTEST_ASSERT_PIXEL(1, 0, 255, 0); @@ -47,7 +51,9 @@ void Test_WS2812B() { } { // BGR CMD_ExecuteCommand("SM16703P_Init 3 BGR", 0); - uint8_t dat[9] = { 255, 0, 0, 0, 255, 0, 0, 0, 255 }; + uint8_t dat[9] = { 255, 0, 0, + 0, 255, 0, + 0, 0, 255 }; SM16703P_setMultiplePixel(3, dat, false); SELFTEST_ASSERT_PIXEL(0, 0, 0, 255); SELFTEST_ASSERT_PIXEL(1, 0, 255, 0); @@ -55,7 +61,9 @@ void Test_WS2812B() { } { // GRB CMD_ExecuteCommand("SM16703P_Init 3 GRB", 0); - uint8_t dat[9] = { 255, 0, 0, 0, 255, 0, 0, 0, 255 }; + uint8_t dat[9] = { 255, 0, 0, + 0, 255, 0, + 0, 0, 255 }; SM16703P_setMultiplePixel(3, dat, false); SELFTEST_ASSERT_PIXEL(0, 0, 255, 0); SELFTEST_ASSERT_PIXEL(1, 255, 0, 0); @@ -67,9 +75,9 @@ void Test_WS2812B() { 0, 255, 0, 0, 0, 255 }; SM16703P_setMultiplePixel(3, dat, false); - SELFTEST_ASSERT_PIXEL(0, 0, 0, 255); - SELFTEST_ASSERT_PIXEL(1, 255, 0, 0); - SELFTEST_ASSERT_PIXEL(2, 0, 255, 0); + SELFTEST_ASSERT_PIXEL(0, 0, 255, 0); + SELFTEST_ASSERT_PIXEL(1, 0, 0, 255); + SELFTEST_ASSERT_PIXEL(2, 255, 0, 0); } CMD_ExecuteCommand("SM16703P_Init 3 RGB", 0);