From e53a2e7b43ec6f0882c1d10725c08f4ef0327978 Mon Sep 17 00:00:00 2001 From: Blaz Kristan Date: Thu, 7 Oct 2021 15:43:36 +0200 Subject: [PATCH] Conflict merge (warning) fix. --- wled00/const.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/wled00/const.h b/wled00/const.h index 1c0c204b7..52094624d 100644 --- a/wled00/const.h +++ b/wled00/const.h @@ -127,10 +127,6 @@ #define TYPE_NONE 0 //light is not configured #define TYPE_RESERVED 1 //unused. Might indicate a "virtual" light -//network types (master broadcast) (10-15) -#define TYPE_NET_DDP_RGB 10 //network DDP RGB bus (master broadcast bus) -#define TYPE_NET_E131_RGB 11 //network E131 RGB bus (master broadcast bus) -#define TYPE_NET_ARTNET_RGB 12 //network ArtNet RGB bus (master broadcast bus) //Digital types (data pin only) (16-31) #define TYPE_WS2812_1CH 20 //white-only chips #define TYPE_WS2812_WWA 21 //amber + warm + cold white