From 93bccb96b67a4e6be0114c111ef8585e8e8ce99f Mon Sep 17 00:00:00 2001 From: Blaz Kristan Date: Wed, 9 Feb 2022 17:16:22 +0100 Subject: [PATCH] Minor fixes - prevent setValuesFromMainSegment affecting segments - add ability to define default IR remote at compile time --- wled00/led.cpp | 10 ++++++++-- wled00/wled.h | 8 ++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/wled00/led.cpp b/wled00/led.cpp index 91ffcb4c..1bf535ac 100644 --- a/wled00/led.cpp +++ b/wled00/led.cpp @@ -6,8 +6,14 @@ void setValuesFromMainSeg() { WS2812FX::Segment& seg = strip.getSegment(strip.getMainSegmentId()); - colorFromUint32(seg.colors[0]); - colorFromUint32(seg.colors[1], true); + col[0] = R(seg.colors[0]); + col[1] = G(seg.colors[0]); + col[2] = B(seg.colors[0]); + col[3] = W(seg.colors[0]); + colSec[0] = R(seg.colors[1]); + colSec[1] = G(seg.colors[1]); + colSec[2] = B(seg.colors[1]); + colSec[3] = W(seg.colors[1]); effectCurrent = seg.mode; effectSpeed = seg.speed; effectIntensity = seg.intensity; diff --git a/wled00/wled.h b/wled00/wled.h index efb05e9c..005ff489 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -8,7 +8,7 @@ */ // version code in format yymmddb (b = daily build) -#define VERSION 2202061 +#define VERSION 2202091 //uncomment this if you have a "my_config.h" file you'd like to use //#define WLED_USE_MY_CONFIG @@ -308,7 +308,11 @@ WLED_GLOBAL bool nodeListEnabled _INIT(true); WLED_GLOBAL bool nodeBroadcastEnabled _INIT(true); WLED_GLOBAL byte buttonType[WLED_MAX_BUTTONS] _INIT({BTN_TYPE_PUSH}); -WLED_GLOBAL byte irEnabled _INIT(0); // Infrared receiver +#if defined(IRTYPE) && defined(IRPIN) +WLED_GLOBAL byte irEnabled _INIT(IRTYPE); // Infrared receiver +#else +WLED_GLOBAL byte irEnabled _INIT(0); // Infrared receiver disabled +#endif WLED_GLOBAL bool irApplyToAllSelected _INIT(true); //apply IR to all selected segments WLED_GLOBAL uint16_t udpPort _INIT(21324); // WLED notifier default port