Merge pull request #4524 from ascillato/patch-1

Fix Compilation issue with STAGE Core
2018-12-04 08:59:47 +01:00 · 2018-12-04 08:59:47 +01:00 · e1546b3fe6
parent fd8af87c80 24ef9ab6b8
commit e1546b3fe6
1 changed files with 2 additions and 0 deletions
--- 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