From 11a31de68cc52f861ae720e30d57bd04a8c2bdcd Mon Sep 17 00:00:00 2001 From: Nicholas G Date: Sat, 10 Sep 2022 19:42:01 -0400 Subject: [PATCH] force max brightness on labels/switches to bring supply voltages down for neopixel 60% signal --- build_uf2/Pico_Game_Controller.uf2 | Bin 74752 -> 74752 bytes src/rgb/color_cycle_v5.c | 10 ++++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build_uf2/Pico_Game_Controller.uf2 b/build_uf2/Pico_Game_Controller.uf2 index ce24a0558f69f396c73eab53ab2da1dbcdaeec6d..7dcb8da90eec510d5006b1da523fa3fe9a1db4ec 100644 GIT binary patch delta 8137 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 bSqg6?tCk|NIUAANqf1+dmx^>%rvv^QBpP{m diff --git a/src/rgb/color_cycle_v5.c b/src/rgb/color_cycle_v5.c index 9da5c68..0b6af28 100644 --- a/src/rgb/color_cycle_v5.c +++ b/src/rgb/color_cycle_v5.c @@ -3,7 +3,7 @@ * @author SpeedyPotato **/ const uint64_t timeout_us = 600000000; // 600000000us = 10min -const double WS2812B_BRIGHTNESS = 0.5; +const double WS2812B_BRIGHTNESS = 0.2; const RGB_t COLOR_BLACK = {0, 0, 0}; const RGB_t SW_LABEL_COLORS[] = { {255, 255, 255}, // START @@ -35,6 +35,9 @@ void ws2812b_color_cycle_v5(uint32_t counter) { for (int i = 0; i < WS2812B_LED_SIZE; i++) ws2812b_data[i] = COLOR_BLACK; } else { RGB_t base_color = color_wheel_rgbt(counter); + base_color.r *= WS2812B_BRIGHTNESS; + base_color.g *= WS2812B_BRIGHTNESS; + base_color.b *= WS2812B_BRIGHTNESS; /* Peripheral RGB */ for (int i = (SW_GPIO_SIZE - 2) * 2; i < WS2812B_LED_SIZE; i++) { if (time_us_64() - reactive_timeout_timestamp >= REACTIVE_TIMEOUT_MAX) { @@ -81,8 +84,7 @@ void ws2812b_color_cycle_v5(uint32_t counter) { } } for (int i = 0; i < WS2812B_LED_SIZE; ++i) { - put_pixel(urgb_u32(ws2812b_data[i].r * WS2812B_BRIGHTNESS, - ws2812b_data[i].g * WS2812B_BRIGHTNESS, - ws2812b_data[i].b * WS2812B_BRIGHTNESS)); + put_pixel( + urgb_u32(ws2812b_data[i].r, ws2812b_data[i].g, ws2812b_data[i].b)); } } \ No newline at end of file