From fdbcb61a12d009bf665841abacd9f15d4d8d7bb6 Mon Sep 17 00:00:00 2001 From: shammy642 Date: Thu, 29 Feb 2024 08:27:11 +0000 Subject: [PATCH 1/2] Rebased to 0.15 --- wled00/bus_manager.cpp | 4 ++++ wled00/const.h | 1 + wled00/data/settings_leds.htm | 1 + 3 files changed, 6 insertions(+) diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp index 16701bbb7..f1da92806 100755 --- a/wled00/bus_manager.cpp +++ b/wled00/bus_manager.cpp @@ -554,6 +554,10 @@ BusNetwork::BusNetwork(BusConfig &bc) _rgbw = false; _UDPtype = 2; break; + case TYPE_NET_ARTNET_RGBW: + _rgbw = true; + _UDPtype = 2; + break; case TYPE_NET_E131_RGB: _rgbw = false; _UDPtype = 1; diff --git a/wled00/const.h b/wled00/const.h index da6fa85f6..6ce09c0ab 100644 --- a/wled00/const.h +++ b/wled00/const.h @@ -284,6 +284,7 @@ #define TYPE_NET_DDP_RGB 80 //network DDP RGB bus (master broadcast bus) #define TYPE_NET_E131_RGB 81 //network E131 RGB bus (master broadcast bus, unused) #define TYPE_NET_ARTNET_RGB 82 //network ArtNet RGB bus (master broadcast bus, unused) +#define TYPE_NET_ARTNET_RGBW 83 //network ArtNet RGB bus (master broadcast bus, unused) #define TYPE_NET_DDP_RGBW 88 //network DDP RGBW bus (master broadcast bus) #define IS_TYPE_VALID(t) ((t) > 15 && (t) < 128) diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm index 654c99a54..9267b6a5d 100644 --- a/wled00/data/settings_leds.htm +++ b/wled00/data/settings_leds.htm @@ -400,6 +400,7 @@ ${i+1}: +
From 0d1a254ca87e5b010c6845d1e84448cf59146467 Mon Sep 17 00:00:00 2001 From: shammy642 Date: Thu, 29 Feb 2024 12:47:45 +0000 Subject: [PATCH 2/2] Changed values to 89 --- wled00/const.h | 2 +- wled00/data/settings_leds.htm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wled00/const.h b/wled00/const.h index 6ce09c0ab..30a045319 100644 --- a/wled00/const.h +++ b/wled00/const.h @@ -284,8 +284,8 @@ #define TYPE_NET_DDP_RGB 80 //network DDP RGB bus (master broadcast bus) #define TYPE_NET_E131_RGB 81 //network E131 RGB bus (master broadcast bus, unused) #define TYPE_NET_ARTNET_RGB 82 //network ArtNet RGB bus (master broadcast bus, unused) -#define TYPE_NET_ARTNET_RGBW 83 //network ArtNet RGB bus (master broadcast bus, unused) #define TYPE_NET_DDP_RGBW 88 //network DDP RGBW bus (master broadcast bus) +#define TYPE_NET_ARTNET_RGBW 89 //network ArtNet RGB bus (master broadcast bus, unused) #define IS_TYPE_VALID(t) ((t) > 15 && (t) < 128) #define IS_DIGITAL(t) (((t) > 15 && (t) < 40) || ((t) > 47 && (t) < 64)) //digital are 16-39 and 48-63 diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm index 9267b6a5d..611653a64 100644 --- a/wled00/data/settings_leds.htm +++ b/wled00/data/settings_leds.htm @@ -400,8 +400,8 @@ ${i+1}: - +
mA/LED: