From c6f575d8d3a9ee8baf214ae6a3e9da02d5f3dc6a Mon Sep 17 00:00:00 2001
From: Blaz Kristan <blaz@kristan-sp.si>
Date: Fri, 26 Feb 2021 16:05:05 +0100
Subject: [PATCH] Preprocessor fix.

---
 wled00/bus_manager.h | 6 +++++-
 wled00/wled.h        | 4 ----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 8df8def10..d911e612b 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -10,6 +10,10 @@
 #include "bus_wrapper.h"
 #include <Arduino.h>
 
+#define GET_BIT(var,bit)    ((var>>bit)&0x01)
+#define SET_BIT(var,bit)    (var|=(uint16_t)(0x0001<<bit))
+#define UNSET_BIT(var,bit)  (var&=(~(uint16_t)(0x0001<<bit)))
+
 //temporary struct for passing bus configuration to bus
 struct BusConfig {
   uint8_t type = TYPE_WS2812_RGB;
@@ -21,7 +25,7 @@ struct BusConfig {
   bool rgbwOverride = false;
   uint8_t pins[5] = {LEDPIN, 255, 255, 255, 255};
   BusConfig(uint8_t busType, uint8_t* ppins, uint16_t pstart, uint16_t len = 1, uint8_t pcolorOrder = COL_ORDER_GRB, bool rev = false, bool skip = false) {
-    rgbwOverride = GET_BIT(busType,7);
+    rgbwOverride = (bool) GET_BIT(busType,7);
     type = busType & 0x7F;  // bit 7 is hacked to include RGBW info (1=RGBW, 0=RGB)
     count = len; start = pstart; colorOrder = pcolorOrder; reversed = rev; skipFirst = skip;
     uint8_t nPins = 1;
diff --git a/wled00/wled.h b/wled00/wled.h
index ab7531878..547e9d534 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -605,10 +605,6 @@ WLED_GLOBAL UsermodManager usermods _INIT(UsermodManager());
 #define WLED_WIFI_CONFIGURED (strlen(clientSSID) >= 1 && strcmp(clientSSID, DEFAULT_CLIENT_SSID) != 0)
 #define WLED_MQTT_CONNECTED (mqtt != nullptr && mqtt->connected())
 
-#define GET_BIT(var,bit)    ((var>>bit)&0x01)
-#define SET_BIT(var,bit)    (var|=(uint16_t)(0x0001<<bit))
-#define UNSET_BIT(var,bit)  (var&=(~(uint16_t)(0x0001<<bit)))
-
 // append new c string to temp buffer efficiently
 bool oappend(const char* txt);
 // append new number to temp buffer efficiently