Merge pull request #3783 from shammy642/virtual-artnet-rgbw

Add virtual Art-Net RGBW option
This commit is contained in:
Blaž Kristan 2024-02-29 14:57:42 +01:00 committed by GitHub
commit c40b6088ee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 0 deletions

View File

@ -554,6 +554,10 @@ BusNetwork::BusNetwork(BusConfig &bc)
_rgbw = false; _rgbw = false;
_UDPtype = 2; _UDPtype = 2;
break; break;
case TYPE_NET_ARTNET_RGBW:
_rgbw = true;
_UDPtype = 2;
break;
case TYPE_NET_E131_RGB: case TYPE_NET_E131_RGB:
_rgbw = false; _rgbw = false;
_UDPtype = 1; _UDPtype = 1;

View File

@ -285,6 +285,7 @@
#define TYPE_NET_E131_RGB 81 //network E131 RGB bus (master broadcast bus, unused) #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_RGB 82 //network ArtNet RGB bus (master broadcast bus, unused)
#define TYPE_NET_DDP_RGBW 88 //network DDP RGBW bus (master broadcast bus) #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_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 #define IS_DIGITAL(t) (((t) > 15 && (t) < 40) || ((t) > 47 && (t) < 64)) //digital are 16-39 and 48-63

View File

@ -401,6 +401,7 @@ ${i+1}:
<!--option value="81">E1.31 RGB (network)</option--> <!--option value="81">E1.31 RGB (network)</option-->
<option value="82">Art-Net RGB (network)</option> <option value="82">Art-Net RGB (network)</option>
<option value="88">DDP RGBW (network)</option> <option value="88">DDP RGBW (network)</option>
<option value="89">Art-Net RGBW (network)</option>
</select><br> </select><br>
<div id="abl${i}"> <div id="abl${i}">
mA/LED: <select name="LAsel${i}" onchange="enLA(this,${i});UI();"> mA/LED: <select name="LAsel${i}" onchange="enLA(this,${i});UI();">