Skip to content

Commit c5119c8

Browse files
committed
Remove NO_CIE1931 to better sit with other Gamma correction changes in WLED
1 parent 6c718c3 commit c5119c8

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

platformio_override.sample.ini

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -549,11 +549,12 @@ platform_packages =
549549
build_unflags = ${common.build_unflags}
550550
build_flags = ${common.build_flags}
551551
-D WLED_RELEASE_NAME=\"ESP32_hub75\"
552-
-D WLED_ENABLE_HUB75MATRIX -D NO_GFX -D NO_CIE1931
553-
; -D ESP32_FORUM_PINOUT ;; enable for SmartMatrix default pins
552+
-D WLED_ENABLE_HUB75MATRIX -D NO_GFX
553+
-D LED_TYPES=65
554+
-D WLED_DEBUG_BUS
554555
; -D WLED_DEBUG
555556
lib_deps = ${esp32_idf_V4.lib_deps}
556-
https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA.git#3.0.11
557+
https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA.git#3.0.12
557558

558559
monitor_filters = esp32_exception_decoder
559560
board_build.partitions = ${esp32.default_partitions}
@@ -563,11 +564,14 @@ board_build.flash_mode = dio
563564
extends = env:esp32dev_hub75
564565
build_flags = ${common.build_flags}
565566
-D WLED_RELEASE_NAME=\"ESP32_hub75_forum_pinout\"
566-
-D WLED_ENABLE_HUB75MATRIX -D NO_GFX -D NO_CIE1931
567+
-D WLED_ENABLE_HUB75MATRIX -D NO_GFX
567568
-D ESP32_FORUM_PINOUT ;; enable for SmartMatrix default pins
569+
-D LED_TYPES=65
570+
-D WLED_DEBUG_BUS
568571
; -D WLED_DEBUG
569572

570573

574+
571575
[env:adafruit_matrixportal_esp32s3]
572576
; ESP32-S3 processor, 8 MB flash, 2 MB of PSRAM, dedicated driver pins for HUB75
573577
board = adafruit_matrixportal_esp32s3
@@ -581,9 +585,12 @@ build_flags = ${common.build_flags} ${esp32s3.build_flags} -D WLED_RELEASE_NAME=
581585
-DLOLIN_WIFI_FIX ; seems to work much better with this
582586
-D WLED_WATCHDOG_TIMEOUT=0
583587
${esp32.AR_build_flags}
584-
-D WLED_ENABLE_HUB75MATRIX -D NO_GFX -D NO_CIE1931
588+
-D WLED_ENABLE_HUB75MATRIX -D NO_GFX
585589
-D S3_LCD_DIV_NUM=20 ;; Attempt to fix wifi performance issue when panel active with S3 chips
586590
-D ARDUINO_ADAFRUIT_MATRIXPORTAL_ESP32S3
591+
-D LED_TYPES=65
592+
-D WLED_DEBUG_BUS
593+
587594

588595
lib_deps = ${esp32s3.lib_deps}
589596
${esp32.AR_lib_deps}
@@ -607,9 +614,11 @@ build_flags = ${common.build_flags} ${esp32s3.build_flags} -D WLED_RELEASE_NAME=
607614
-DLOLIN_WIFI_FIX ; seems to work much better with this
608615
-D WLED_WATCHDOG_TIMEOUT=0
609616
${esp32.AR_build_flags}
610-
-D WLED_ENABLE_HUB75MATRIX -D NO_GFX -D NO_CIE1931
617+
-D WLED_ENABLE_HUB75MATRIX -D NO_GFX
611618
-D S3_LCD_DIV_NUM=20 ;; Attempt to fix wifi performance issue when panel active with S3 chips
612619
-D MOONHUB_S3_PINOUT ;; HUB75 pinout
620+
-D LED_TYPES=65
621+
-D WLED_DEBUG_BUS
613622

614623
lib_deps = ${esp32s3.lib_deps}
615624
${esp32.AR_lib_deps}

wled00/bus_manager.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,9 +1021,6 @@ void __attribute__((hot)) BusHub75Matrix::setPixelColor(unsigned pix, uint32_t c
10211021
if ((c == IS_BLACK) && (getBitFromArray(_ledsDirty, pix) == false)) return; // ignore black if pixel is already black
10221022
setBitInArray(_ledsDirty, pix, c != IS_BLACK); // dirty = true means "color is not BLACK"
10231023

1024-
#ifndef NO_CIE1931
1025-
c = unGamma24(c); // to use the driver linear brightness feature, we first need to undo WLED gamma correction
1026-
#endif
10271024
uint8_t r = R(c);
10281025
uint8_t g = G(c);
10291026
uint8_t b = B(c);
@@ -1069,9 +1066,6 @@ void BusHub75Matrix::show(void) {
10691066
for (int y=0; y<height; y++) for (int x=0; x<width; x++) {
10701067
if (getBitFromArray(_ledsDirty, pix) == true) { // only repaint the "dirty" pixels
10711068
uint32_t c = uint32_t(_ledBuffer[pix]) & 0x00FFFFFF; // get RGB color, removing FastLED "alpha" component
1072-
#ifndef NO_CIE1931
1073-
c = unGamma24(c); // to use the driver linear brightness feature, we first need to undo WLED gamma correction
1074-
#endif
10751069
uint8_t r = R(c);
10761070
uint8_t g = G(c);
10771071
uint8_t b = B(c);

0 commit comments

Comments
 (0)