Move WebUI image calculation after sensors.h (#1142)

xoseperez · Aug 25, 2018 · a7c3361 · a7c3361
1 parent cc38f37
commit a7c3361
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 51 deletions.
diff --git a/code/espurna/config/all.h b/code/espurna/config/all.h
@@ -32,6 +32,7 @@
 #include "dependencies.h"
 #include "prototypes.h"
 #include "sensors.h"
+#include "webui.h"
 #include "progmem.h"
 #include "debug.h"
 

diff --git a/code/espurna/config/dependencies.h b/code/espurna/config/dependencies.h
@@ -53,54 +53,3 @@
 #undef NTP_SUPPORT
 #define NTP_SUPPORT                 1           // Scheduler needs NTP
 #endif
-
-// -----------------------------------------------------------------------------
-// WEB UI IMAGE
-// -----------------------------------------------------------------------------
-
-#define WEBUI_IMAGE_SMALL      0
-#define WEBUI_IMAGE_LIGHT      1
-#define WEBUI_IMAGE_SENSOR     2
-#define WEBUI_IMAGE_RFBRIDGE   4
-#define WEBUI_IMAGE_RFM69      8
-#define WEBUI_IMAGE_FULL       15
-
-#if LIGHT_PROVIDER != LIGHT_PROVIDER_NONE
-    #ifdef WEBUI_IMAGE
-        #undef WEBUI_IMAGE
-        #define WEBUI_IMAGE    WEBUI_IMAGE_FULL
-    #else
-        #define WEBUI_IMAGE    WEBUI_IMAGE_LIGHT
-    #endif
-#endif
-
-#if SENSOR_SUPPORT == 1
-    #ifndef WEBUI_IMAGE
-        #define WEBUI_IMAGE    WEBUI_IMAGE_SENSOR
-    #else
-        #undef WEBUI_IMAGE
-        #define WEBUI_IMAGE    WEBUI_IMAGE_FULL
-    #endif
-#endif
-
-#if defined(ITEAD_SONOFF_RFBRIDGE)
-    #ifndef WEBUI_IMAGE
-        #define WEBUI_IMAGE    WEBUI_IMAGE_RFBRIDGE
-    #else
-        #undef WEBUI_IMAGE
-        #define WEBUI_IMAGE    WEBUI_IMAGE_FULL
-    #endif
-#endif
-
-#if RFM69_SUPPORT == 1
-    #ifndef WEBUI_IMAGE
-        #define WEBUI_IMAGE    WEBUI_IMAGE_RFM69
-    #else
-        #undef WEBUI_IMAGE
-        #define WEBUI_IMAGE    WEBUI_IMAGE_FULL
-    #endif
-#endif
-
-#ifndef WEBUI_IMAGE
-    #define WEBUI_IMAGE        WEBUI_IMAGE_SMALL
-#endif
diff --git a/code/espurna/config/webui.h b/code/espurna/config/webui.h
@@ -0,0 +1,50 @@
+// -----------------------------------------------------------------------------
+// WEB UI IMAGE
+// -----------------------------------------------------------------------------
+
+#define WEBUI_IMAGE_SMALL      0
+#define WEBUI_IMAGE_LIGHT      1
+#define WEBUI_IMAGE_SENSOR     2
+#define WEBUI_IMAGE_RFBRIDGE   4
+#define WEBUI_IMAGE_RFM69      8
+#define WEBUI_IMAGE_FULL       15
+
+#if LIGHT_PROVIDER != LIGHT_PROVIDER_NONE
+    #ifdef WEBUI_IMAGE
+        #undef WEBUI_IMAGE
+        #define WEBUI_IMAGE    WEBUI_IMAGE_FULL
+    #else
+        #define WEBUI_IMAGE    WEBUI_IMAGE_LIGHT
+    #endif
+#endif
+
+#if SENSOR_SUPPORT == 1
+    #ifndef WEBUI_IMAGE
+        #define WEBUI_IMAGE    WEBUI_IMAGE_SENSOR
+    #else
+        #undef WEBUI_IMAGE
+        #define WEBUI_IMAGE    WEBUI_IMAGE_FULL
+    #endif
+#endif
+
+#if defined(ITEAD_SONOFF_RFBRIDGE)
+    #ifndef WEBUI_IMAGE
+        #define WEBUI_IMAGE    WEBUI_IMAGE_RFBRIDGE
+    #else
+        #undef WEBUI_IMAGE
+        #define WEBUI_IMAGE    WEBUI_IMAGE_FULL
+    #endif
+#endif
+
+#if RFM69_SUPPORT == 1
+    #ifndef WEBUI_IMAGE
+        #define WEBUI_IMAGE    WEBUI_IMAGE_RFM69
+    #else
+        #undef WEBUI_IMAGE
+        #define WEBUI_IMAGE    WEBUI_IMAGE_FULL
+    #endif
+#endif
+
+#ifndef WEBUI_IMAGE
+    #define WEBUI_IMAGE        WEBUI_IMAGE_SMALL
+#endif