diff --git a/examples/gui/data/js/controls.js b/examples/gui/data/js/controls.js index b4f4c1a..d9422bd 100644 --- a/examples/gui/data/js/controls.js +++ b/examples/gui/data/js/controls.js @@ -21,6 +21,7 @@ const C_WETASPHALT = 3; const C_SUNFLOWER = 4; const C_CARROT = 5; const C_ALIZARIN = 6; +const C_NONE = 7; function colorClass(colorId){ colorId = Number(colorId); @@ -52,8 +53,13 @@ function colorClass(colorId){ case C_ALIZARIN: return "alizarin" break; + + case C_NONE: + return "" + break; + default: - return "alizarin"; + return ""; } } diff --git a/examples/gui/gui.ino b/examples/gui/gui.ino index e2558f3..8a34296 100644 --- a/examples/gui/gui.ino +++ b/examples/gui/gui.ino @@ -32,15 +32,23 @@ void setup(void) { Serial.println(WiFi.localIP()); */ - ESPUI.label("Status:", 0, "Stop"); - ESPUI.label("Millis:", 1, "0"); - ESPUI.button("Push Button", &buttonCallback, 2); - ESPUI.button("Other Button", &buttonExample, 3, "Press" ); - ESPUI.pad("Pad with center", true, &padExample, 4); - ESPUI.pad("Pad without center", false, &padExample, 5); - ESPUI.switcher("Switch one", false, &switchExample, 6); - ESPUI.switcher("Switch two", true, &otherSwitchExample, 0); + ESPUI.label("Status:", COLOR_TURQUOISE, "Stop"); + ESPUI.label("Millis:", COLOR_EMERALD, "0"); + ESPUI.button("Push Button", &buttonCallback, COLOR_PETERRIVER); + ESPUI.button("Other Button", &buttonExample, COLOR_WETASPHALT, "Press" ); + ESPUI.pad("Pad with center", true, &padExample, COLOR_SUNFLOWER); + ESPUI.pad("Pad without center", false, &padExample, COLOR_CARROT); + ESPUI.switcher("Switch one", false, &switchExample, COLOR_ALIZARIN); + ESPUI.switcher("Switch two", true, &otherSwitchExample, COLOR_TURQUOISE); + + #define COLOR_TURQUOISE 0 + #define COLOR_EMERALD 1 + #define COLOR_PETERRIVER 2 + #define COLOR_WETASPHALT 3 + #define COLOR_SUNFLOWER 4 + #define COLOR_CARROT 5 + #define COLOR_ALIZARIN 6 ESPUI.begin("ESP32 Control"); } diff --git a/src/ESPUI.h b/src/ESPUI.h index 0cac448..80a26e0 100644 --- a/src/ESPUI.h +++ b/src/ESPUI.h @@ -63,6 +63,7 @@ typedef struct Control { #define COLOR_SUNFLOWER 4 #define COLOR_CARROT 5 #define COLOR_ALIZARIN 6 +#define COLOR_NONE 6 class ESPUIClass {