From 24ef9ab6b87dbf6f2e5106e4b1bb57a42d1bf84e Mon Sep 17 00:00:00 2001 From: Adrian Scillato <35405447+ascillato@users.noreply.github.com> Date: Mon, 3 Dec 2018 17:38:31 -0300 Subject: [PATCH] Fix Compilation issue with STAGE Core Now the Stage core has the the same STR macro defined in sonoff.h. --- sonoff/sonoff.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sonoff/sonoff.h b/sonoff/sonoff.h index fd8beca70..4a54f81be 100644 --- a/sonoff/sonoff.h +++ b/sonoff/sonoff.h @@ -152,7 +152,9 @@ typedef unsigned long power_t; // Power (Relay) type #define tmax(a,b) ((a)>(b)?(a):(b)) #define STR_HELPER(x) #x +#ifndef STR #define STR(x) STR_HELPER(x) +#endif //enum ws2812NeopixelbusFeature { NEO_RGB, NEO_GRB, NEO_BRG, NEO_RBG, NEO_3LED, NEO_RGBW, NEO_GRBW }; // Doesn't work #define NEO_RGB 0 // Neopixel RGB leds