From 3cbae2ff1b4971effca709025795c60a737d4121 Mon Sep 17 00:00:00 2001 From: Lukas Bachschwell Date: Tue, 4 Jan 2022 11:20:04 +0100 Subject: [PATCH] Reformat examples Signed-off-by: Lukas Bachschwell --- examples/gui-generic-api/gui-generic-api.ino | 382 +++++++++--------- examples/gui/gui.ino | 390 ++++++++++--------- examples/tabbedGui/tabbedGui.ino | 349 +++++++++-------- pio_examples/gui/src/gui.ino | 4 +- 4 files changed, 597 insertions(+), 528 deletions(-) diff --git a/examples/gui-generic-api/gui-generic-api.ino b/examples/gui-generic-api/gui-generic-api.ino index 9449728..05bb1c9 100644 --- a/examples/gui-generic-api/gui-generic-api.ino +++ b/examples/gui-generic-api/gui-generic-api.ino @@ -11,252 +11,278 @@ DNSServer dnsServer; #include #endif -const char *ssid = "ESPUI"; -const char *password = "espui"; -const char *hostname = "espui"; +const char* ssid = "ESPUI"; +const char* password = "espui"; +const char* hostname = "espui"; uint16_t status; uint16_t button1; uint16_t millisLabelId; uint16_t switchOne; -void numberCall( Control* sender, int type ) { - Serial.println( sender->value ); +void numberCall(Control* sender, int type) +{ + Serial.println(sender->value); } -void textCall(Control *sender, int type) { - Serial.print("Text: ID: "); - Serial.print(sender->id); - Serial.print(", Value: "); - Serial.println(sender->value); +void textCall(Control* sender, int type) +{ + Serial.print("Text: ID: "); + Serial.print(sender->id); + Serial.print(", Value: "); + Serial.println(sender->value); } -void slider(Control *sender, int type) { - Serial.print("Slider: ID: "); - Serial.print(sender->id); - Serial.print(", Value: "); - Serial.println(sender->value); +void slider(Control* sender, int type) +{ + Serial.print("Slider: ID: "); + Serial.print(sender->id); + Serial.print(", Value: "); + Serial.println(sender->value); } -void buttonCallback(Control *sender, int type) { - switch (type) { - case B_DOWN: - Serial.println("Button DOWN"); - break; +void buttonCallback(Control* sender, int type) +{ + switch (type) + { + case B_DOWN: + Serial.println("Button DOWN"); + break; - case B_UP: - Serial.println("Button UP"); - break; - } + case B_UP: + Serial.println("Button UP"); + break; + } } -void buttonExample(Control *sender, int type) { - switch (type) { - case B_DOWN: - Serial.println("Status: Start"); - ESPUI.updateControlValue(status, "Start"); +void buttonExample(Control* sender, int type) +{ + switch (type) + { + case B_DOWN: + Serial.println("Status: Start"); + ESPUI.updateControlValue(status, "Start"); - ESPUI.getControl(button1)->color = ControlColor::Carrot; - ESPUI.updateControl(button1); - break; + ESPUI.getControl(button1)->color = ControlColor::Carrot; + ESPUI.updateControl(button1); + break; - case B_UP: - Serial.println("Status: Stop"); - ESPUI.updateControlValue(status, "Stop"); + case B_UP: + Serial.println("Status: Stop"); + ESPUI.updateControlValue(status, "Stop"); - ESPUI.getControl(button1)->color = ControlColor::Peterriver; - ESPUI.updateControl(button1); - break; - } + ESPUI.getControl(button1)->color = ControlColor::Peterriver; + ESPUI.updateControl(button1); + break; + } } -void padExample(Control *sender, int value) { - switch (value) { - case P_LEFT_DOWN: - Serial.print("left down"); - break; +void padExample(Control* sender, int value) +{ + switch (value) + { + case P_LEFT_DOWN: + Serial.print("left down"); + break; - case P_LEFT_UP: - Serial.print("left up"); - break; + case P_LEFT_UP: + Serial.print("left up"); + break; - case P_RIGHT_DOWN: - Serial.print("right down"); - break; + case P_RIGHT_DOWN: + Serial.print("right down"); + break; - case P_RIGHT_UP: - Serial.print("right up"); - break; + case P_RIGHT_UP: + Serial.print("right up"); + break; - case P_FOR_DOWN: - Serial.print("for down"); - break; + case P_FOR_DOWN: + Serial.print("for down"); + break; - case P_FOR_UP: - Serial.print("for up"); - break; + case P_FOR_UP: + Serial.print("for up"); + break; - case P_BACK_DOWN: - Serial.print("back down"); - break; + case P_BACK_DOWN: + Serial.print("back down"); + break; - case P_BACK_UP: - Serial.print("back up"); - break; + case P_BACK_UP: + Serial.print("back up"); + break; - case P_CENTER_DOWN: - Serial.print("center down"); - break; + case P_CENTER_DOWN: + Serial.print("center down"); + break; - case P_CENTER_UP: - Serial.print("center up"); - break; - } + case P_CENTER_UP: + Serial.print("center up"); + break; + } - Serial.print(" "); - Serial.println(sender->id); + Serial.print(" "); + Serial.println(sender->id); } -void switchExample(Control *sender, int value) { - switch (value) { - case S_ACTIVE: - Serial.print("Active:"); - break; +void switchExample(Control* sender, int value) +{ + switch (value) + { + case S_ACTIVE: + Serial.print("Active:"); + break; - case S_INACTIVE: - Serial.print("Inactive"); - break; - } + case S_INACTIVE: + Serial.print("Inactive"); + break; + } - Serial.print(" "); - Serial.println(sender->id); + Serial.print(" "); + Serial.println(sender->id); } -void selectExample(Control *sender, int value) { - Serial.print("Select: ID: "); - Serial.print(sender->id); - Serial.print(", Value: "); - Serial.println(sender->value); +void selectExample(Control* sender, int value) +{ + Serial.print("Select: ID: "); + Serial.print(sender->id); + Serial.print(", Value: "); + Serial.println(sender->value); } -void otherSwitchExample(Control *sender, int value) { - switch (value) { - case S_ACTIVE: - Serial.print("Active:"); - break; +void otherSwitchExample(Control* sender, int value) +{ + switch (value) + { + case S_ACTIVE: + Serial.print("Active:"); + break; - case S_INACTIVE: - Serial.print("Inactive"); - break; - } + case S_INACTIVE: + Serial.print("Inactive"); + break; + } - Serial.print(" "); - Serial.println(sender->id); + Serial.print(" "); + Serial.println(sender->id); } -void setup(void) { - ESPUI.setVerbosity(Verbosity::VerboseJSON); - Serial.begin(115200); +void setup(void) +{ + ESPUI.setVerbosity(Verbosity::VerboseJSON); + Serial.begin(115200); #if defined(ESP32) - WiFi.setHostname(hostname); + WiFi.setHostname(hostname); #else - WiFi.hostname(hostname); + WiFi.hostname(hostname); #endif - // try to connect to existing network - WiFi.begin(ssid, password); - Serial.print("\n\nTry to connect to existing network"); + // try to connect to existing network + WiFi.begin(ssid, password); + Serial.print("\n\nTry to connect to existing network"); - { - uint8_t timeout = 10; + { + uint8_t timeout = 10; - // Wait for connection, 5s timeout - do { - delay(500); - Serial.print("."); - timeout--; - } while (timeout && WiFi.status() != WL_CONNECTED); + // Wait for connection, 5s timeout + do + { + delay(500); + Serial.print("."); + timeout--; + } while (timeout && WiFi.status() != WL_CONNECTED); - // not connected -> create hotspot - if (WiFi.status() != WL_CONNECTED) { - Serial.print("\n\nCreating hotspot"); + // not connected -> create hotspot + if (WiFi.status() != WL_CONNECTED) + { + Serial.print("\n\nCreating hotspot"); - WiFi.mode(WIFI_AP); - WiFi.softAPConfig(apIP, apIP, IPAddress(255, 255, 255, 0)); - WiFi.softAP(ssid); + WiFi.mode(WIFI_AP); + WiFi.softAPConfig(apIP, apIP, IPAddress(255, 255, 255, 0)); + WiFi.softAP(ssid); - timeout = 5; + timeout = 5; - do { - delay(500); - Serial.print("."); - timeout--; - } while (timeout); + do + { + delay(500); + Serial.print("."); + timeout--; + } while (timeout); + } } - } - dnsServer.start(DNS_PORT, "*", apIP); + dnsServer.start(DNS_PORT, "*", apIP); - Serial.println("\n\nWiFi parameters:"); - Serial.print("Mode: "); - Serial.println(WiFi.getMode() == WIFI_AP ? "Station" : "Client"); - Serial.print("IP address: "); - Serial.println(WiFi.getMode() == WIFI_AP ? WiFi.softAPIP() : WiFi.localIP()); + Serial.println("\n\nWiFi parameters:"); + Serial.print("Mode: "); + Serial.println(WiFi.getMode() == WIFI_AP ? "Station" : "Client"); + Serial.print("IP address: "); + Serial.println(WiFi.getMode() == WIFI_AP ? WiFi.softAPIP() : WiFi.localIP()); - status = ESPUI.addControl(ControlType::Label, "Status:", "Stop", ControlColor::Turquoise); + status = ESPUI.addControl(ControlType::Label, "Status:", "Stop", ControlColor::Turquoise); - uint16_t select1 = ESPUI.addControl(ControlType::Select, "Select:", "", ControlColor::Alizarin, Control::noParent, &selectExample); + uint16_t select1 = ESPUI.addControl( + ControlType::Select, "Select:", "", ControlColor::Alizarin, Control::noParent, &selectExample); - ESPUI.addControl(ControlType::Option, "Option1", "Opt1", ControlColor::Alizarin, select1); - ESPUI.addControl(ControlType::Option, "Option2", "Opt2", ControlColor::Alizarin, select1); - ESPUI.addControl(ControlType::Option, "Option3", "Opt3", ControlColor::Alizarin, select1); + ESPUI.addControl(ControlType::Option, "Option1", "Opt1", ControlColor::Alizarin, select1); + ESPUI.addControl(ControlType::Option, "Option2", "Opt2", ControlColor::Alizarin, select1); + ESPUI.addControl(ControlType::Option, "Option3", "Opt3", ControlColor::Alizarin, select1); - ESPUI.addControl(ControlType::Text, "Text Test:", "a Text Field", ControlColor::Alizarin, Control::noParent, &textCall); + ESPUI.addControl( + ControlType::Text, "Text Test:", "a Text Field", ControlColor::Alizarin, Control::noParent, &textCall); - millisLabelId = ESPUI.addControl(ControlType::Label, "Millis:", "0", ControlColor::Emerald, Control::noParent); - button1 = ESPUI.addControl(ControlType::Button, "Push Button", "Press", ControlColor::Peterriver, Control::noParent, &buttonCallback); - ESPUI.addControl(ControlType::Button, "Other Button", "Press", ControlColor::Wetasphalt, Control::noParent, &buttonExample); - ESPUI.addControl(ControlType::PadWithCenter, "Pad with center", "", ControlColor::Sunflower, Control::noParent, &padExample); - ESPUI.addControl(ControlType::Pad, "Pad without center", "", ControlColor::Carrot, Control::noParent, &padExample); - switchOne = ESPUI.addControl(ControlType::Switcher, "Switch one", "", ControlColor::Alizarin, Control::noParent, &switchExample); - ESPUI.addControl(ControlType::Switcher, "Switch two", "", ControlColor::None, Control::noParent, &otherSwitchExample); - ESPUI.addControl(ControlType::Slider, "Slider one", "30", ControlColor::Alizarin, Control::noParent, &slider); - ESPUI.addControl(ControlType::Slider, "Slider two", "100", ControlColor::Alizarin, Control::noParent, &slider); - ESPUI.addControl(ControlType::Number, "Number:", "50", ControlColor::Alizarin, Control::noParent, &numberCall); + millisLabelId = ESPUI.addControl(ControlType::Label, "Millis:", "0", ControlColor::Emerald, Control::noParent); + button1 = ESPUI.addControl( + ControlType::Button, "Push Button", "Press", ControlColor::Peterriver, Control::noParent, &buttonCallback); + ESPUI.addControl( + ControlType::Button, "Other Button", "Press", ControlColor::Wetasphalt, Control::noParent, &buttonExample); + ESPUI.addControl( + ControlType::PadWithCenter, "Pad with center", "", ControlColor::Sunflower, Control::noParent, &padExample); + ESPUI.addControl(ControlType::Pad, "Pad without center", "", ControlColor::Carrot, Control::noParent, &padExample); + switchOne = ESPUI.addControl( + ControlType::Switcher, "Switch one", "", ControlColor::Alizarin, Control::noParent, &switchExample); + ESPUI.addControl( + ControlType::Switcher, "Switch two", "", ControlColor::None, Control::noParent, &otherSwitchExample); + ESPUI.addControl(ControlType::Slider, "Slider one", "30", ControlColor::Alizarin, Control::noParent, &slider); + ESPUI.addControl(ControlType::Slider, "Slider two", "100", ControlColor::Alizarin, Control::noParent, &slider); + ESPUI.addControl(ControlType::Number, "Number:", "50", ControlColor::Alizarin, Control::noParent, &numberCall); - /* - * .begin loads and serves all files from PROGMEM directly. - * If you want to serve the files from SPIFFS use ESPUI.beginSPIFFS - * (.prepareFileSystem has to be run in an empty sketch before) - */ + /* + * .begin loads and serves all files from PROGMEM directly. + * If you want to serve the files from LITTLEFS use ESPUI.beginLITTLEFS + * (.prepareFileSystem has to be run in an empty sketch before) + */ - // Enable this option if you want sliders to be continuous (update during move) and not discrete (update on stop) - // ESPUI.sliderContinuous = true; + // Enable this option if you want sliders to be continuous (update during move) and not discrete (update on stop) + // ESPUI.sliderContinuous = true; - /* - * Optionally you can use HTTP BasicAuth. Keep in mind that this is NOT a - * SECURE way of limiting access. - * Anyone who is able to sniff traffic will be able to intercept your password - * since it is transmitted in cleartext. Just add a string as username and - * password, for example begin("ESPUI Control", "username", "password") - */ + /* + * Optionally you can use HTTP BasicAuth. Keep in mind that this is NOT a + * SECURE way of limiting access. + * Anyone who is able to sniff traffic will be able to intercept your password + * since it is transmitted in cleartext. Just add a string as username and + * password, for example begin("ESPUI Control", "username", "password") + */ - - ESPUI.begin("ESPUI Control"); + ESPUI.begin("ESPUI Control"); } -void loop(void) { - dnsServer.processNextRequest(); +void loop(void) +{ + dnsServer.processNextRequest(); - static long oldTime = 0; - static bool testSwitchState = false; + static long oldTime = 0; + static bool testSwitchState = false; - if (millis() - oldTime > 5000) { - ESPUI.updateControlValue(millisLabelId, String(millis())); - testSwitchState = !testSwitchState; - ESPUI.updateControlValue(switchOne, testSwitchState ? "1" : "0"); + if (millis() - oldTime > 5000) + { + ESPUI.updateControlValue(millisLabelId, String(millis())); + testSwitchState = !testSwitchState; + ESPUI.updateControlValue(switchOne, testSwitchState ? "1" : "0"); - oldTime = millis(); - } + oldTime = millis(); + } } diff --git a/examples/gui/gui.ino b/examples/gui/gui.ino index 33916c8..954ef2b 100644 --- a/examples/gui/gui.ino +++ b/examples/gui/gui.ino @@ -11,238 +11,258 @@ DNSServer dnsServer; #include #endif -const char *ssid = "ESPUI"; -const char *password = "espui"; +const char* ssid = "ESPUI"; +const char* password = "espui"; -const char *hostname = "espui"; +const char* hostname = "espui"; int statusLabelId; int graphId; int millisLabelId; int testSwitchId; -void numberCall(Control *sender, int type) { Serial.println(sender->value); } - -void textCall(Control *sender, int type) { - Serial.print("Text: ID: "); - Serial.print(sender->id); - Serial.print(", Value: "); - Serial.println(sender->value); +void numberCall(Control* sender, int type) +{ + Serial.println(sender->value); } -void slider(Control *sender, int type) { - Serial.print("Slider: ID: "); - Serial.print(sender->id); - Serial.print(", Value: "); - Serial.println(sender->value); - // Like all Control Values in ESPUI slider values are Strings. To use them as int simply do this: - int sliderValueWithOffset = sender->value.toInt() + 100; - Serial.print("SliderValue with offset"); - Serial.println(sliderValueWithOffset); +void textCall(Control* sender, int type) +{ + Serial.print("Text: ID: "); + Serial.print(sender->id); + Serial.print(", Value: "); + Serial.println(sender->value); } -void buttonCallback(Control *sender, int type) { - switch (type) { - case B_DOWN: - Serial.println("Button DOWN"); - break; - - case B_UP: - Serial.println("Button UP"); - break; - } +void slider(Control* sender, int type) +{ + Serial.print("Slider: ID: "); + Serial.print(sender->id); + Serial.print(", Value: "); + Serial.println(sender->value); + // Like all Control Values in ESPUI slider values are Strings. To use them as int simply do this: + int sliderValueWithOffset = sender->value.toInt() + 100; + Serial.print("SliderValue with offset"); + Serial.println(sliderValueWithOffset); } -void buttonExample(Control *sender, int type) { - switch (type) { - case B_DOWN: - Serial.println("Status: Start"); - ESPUI.print(statusLabelId, "Start"); - break; +void buttonCallback(Control* sender, int type) +{ + switch (type) + { + case B_DOWN: + Serial.println("Button DOWN"); + break; - case B_UP: - Serial.println("Status: Stop"); - ESPUI.print(statusLabelId, "Stop"); - break; - } -} -void padExample(Control *sender, int value) { - switch (value) { - case P_LEFT_DOWN: - Serial.print("left down"); - break; - - case P_LEFT_UP: - Serial.print("left up"); - break; - - case P_RIGHT_DOWN: - Serial.print("right down"); - break; - - case P_RIGHT_UP: - Serial.print("right up"); - break; - - case P_FOR_DOWN: - Serial.print("for down"); - break; - - case P_FOR_UP: - Serial.print("for up"); - break; - - case P_BACK_DOWN: - Serial.print("back down"); - break; - - case P_BACK_UP: - Serial.print("back up"); - break; - - case P_CENTER_DOWN: - Serial.print("center down"); - break; - - case P_CENTER_UP: - Serial.print("center up"); - break; - } - - Serial.print(" "); - Serial.println(sender->id); + case B_UP: + Serial.println("Button UP"); + break; + } } -void switchExample(Control *sender, int value) { - switch (value) { - case S_ACTIVE: - Serial.print("Active:"); - break; +void buttonExample(Control* sender, int type) +{ + switch (type) + { + case B_DOWN: + Serial.println("Status: Start"); + ESPUI.print(statusLabelId, "Start"); + break; - case S_INACTIVE: - Serial.print("Inactive"); - break; - } + case B_UP: + Serial.println("Status: Stop"); + ESPUI.print(statusLabelId, "Stop"); + break; + } +} +void padExample(Control* sender, int value) +{ + switch (value) + { + case P_LEFT_DOWN: + Serial.print("left down"); + break; - Serial.print(" "); - Serial.println(sender->id); + case P_LEFT_UP: + Serial.print("left up"); + break; + + case P_RIGHT_DOWN: + Serial.print("right down"); + break; + + case P_RIGHT_UP: + Serial.print("right up"); + break; + + case P_FOR_DOWN: + Serial.print("for down"); + break; + + case P_FOR_UP: + Serial.print("for up"); + break; + + case P_BACK_DOWN: + Serial.print("back down"); + break; + + case P_BACK_UP: + Serial.print("back up"); + break; + + case P_CENTER_DOWN: + Serial.print("center down"); + break; + + case P_CENTER_UP: + Serial.print("center up"); + break; + } + + Serial.print(" "); + Serial.println(sender->id); } -void otherSwitchExample(Control *sender, int value) { - switch (value) { - case S_ACTIVE: - Serial.print("Active:"); - break; +void switchExample(Control* sender, int value) +{ + switch (value) + { + case S_ACTIVE: + Serial.print("Active:"); + break; - case S_INACTIVE: - Serial.print("Inactive"); - break; - } + case S_INACTIVE: + Serial.print("Inactive"); + break; + } - Serial.print(" "); - Serial.println(sender->id); + Serial.print(" "); + Serial.println(sender->id); } -void setup(void) { - ESPUI.setVerbosity(Verbosity::VerboseJSON); - Serial.begin(115200); +void otherSwitchExample(Control* sender, int value) +{ + switch (value) + { + case S_ACTIVE: + Serial.print("Active:"); + break; + + case S_INACTIVE: + Serial.print("Inactive"); + break; + } + + Serial.print(" "); + Serial.println(sender->id); +} + +void setup(void) +{ + ESPUI.setVerbosity(Verbosity::VerboseJSON); + Serial.begin(115200); #if defined(ESP32) - WiFi.setHostname(hostname); + WiFi.setHostname(hostname); #else - WiFi.hostname(hostname); + WiFi.hostname(hostname); #endif - // try to connect to existing network - WiFi.begin(ssid, password); - Serial.print("\n\nTry to connect to existing network"); + // try to connect to existing network + WiFi.begin(ssid, password); + Serial.print("\n\nTry to connect to existing network"); - { - uint8_t timeout = 10; + { + uint8_t timeout = 10; - // Wait for connection, 5s timeout - do { - delay(500); - Serial.print("."); - timeout--; - } while (timeout && WiFi.status() != WL_CONNECTED); + // Wait for connection, 5s timeout + do + { + delay(500); + Serial.print("."); + timeout--; + } while (timeout && WiFi.status() != WL_CONNECTED); - // not connected -> create hotspot - if (WiFi.status() != WL_CONNECTED) { - Serial.print("\n\nCreating hotspot"); + // not connected -> create hotspot + if (WiFi.status() != WL_CONNECTED) + { + Serial.print("\n\nCreating hotspot"); - WiFi.mode(WIFI_AP); - WiFi.softAPConfig(apIP, apIP, IPAddress(255, 255, 255, 0)); - WiFi.softAP(ssid); + WiFi.mode(WIFI_AP); + WiFi.softAPConfig(apIP, apIP, IPAddress(255, 255, 255, 0)); + WiFi.softAP(ssid); - timeout = 5; + timeout = 5; - do { - delay(500); - Serial.print("."); - timeout--; - } while (timeout); + do + { + delay(500); + Serial.print("."); + timeout--; + } while (timeout); + } } - } - dnsServer.start(DNS_PORT, "*", apIP); + dnsServer.start(DNS_PORT, "*", apIP); - Serial.println("\n\nWiFi parameters:"); - Serial.print("Mode: "); - Serial.println(WiFi.getMode() == WIFI_AP ? "Station" : "Client"); - Serial.print("IP address: "); - Serial.println(WiFi.getMode() == WIFI_AP ? WiFi.softAPIP() : WiFi.localIP()); + Serial.println("\n\nWiFi parameters:"); + Serial.print("Mode: "); + Serial.println(WiFi.getMode() == WIFI_AP ? "Station" : "Client"); + Serial.print("IP address: "); + Serial.println(WiFi.getMode() == WIFI_AP ? WiFi.softAPIP() : WiFi.localIP()); - statusLabelId = ESPUI.label("Status:", ControlColor::Turquoise, "Stop"); - millisLabelId = ESPUI.label("Millis:", ControlColor::Emerald, "0"); - ESPUI.button("Push Button", &buttonCallback, ControlColor::Peterriver, "Press"); - ESPUI.button("Other Button", &buttonExample, ControlColor::Wetasphalt, "Press"); - ESPUI.padWithCenter("Pad with center", &padExample, ControlColor::Sunflower); - ESPUI.pad("Pad without center", &padExample, ControlColor::Carrot); - testSwitchId = ESPUI.switcher("Switch one", &switchExample, ControlColor::Alizarin, false); - ESPUI.switcher("Switch two", &otherSwitchExample, ControlColor::None, true); - ESPUI.slider("Slider one", &slider, ControlColor::Alizarin, 30); - ESPUI.slider("Slider two", &slider, ControlColor::None, 100); - ESPUI.text("Text Test:", &textCall, ControlColor::Alizarin, "a Text Field"); - ESPUI.number("Numbertest", &numberCall, ControlColor::Alizarin, 5, 0, 10); + statusLabelId = ESPUI.label("Status:", ControlColor::Turquoise, "Stop"); + millisLabelId = ESPUI.label("Millis:", ControlColor::Emerald, "0"); + ESPUI.button("Push Button", &buttonCallback, ControlColor::Peterriver, "Press"); + ESPUI.button("Other Button", &buttonExample, ControlColor::Wetasphalt, "Press"); + ESPUI.padWithCenter("Pad with center", &padExample, ControlColor::Sunflower); + ESPUI.pad("Pad without center", &padExample, ControlColor::Carrot); + testSwitchId = ESPUI.switcher("Switch one", &switchExample, ControlColor::Alizarin, false); + ESPUI.switcher("Switch two", &otherSwitchExample, ControlColor::None, true); + ESPUI.slider("Slider one", &slider, ControlColor::Alizarin, 30); + ESPUI.slider("Slider two", &slider, ControlColor::None, 100); + ESPUI.text("Text Test:", &textCall, ControlColor::Alizarin, "a Text Field"); + ESPUI.number("Numbertest", &numberCall, ControlColor::Alizarin, 5, 0, 10); - graphId = ESPUI.graph("Graph Test", ControlColor::Wetasphalt); + graphId = ESPUI.graph("Graph Test", ControlColor::Wetasphalt); - /* - * .begin loads and serves all files from PROGMEM directly. - * If you want to serve the files from SPIFFS use ESPUI.beginSPIFFS - * (.prepareFileSystem has to be run in an empty sketch before) - */ - - // Enable this option if you want sliders to be continuous (update during move) and not discrete (update on stop) - // ESPUI.sliderContinuous = true; + /* + * .begin loads and serves all files from PROGMEM directly. + * If you want to serve the files from LITTLEFS use ESPUI.beginLITTLEFS + * (.prepareFileSystem has to be run in an empty sketch before) + */ - /* - * Optionally you can use HTTP BasicAuth. Keep in mind that this is NOT a - * SECURE way of limiting access. - * Anyone who is able to sniff traffic will be able to intercept your password - * since it is transmitted in cleartext. Just add a string as username and - * password, for example begin("ESPUI Control", "username", "password") - */ + // Enable this option if you want sliders to be continuous (update during move) and not discrete (update on stop) + // ESPUI.sliderContinuous = true; + /* + * Optionally you can use HTTP BasicAuth. Keep in mind that this is NOT a + * SECURE way of limiting access. + * Anyone who is able to sniff traffic will be able to intercept your password + * since it is transmitted in cleartext. Just add a string as username and + * password, for example begin("ESPUI Control", "username", "password") + */ - ESPUI.begin("ESPUI Control"); + ESPUI.begin("ESPUI Control"); } -void loop(void) { - dnsServer.processNextRequest(); +void loop(void) +{ + dnsServer.processNextRequest(); - static long oldTime = 0; - static bool testSwitchState = false; + static long oldTime = 0; + static bool testSwitchState = false; - if (millis() - oldTime > 5000) { - ESPUI.print(millisLabelId, String(millis())); + if (millis() - oldTime > 5000) + { + ESPUI.print(millisLabelId, String(millis())); - ESPUI.addGraphPoint(graphId, random(1, 50)); + ESPUI.addGraphPoint(graphId, random(1, 50)); - testSwitchState = !testSwitchState; - ESPUI.updateSwitcher(testSwitchId, testSwitchState); - - oldTime = millis(); - } -} \ No newline at end of file + testSwitchState = !testSwitchState; + ESPUI.updateSwitcher(testSwitchId, testSwitchState); + + oldTime = millis(); + } +} diff --git a/examples/tabbedGui/tabbedGui.ino b/examples/tabbedGui/tabbedGui.ino index 66344aa..edc6428 100644 --- a/examples/tabbedGui/tabbedGui.ino +++ b/examples/tabbedGui/tabbedGui.ino @@ -2,7 +2,7 @@ #include const byte DNS_PORT = 53; -IPAddress apIP( 192, 168, 1, 1 ); +IPAddress apIP(192, 168, 1, 1); DNSServer dnsServer; #if defined(ESP32) @@ -19,244 +19,267 @@ uint16_t button1; uint16_t switchOne; uint16_t status; -void numberCall( Control* sender, int type ) { - Serial.println( sender->value ); +void numberCall(Control* sender, int type) +{ + Serial.println(sender->value); } -void textCall( Control* sender, int type ) { - Serial.print("Text: ID: "); - Serial.print(sender->id); - Serial.print(", Value: "); - Serial.println( sender->value );} +void textCall(Control* sender, int type) +{ + Serial.print("Text: ID: "); + Serial.print(sender->id); + Serial.print(", Value: "); + Serial.println(sender->value); +} -void slider( Control* sender, int type ) { - Serial.print("Slider: ID: "); - Serial.print(sender->id); - Serial.print(", Value: "); - Serial.println( sender->value );} +void slider(Control* sender, int type) +{ + Serial.print("Slider: ID: "); + Serial.print(sender->id); + Serial.print(", Value: "); + Serial.println(sender->value); +} -void buttonCallback( Control* sender, int type ) { - switch ( type ) { +void buttonCallback(Control* sender, int type) +{ + switch (type) + { case B_DOWN: - Serial.println( "Button DOWN" ); - break; + Serial.println("Button DOWN"); + break; case B_UP: - Serial.println( "Button UP" ); - break; - } + Serial.println("Button UP"); + break; + } } -void buttonExample( Control* sender, int type ) { - switch ( type ) { +void buttonExample(Control* sender, int type) +{ + switch (type) + { case B_DOWN: - Serial.println( "Status: Start" ); - ESPUI.updateControlValue( status, "Start" ); - - ESPUI.getControl( button1 )->color = ControlColor::Carrot; - ESPUI.updateControl( button1 ); - break; + Serial.println("Status: Start"); + ESPUI.updateControlValue(status, "Start"); + + ESPUI.getControl(button1)->color = ControlColor::Carrot; + ESPUI.updateControl(button1); + break; case B_UP: - Serial.println( "Status: Stop" ); - ESPUI.updateControlValue( status, "Stop" ); - - ESPUI.getControl( button1 )->color = ControlColor::Peterriver; - ESPUI.updateControl( button1 ); - break; - } + Serial.println("Status: Stop"); + ESPUI.updateControlValue(status, "Stop"); + + ESPUI.getControl(button1)->color = ControlColor::Peterriver; + ESPUI.updateControl(button1); + break; + } } -void padExample( Control* sender, int value ) { - switch ( value ) { +void padExample(Control* sender, int value) +{ + switch (value) + { case P_LEFT_DOWN: - Serial.print( "left down" ); - break; + Serial.print("left down"); + break; case P_LEFT_UP: - Serial.print( "left up" ); - break; + Serial.print("left up"); + break; case P_RIGHT_DOWN: - Serial.print( "right down" ); - break; + Serial.print("right down"); + break; case P_RIGHT_UP: - Serial.print( "right up" ); - break; + Serial.print("right up"); + break; case P_FOR_DOWN: - Serial.print( "for down" ); - break; + Serial.print("for down"); + break; case P_FOR_UP: - Serial.print( "for up" ); - break; + Serial.print("for up"); + break; case P_BACK_DOWN: - Serial.print( "back down" ); - break; + Serial.print("back down"); + break; case P_BACK_UP: - Serial.print( "back up" ); - break; + Serial.print("back up"); + break; case P_CENTER_DOWN: - Serial.print( "center down" ); - break; + Serial.print("center down"); + break; case P_CENTER_UP: - Serial.print( "center up" ); - break; - } + Serial.print("center up"); + break; + } - Serial.print( " " ); - Serial.println( sender->id ); + Serial.print(" "); + Serial.println(sender->id); } -void switchExample( Control* sender, int value ) { - switch ( value ) { +void switchExample(Control* sender, int value) +{ + switch (value) + { case S_ACTIVE: - Serial.print( "Active:" ); - break; + Serial.print("Active:"); + break; case S_INACTIVE: - Serial.print( "Inactive" ); - break; - } + Serial.print("Inactive"); + break; + } - Serial.print( " " ); - Serial.println( sender->id ); + Serial.print(" "); + Serial.println(sender->id); } -void selectExample( Control* sender, int value ) { - Serial.print("Select: ID: "); - Serial.print(sender->id); - Serial.print(", Value: "); - Serial.println( sender->value ); +void selectExample(Control* sender, int value) +{ + Serial.print("Select: ID: "); + Serial.print(sender->id); + Serial.print(", Value: "); + Serial.println(sender->value); } -void otherSwitchExample( Control* sender, int value ) { - switch ( value ) { +void otherSwitchExample(Control* sender, int value) +{ + switch (value) + { case S_ACTIVE: - Serial.print( "Active:" ); - break; + Serial.print("Active:"); + break; case S_INACTIVE: - Serial.print( "Inactive" ); - break; - } + Serial.print("Inactive"); + break; + } - Serial.print( " " ); - Serial.println( sender->id ); + Serial.print(" "); + Serial.println(sender->id); } -void setup( void ) { - Serial.begin( 115200 ); +void setup(void) +{ + Serial.begin(115200); #if defined(ESP32) - WiFi.setHostname( hostname ); + WiFi.setHostname(hostname); #else - WiFi.hostname( hostname ); + WiFi.hostname(hostname); #endif - // try to connect to existing network - WiFi.begin( ssid, password ); - Serial.print( "\n\nTry to connect to existing network" ); + // try to connect to existing network + WiFi.begin(ssid, password); + Serial.print("\n\nTry to connect to existing network"); - { - uint8_t timeout = 10; + { + uint8_t timeout = 10; - // Wait for connection, 5s timeout - do { - delay( 500 ); - Serial.print( "." ); - timeout--; - } while ( timeout && WiFi.status() != WL_CONNECTED ); + // Wait for connection, 5s timeout + do + { + delay(500); + Serial.print("."); + timeout--; + } while (timeout && WiFi.status() != WL_CONNECTED); - // not connected -> create hotspot - if ( WiFi.status() != WL_CONNECTED ) { - Serial.print( "\n\nCreating hotspot" ); + // not connected -> create hotspot + if (WiFi.status() != WL_CONNECTED) + { + Serial.print("\n\nCreating hotspot"); - WiFi.mode( WIFI_AP ); - WiFi.softAPConfig( apIP, apIP, IPAddress( 255, 255, 255, 0 ) ); - WiFi.softAP( ssid ); + WiFi.mode(WIFI_AP); + WiFi.softAPConfig(apIP, apIP, IPAddress(255, 255, 255, 0)); + WiFi.softAP(ssid); - timeout = 5; + timeout = 5; - do { - delay( 500 ); - Serial.print( "." ); - timeout--; - } while ( timeout ); + do + { + delay(500); + Serial.print("."); + timeout--; + } while (timeout); + } } - } - dnsServer.start( DNS_PORT, "*", apIP ); + dnsServer.start(DNS_PORT, "*", apIP); - Serial.println( "\n\nWiFi parameters:" ); - Serial.print( "Mode: " ); - Serial.println( WiFi.getMode() == WIFI_AP ? "Station" : "Client" ); - Serial.print( "IP address: " ); - Serial.println( WiFi.getMode() == WIFI_AP ? WiFi.softAPIP() : WiFi.localIP() ); + Serial.println("\n\nWiFi parameters:"); + Serial.print("Mode: "); + Serial.println(WiFi.getMode() == WIFI_AP ? "Station" : "Client"); + Serial.print("IP address: "); + Serial.println(WiFi.getMode() == WIFI_AP ? WiFi.softAPIP() : WiFi.localIP()); - uint16_t tab1 = ESPUI.addControl( ControlType::Tab, "Settings 1", "Settings 1" ); - uint16_t tab2 = ESPUI.addControl( ControlType::Tab, "Settings 2", "Settings 2" ); - uint16_t tab3 = ESPUI.addControl( ControlType::Tab, "Settings 3", "Settings 3" ); + uint16_t tab1 = ESPUI.addControl(ControlType::Tab, "Settings 1", "Settings 1"); + uint16_t tab2 = ESPUI.addControl(ControlType::Tab, "Settings 2", "Settings 2"); + uint16_t tab3 = ESPUI.addControl(ControlType::Tab, "Settings 3", "Settings 3"); - // shown above all tabs - status = ESPUI.addControl( ControlType::Label, "Status:", "Stop", ControlColor::Turquoise ); + // shown above all tabs + status = ESPUI.addControl(ControlType::Label, "Status:", "Stop", ControlColor::Turquoise); - uint16_t select1 = ESPUI.addControl( ControlType::Select, "Select:", "", ControlColor::Alizarin, tab1, &selectExample ); - ESPUI.addControl( ControlType::Option, "Option1", "Opt1", ControlColor::Alizarin, select1 ); - ESPUI.addControl( ControlType::Option, "Option2", "Opt2", ControlColor::Alizarin, select1 ); - ESPUI.addControl( ControlType::Option, "Option3", "Opt3", ControlColor::Alizarin, select1 ); - - ESPUI.addControl( ControlType::Text, "Text Test:", "a Text Field", ControlColor::Alizarin, tab1, &textCall ); + uint16_t select1 + = ESPUI.addControl(ControlType::Select, "Select:", "", ControlColor::Alizarin, tab1, &selectExample); + ESPUI.addControl(ControlType::Option, "Option1", "Opt1", ControlColor::Alizarin, select1); + ESPUI.addControl(ControlType::Option, "Option2", "Opt2", ControlColor::Alizarin, select1); + ESPUI.addControl(ControlType::Option, "Option3", "Opt3", ControlColor::Alizarin, select1); - // tabbed controls - ESPUI.addControl( ControlType::Label, "Millis:", "0", ControlColor::Emerald, tab1 ); - button1 = ESPUI.addControl( ControlType::Button, "Push Button", "Press", ControlColor::Peterriver, tab1, &buttonCallback ); - ESPUI.addControl( ControlType::Button, "Other Button", "Press", ControlColor::Wetasphalt, tab1, &buttonExample ); - ESPUI.addControl( ControlType::PadWithCenter, "Pad with center", "", ControlColor::Sunflower, tab2, &padExample ); - ESPUI.addControl( ControlType::Pad, "Pad without center", "", ControlColor::Carrot, tab3, &padExample ); - switchOne = ESPUI.addControl( ControlType::Switcher, "Switch one", "", ControlColor::Alizarin, tab3, &switchExample ); - ESPUI.addControl( ControlType::Switcher, "Switch two", "", ControlColor::None, tab3, &otherSwitchExample ); - ESPUI.addControl( ControlType::Slider, "Slider one", "30", ControlColor::Alizarin, tab1, &slider ); - ESPUI.addControl( ControlType::Slider, "Slider two", "100", ControlColor::Alizarin, tab3, &slider ); - ESPUI.addControl( ControlType::Number, "Number:", "50", ControlColor::Alizarin, tab3, &numberCall ); + ESPUI.addControl(ControlType::Text, "Text Test:", "a Text Field", ControlColor::Alizarin, tab1, &textCall); - /* - * .begin loads and serves all files from PROGMEM directly. - * If you want to serve the files from SPIFFS use ESPUI.beginSPIFFS - * (.prepareFileSystem has to be run in an empty sketch before) - */ + // tabbed controls + ESPUI.addControl(ControlType::Label, "Millis:", "0", ControlColor::Emerald, tab1); + button1 = ESPUI.addControl( + ControlType::Button, "Push Button", "Press", ControlColor::Peterriver, tab1, &buttonCallback); + ESPUI.addControl(ControlType::Button, "Other Button", "Press", ControlColor::Wetasphalt, tab1, &buttonExample); + ESPUI.addControl(ControlType::PadWithCenter, "Pad with center", "", ControlColor::Sunflower, tab2, &padExample); + ESPUI.addControl(ControlType::Pad, "Pad without center", "", ControlColor::Carrot, tab3, &padExample); + switchOne = ESPUI.addControl(ControlType::Switcher, "Switch one", "", ControlColor::Alizarin, tab3, &switchExample); + ESPUI.addControl(ControlType::Switcher, "Switch two", "", ControlColor::None, tab3, &otherSwitchExample); + ESPUI.addControl(ControlType::Slider, "Slider one", "30", ControlColor::Alizarin, tab1, &slider); + ESPUI.addControl(ControlType::Slider, "Slider two", "100", ControlColor::Alizarin, tab3, &slider); + ESPUI.addControl(ControlType::Number, "Number:", "50", ControlColor::Alizarin, tab3, &numberCall); - // Enable this option if you want sliders to be continuous (update during move) and not discrete (update on stop) - // ESPUI.sliderContinuous = true; + /* + * .begin loads and serves all files from PROGMEM directly. + * If you want to serve the files from LITTLEFS use ESPUI.beginLITTLEFS + * (.prepareFileSystem has to be run in an empty sketch before) + */ - /* - * Optionally you can use HTTP BasicAuth. Keep in mind that this is NOT a - * SECURE way of limiting access. - * Anyone who is able to sniff traffic will be able to intercept your password - * since it is transmitted in cleartext. Just add a string as username and - * password, for example begin("ESPUI Control", "username", "password") - */ + // Enable this option if you want sliders to be continuous (update during move) and not discrete (update on stop) + // ESPUI.sliderContinuous = true; + /* + * Optionally you can use HTTP BasicAuth. Keep in mind that this is NOT a + * SECURE way of limiting access. + * Anyone who is able to sniff traffic will be able to intercept your password + * since it is transmitted in cleartext. Just add a string as username and + * password, for example begin("ESPUI Control", "username", "password") + */ - ESPUI.begin("ESPUI Control"); + ESPUI.begin("ESPUI Control"); } -void loop( void ) { - dnsServer.processNextRequest(); +void loop(void) +{ + dnsServer.processNextRequest(); - static long oldTime = 0; - static bool switchi = false; + static long oldTime = 0; + static bool switchi = false; - if ( millis() - oldTime > 5000 ) { - switchi = !switchi; - ESPUI.updateControlValue( switchOne, switchi ? "1" : "0" ); + if (millis() - oldTime > 5000) + { + switchi = !switchi; + ESPUI.updateControlValue(switchOne, switchi ? "1" : "0"); - oldTime = millis(); - } + oldTime = millis(); + } } diff --git a/pio_examples/gui/src/gui.ino b/pio_examples/gui/src/gui.ino index b8ade9e..3c17925 100644 --- a/pio_examples/gui/src/gui.ino +++ b/pio_examples/gui/src/gui.ino @@ -220,7 +220,7 @@ void setup(void) ESPUI.pad("Pad without center", &padExample, ControlColor::Carrot); testSwitchId = ESPUI.switcher("Switch one", &switchExample, ControlColor::Alizarin, false); ESPUI.switcher("Switch two", &otherSwitchExample, ControlColor::None, true); - ESPUI.slider("Slider one", &slider, ControlColor::Alizarin, 30); + ESPUI.slider("Slider one", &slider, ControlColor::Alizarin, 30, 0, 30); ESPUI.slider("Slider two", &slider, ControlColor::None, 100); ESPUI.text("Text Test:", &textCall, ControlColor::Alizarin, "a Text Field"); ESPUI.number("Numbertest", &numberCall, ControlColor::Alizarin, 5, 0, 10); @@ -229,7 +229,7 @@ void setup(void) /* * .begin loads and serves all files from PROGMEM directly. - * If you want to serve the files from SPIFFS use ESPUI.beginSPIFFS + * If you want to serve the files from LITTLEFS use ESPUI.beginLITTLEFS * (.prepareFileSystem has to be run in an empty sketch before) */