lbsadmin/ESPUI
1
0
Fork 0
mirror of https://github.com/s00500/ESPUI.git synced 2024-11-21 22:50:55 +00:00
Code Issues Releases Activity

Proper wrappers

Browse Source 
- update order of params of create functions to be simillar
- changed all numbers to be numbers
- split pad creation function
- updated examples
This commit is contained in:
Lukas Bachschwell 2019-03-24 19:18:53 +01:00
parent 650411bac4
commit 3c69f013fc
5 changed files with 319 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -27,7 +27,7 @@ THIS IS THE 2.0.0 DEVELOPMENT BRANCH, NOT GUARANTIED TO WORK
- Tabs by @eringerli ISSUE #45 ✅ - Tabs by @eringerli ISSUE #45 ✅
- remove black line without tabs ✅ - remove black line without tabs ✅
- API changes by @eringerli - API changes by @eringerli
- less updateCotrol functions - less updateControl functions ✅
- proper wrappers for all create/update actions - proper wrappers for all create/update actions
- OptionList by @eringerli - OptionList by @eringerli
- Better return values - Better return values
@ -45,6 +45,14 @@ THIS IS THE 2.0.0 DEVELOPMENT BRANCH, NOT GUARANTIED TO WORK
- Tab usage - Tab usage
- Verbosity setting - Verbosity setting
## Changelog for functions:
- split pad into pad and padWithCenter
- Cleaned order or parameters on switch
- cleaned order of parameters on pad
- Changes all numbers to actually be numbers (slider value, number value, min
and max)
## Dependencies ## Dependencies
This library is dependent on the following libraries to function properly. This library is dependent on the following libraries to function properly.

282
examples/gui-newAPI/gui-newAPI.ino
View File

@ -2,7 +2,7 @@
#include <ESPUI.h> #include <ESPUI.h>
const byte DNS_PORT = 53; const byte DNS_PORT = 53;
IPAddress apIP( 192, 168, 1, 1 ); IPAddress apIP(192, 168, 1, 1);
DNSServer dnsServer; DNSServer dnsServer;
#if defined(ESP32) #if defined(ESP32)
@ -12,221 +12,222 @@ DNSServer dnsServer;
#endif #endif
// true for verbose, false for quiet // true for verbose, false for quiet
ESPUIClass ESPUI( Verbosity::VerboseJSON ); ESPUIClass ESPUI(Verbosity::VerboseJSON);
const char* ssid = "ESPUI"; const char *ssid = "ESPUI";
const char* password = "espui"; const char *password = "espui";
const char* hostname = "EspuiTest"; const char *hostname = "EspuiTest";
uint16_t button1; uint16_t button1;
void numberCall( Control* sender, int type ) { void numberCall(Control *sender, int type) { Serial.println(sender->value); }
Serial.println( sender->value );
}
void textCall( Control* sender, int type ) { void textCall(Control *sender, int type) {
Serial.print("Text: ID: "); Serial.print("Text: ID: ");
Serial.print(sender->id); Serial.print(sender->id);
Serial.print(", Value: "); Serial.print(", Value: ");
Serial.println( sender->value );} Serial.println(sender->value);
}
void slider( Control* sender, int type ) { void slider(Control *sender, int type) {
Serial.print("Slider: ID: "); Serial.print("Slider: ID: ");
Serial.print(sender->id); Serial.print(sender->id);
Serial.print(", Value: "); Serial.print(", Value: ");
Serial.println( sender->value );} Serial.println(sender->value);
}
void buttonCallback( Control* sender, int type ) { void buttonCallback(Control *sender, int type) {
switch ( type ) { switch (type) {
case B_DOWN: case B_DOWN:
Serial.println( "Button DOWN" ); Serial.println("Button DOWN");
break; break;
case B_UP: case B_UP:
Serial.println( "Button UP" ); Serial.println("Button UP");
break; break;
} }
} }
void buttonExample( Control* sender, int type ) { void buttonExample(Control *sender, int type) {
switch ( type ) { switch (type) {
case B_DOWN: case B_DOWN:
Serial.println( "Status: Start" ); Serial.println("Status: Start");
ESPUI.updateControl( "Status:", "Start" ); ESPUI.updateControl("Status:", "Start");
ESPUI.getControl( button1 )->color = ControlColor::Carrot;
ESPUI.updateControl( button1 );
break;
case B_UP: ESPUI.getControl(button1)->color = ControlColor::Carrot;
Serial.println( "Status: Stop" ); ESPUI.updateControl(button1);
ESPUI.updateControl( "Status:", "Stop" ); break;
ESPUI.getControl( button1 )->color = ControlColor::Peterriver; case B_UP:
ESPUI.updateControl( button1 ); Serial.println("Status: Stop");
break; ESPUI.updateControl("Status:", "Stop");
ESPUI.getControl(button1)->color = ControlColor::Peterriver;
ESPUI.updateControl(button1);
break;
} }
} }
void padExample( Control* sender, int value ) { void padExample(Control *sender, int value) {
switch ( value ) { switch (value) {
case P_LEFT_DOWN: case P_LEFT_DOWN:
Serial.print( "left down" ); Serial.print("left down");
break; break;
case P_LEFT_UP: case P_LEFT_UP:
Serial.print( "left up" ); Serial.print("left up");
break; break;
case P_RIGHT_DOWN: case P_RIGHT_DOWN:
Serial.print( "right down" ); Serial.print("right down");
break; break;
case P_RIGHT_UP: case P_RIGHT_UP:
Serial.print( "right up" ); Serial.print("right up");
break; break;
case P_FOR_DOWN: case P_FOR_DOWN:
Serial.print( "for down" ); Serial.print("for down");
break; break;
case P_FOR_UP: case P_FOR_UP:
Serial.print( "for up" ); Serial.print("for up");
break; break;
case P_BACK_DOWN: case P_BACK_DOWN:
Serial.print( "back down" ); Serial.print("back down");
break; break;
case P_BACK_UP: case P_BACK_UP:
Serial.print( "back up" ); Serial.print("back up");
break; break;
case P_CENTER_DOWN: case P_CENTER_DOWN:
Serial.print( "center down" ); Serial.print("center down");
break; break;
case P_CENTER_UP: case P_CENTER_UP:
Serial.print( "center up" ); Serial.print("center up");
break; break;
} }
Serial.print( " " ); Serial.print(" ");
Serial.println( sender->id ); Serial.println(sender->id);
} }
void switchExample( Control* sender, int value ) { void switchExample(Control *sender, int value) {
switch ( value ) { switch (value) {
case S_ACTIVE: case S_ACTIVE:
Serial.print( "Active:" ); Serial.print("Active:");
break; break;
case S_INACTIVE: case S_INACTIVE:
Serial.print( "Inactive" ); Serial.print("Inactive");
break; break;
} }
Serial.print( " " ); Serial.print(" ");
Serial.println( sender->id ); Serial.println(sender->id);
} }
void selectExample( Control* sender, int value ) { void selectExample(Control *sender, int value) {
Serial.print("Select: ID: "); Serial.print("Select: ID: ");
Serial.print(sender->id); Serial.print(sender->id);
Serial.print(", Value: "); Serial.print(", Value: ");
Serial.println( sender->value ); Serial.println(sender->value);
} }
void otherSwitchExample( Control* sender, int value ) { void otherSwitchExample(Control *sender, int value) {
switch ( value ) { switch (value) {
case S_ACTIVE: case S_ACTIVE:
Serial.print( "Active:" ); Serial.print("Active:");
break; break;
case S_INACTIVE: case S_INACTIVE:
Serial.print( "Inactive" ); Serial.print("Inactive");
break; break;
} }
Serial.print( " " ); Serial.print(" ");
Serial.println( sender->id ); Serial.println(sender->id);
} }
void setup( void ) { void setup(void) {
Serial.begin( 115200 ); Serial.begin(115200);
#if defined(ESP32) #if defined(ESP32)
WiFi.setHostname( hostname ); WiFi.setHostname(hostname);
#else #else
WiFi.hostname( hostname ); WiFi.hostname(hostname);
#endif #endif
// try to connect to existing network // try to connect to existing network
WiFi.begin( ssid, password ); WiFi.begin(ssid, password);
Serial.print( "\n\nTry to connect to existing network" ); Serial.print("\n\nTry to connect to existing network");
{ {
uint8_t timeout = 5; uint8_t timeout = 5;
// Wait for connection, 2.5s timeout // Wait for connection, 2.5s timeout
do { do {
delay( 500 ); delay(500);
Serial.print( "." ); Serial.print(".");
timeout--; timeout--;
} while ( timeout && WiFi.status() != WL_CONNECTED ); } while (timeout && WiFi.status() != WL_CONNECTED);
// not connected -> create hotspot // not connected -> create hotspot
if ( WiFi.status() != WL_CONNECTED ) { if (WiFi.status() != WL_CONNECTED) {
Serial.print( "\n\nCreating hotspot" ); Serial.print("\n\nCreating hotspot");
WiFi.mode( WIFI_AP ); WiFi.mode(WIFI_AP);
WiFi.softAPConfig( apIP, apIP, IPAddress( 255, 255, 255, 0 ) ); WiFi.softAPConfig(apIP, apIP, IPAddress(255, 255, 255, 0));
WiFi.softAP( ssid ); WiFi.softAP(ssid);
timeout = 5; timeout = 5;
do { do {
delay( 500 ); delay(500);
Serial.print( "." ); Serial.print(".");
timeout--; timeout--;
} while ( timeout ); } while (timeout);
} }
} }
dnsServer.start( DNS_PORT, "*", apIP ); dnsServer.start(DNS_PORT, "*", apIP);
Serial.println( "\n\nWiFi parameters:" ); Serial.println("\n\nWiFi parameters:");
Serial.print( "Mode: " ); Serial.print("Mode: ");
Serial.println( WiFi.getMode() == WIFI_AP ? "Station" : "Client" ); Serial.println(WiFi.getMode() == WIFI_AP ? "Station" : "Client");
Serial.print( "IP address: " ); Serial.print("IP address: ");
Serial.println( WiFi.getMode() == WIFI_AP ? WiFi.softAPIP() : WiFi.localIP() ); Serial.println(WiFi.getMode() == WIFI_AP ? WiFi.softAPIP() : WiFi.localIP());
ESPUI.addControl( ControlType::Label, "Status:", "Stop", ControlColor::Turquoise ); 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::Text, "Text Test:", "a Text Field", ControlColor::Alizarin, Control::noParent, &textCall );
ESPUI.addControl( ControlType::Label, "Millis:", "0", ControlColor::Emerald, Control::noParent ); ESPUI.addControl(ControlType::Option, "Option1", "Opt1", ControlColor::Alizarin, select1);
button1 = ESPUI.addControl( ControlType::Button, "Push Button", "Press", ControlColor::Peterriver, Control::noParent, &buttonCallback ); ESPUI.addControl(ControlType::Option, "Option2", "Opt2", ControlColor::Alizarin, select1);
ESPUI.addControl( ControlType::Button, "Other Button", "Press", ControlColor::Wetasphalt, Control::noParent, &buttonExample ); ESPUI.addControl(ControlType::Option, "Option3", "Opt3", ControlColor::Alizarin, select1);
ESPUI.addControl( ControlType::PadWithCenter, "Pad with center", "", ControlColor::Sunflower, Control::noParent, &padExample );
ESPUI.addControl( ControlType::Pad, "Pad without center", "", ControlColor::Carrot, Control::noParent, &padExample ); ESPUI.addControl(ControlType::Text, "Text Test:", "a Text Field", ControlColor::Alizarin, Control::noParent, &textCall);
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::Label, "Millis:", "0", ControlColor::Emerald, Control::noParent);
ESPUI.addControl( ControlType::Slider, "Slider one", "30", ControlColor::Alizarin, Control::noParent, &slider ); button1 = ESPUI.addControl(ControlType::Button, "Push Button", "Press", ControlColor::Peterriver, Control::noParent, &buttonCallback);
ESPUI.addControl( ControlType::Slider, "Slider two", "100", ControlColor::Alizarin, Control::noParent, &slider ); ESPUI.addControl(ControlType::Button, "Other Button", "Press", ControlColor::Wetasphalt, Control::noParent, &buttonExample);
ESPUI.addControl( ControlType::Number, "Number:", "50", ControlColor::Alizarin, Control::noParent, &numberCall ); ESPUI.addControl(ControlType::PadWithCenter, "Pad with center", "", ControlColor::Sunflower, Control::noParent, &padExample);
ESPUI.addControl(ControlType::Pad, "Pad without center", "", ControlColor::Carrot, Control::noParent, &padExample);
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. * .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 SPIFFS use ESPUI.beginSPIFFS
* (.prepareFileSystem has to be run in an empty sketch before) * (.prepareFileSystem has to be run in an empty sketch before)
*/ */
ESPUI.begin("ESPUI Control");
/* /*
* Optionally you can use HTTP BasicAuth. Keep in mind that this is NOT a * Optionally you can use HTTP BasicAuth. Keep in mind that this is NOT a
* SECURE way of limiting access. * SECURE way of limiting access.
@ -234,21 +235,18 @@ void setup( void ) {
* since it is transmitted in cleartext. Just add a username and password, * since it is transmitted in cleartext. Just add a username and password,
* for example begin("ESPUI Control", "username", "password") * for example begin("ESPUI Control", "username", "password")
*/ */
ESPUI.begin( "ESPUI Control" );
} }
void loop( void ) { void loop(void) {
dnsServer.processNextRequest(); dnsServer.processNextRequest();
static long oldTime = 0; static long oldTime = 0;
static bool switchi = false; static bool testSwitchState = false;
if ( millis() - oldTime > 5000 ) { if (millis() - oldTime > 5000) {
ESPUI.updateControl( "Millis:", String( millis() ) ); ESPUI.updateControl("Millis:", String(millis()));
switchi = !switchi; testSwitchState = !testSwitchState;
ESPUI.updateControl( "Switch one", switchi ? "1" : "0" ); ESPUI.updateControlValue("Switch one", testSwitchState ? "1" : "0");
oldTime = millis(); oldTime = millis();
} }
} }

273
examples/gui/gui.ino
View File

@ -2,7 +2,7 @@
#include <ESPUI.h> #include <ESPUI.h>
const byte DNS_PORT = 53; const byte DNS_PORT = 53;
IPAddress apIP( 192, 168, 1, 1 ); IPAddress apIP(192, 168, 1, 1);
DNSServer dnsServer; DNSServer dnsServer;
#if defined(ESP32) #if defined(ESP32)
@ -11,198 +11,195 @@ DNSServer dnsServer;
#include <ESP8266WiFi.h> #include <ESP8266WiFi.h>
#endif #endif
// true for verbose, false for quiet const char *ssid = "ESPUI";
ESPUIClass ESPUI( Verbosity::VerboseJSON ); const char *password = "espui";
const char *hostname = "EspuiTest";
const char* ssid = "ESPUI";
const char* password = "espui";
const char* hostname = "EspuiTest";
long oldTime = 0; long oldTime = 0;
bool switchi = false; bool testSwitchState = false;
int millisLabelId;
int testSwitchId;
void numberCall(Control *sender, int type) { Serial.println(sender->value); }
void numberCall( Control* sender, int type ) { void textCall(Control *sender, int type) {
Serial.println( sender->value ); Serial.print("Text: ID: ");
Serial.print(sender->id);
Serial.print(", Value: ");
Serial.println(sender->value);
} }
void textCall( Control* sender, int type ) { void slider(Control *sender, int type) {
Serial.print( "Text: ID: " ); Serial.print("Slider: ID: ");
Serial.print( sender->id ); Serial.print(sender->id);
Serial.print( ", Value: " ); Serial.print(", Value: ");
Serial.println( sender->value ); Serial.println(sender->value);
} }
void slider( Control* sender, int type ) { void buttonCallback(Control *sender, int type) {
Serial.print( "Slider: ID: " ); switch (type) {
Serial.print( sender->id ); case B_DOWN:
Serial.print( ", Value: " ); Serial.println("Button DOWN");
Serial.println( sender->value ); break;
}
void buttonCallback( Control* sender, int type ) { case B_UP:
switch ( type ) { Serial.println("Button UP");
case B_DOWN: break;
Serial.println( "Button DOWN" );
break;
case B_UP:
Serial.println( "Button UP" );
break;
} }
} }
void buttonExample( Control* sender, int type ) { void buttonExample(Control *sender, int type) {
switch ( type ) { switch (type) {
case B_DOWN: case B_DOWN:
Serial.println( "Status: Start" ); Serial.println("Status: Start");
ESPUI.updateControl( "Status:", "Start" ); // ESPUI.updateControl( "Status:", "Start" );
break; break;
case B_UP: case B_UP:
Serial.println( "Status: Stop" ); Serial.println("Status: Stop");
ESPUI.updateControl( "Status:", "Stop" ); // ESPUI.updateControl( "Status:", "Stop" );
break; break;
} }
} }
void padExample( Control* sender, int value ) { void padExample(Control *sender, int value) {
switch ( value ) { switch (value) {
case P_LEFT_DOWN: case P_LEFT_DOWN:
Serial.print( "left down" ); Serial.print("left down");
break; break;
case P_LEFT_UP: case P_LEFT_UP:
Serial.print( "left up" ); Serial.print("left up");
break; break;
case P_RIGHT_DOWN: case P_RIGHT_DOWN:
Serial.print( "right down" ); Serial.print("right down");
break; break;
case P_RIGHT_UP: case P_RIGHT_UP:
Serial.print( "right up" ); Serial.print("right up");
break; break;
case P_FOR_DOWN: case P_FOR_DOWN:
Serial.print( "for down" ); Serial.print("for down");
break; break;
case P_FOR_UP: case P_FOR_UP:
Serial.print( "for up" ); Serial.print("for up");
break; break;
case P_BACK_DOWN: case P_BACK_DOWN:
Serial.print( "back down" ); Serial.print("back down");
break; break;
case P_BACK_UP: case P_BACK_UP:
Serial.print( "back up" ); Serial.print("back up");
break; break;
case P_CENTER_DOWN: case P_CENTER_DOWN:
Serial.print( "center down" ); Serial.print("center down");
break; break;
case P_CENTER_UP: case P_CENTER_UP:
Serial.print( "center up" ); Serial.print("center up");
break; break;
} }
Serial.print( " " ); Serial.print(" ");
Serial.println( sender->id ); Serial.println(sender->id);
} }
void switchExample( Control* sender, int value ) { void switchExample(Control *sender, int value) {
switch ( value ) { switch (value) {
case S_ACTIVE: case S_ACTIVE:
Serial.print( "Active:" ); Serial.print("Active:");
break; break;
case S_INACTIVE: case S_INACTIVE:
Serial.print( "Inactive" ); Serial.print("Inactive");
break; break;
} }
Serial.print( " " ); Serial.print(" ");
Serial.println( sender->id ); Serial.println(sender->id);
} }
void otherSwitchExample( Control* sender, int value ) { void otherSwitchExample(Control *sender, int value) {
switch ( value ) { switch (value) {
case S_ACTIVE: case S_ACTIVE:
Serial.print( "Active:" ); Serial.print("Active:");
break; break;
case S_INACTIVE: case S_INACTIVE:
Serial.print( "Inactive" ); Serial.print("Inactive");
break; break;
} }
Serial.print( " " ); Serial.print(" ");
Serial.println( sender->id ); Serial.println(sender->id);
} }
void setup( void ) { void setup(void) {
Serial.begin( 115200 ); ESPUI.setVerbosity(Verbosity::VerboseJSON);
Serial.begin(115200);
#if defined(ESP32) #if defined(ESP32)
WiFi.setHostname( hostname ); WiFi.setHostname(hostname);
#else #else
WiFi.hostname( hostname ); WiFi.hostname(hostname);
#endif #endif
// try to connect to existing network // try to connect to existing network
WiFi.begin( ssid, password ); WiFi.begin(ssid, password);
Serial.print( "\n\nTry to connect to existing network" ); Serial.print("\n\nTry to connect to existing network");
{ {
uint8_t timeout = 5; uint8_t timeout = 5;
// Wait for connection, 2.5s timeout // Wait for connection, 2.5s timeout
do { do {
delay( 500 ); delay(500);
Serial.print( "." ); Serial.print(".");
timeout--; timeout--;
} while ( timeout && WiFi.status() != WL_CONNECTED ); } while (timeout && WiFi.status() != WL_CONNECTED);
// not connected -> create hotspot // not connected -> create hotspot
if ( WiFi.status() != WL_CONNECTED ) { if (WiFi.status() != WL_CONNECTED) {
Serial.print( "\n\nCreating hotspot" ); Serial.print("\n\nCreating hotspot");
WiFi.mode( WIFI_AP ); WiFi.mode(WIFI_AP);
WiFi.softAPConfig( apIP, apIP, IPAddress( 255, 255, 255, 0 ) ); WiFi.softAPConfig(apIP, apIP, IPAddress(255, 255, 255, 0));
WiFi.softAP( ssid ); WiFi.softAP(ssid);
timeout = 5; timeout = 5;
do { do {
delay( 500 ); delay(500);
Serial.print( "." ); Serial.print(".");
timeout--; timeout--;
} while ( timeout ); } while (timeout);
} }
} }
dnsServer.start( DNS_PORT, "*", apIP ); dnsServer.start(DNS_PORT, "*", apIP);
Serial.println( "\n\nWiFi parameters:" ); Serial.println("\n\nWiFi parameters:");
Serial.print( "Mode: " ); Serial.print("Mode: ");
Serial.println( WiFi.getMode() == WIFI_AP ? "Station" : "Client" ); Serial.println(WiFi.getMode() == WIFI_AP ? "Station" : "Client");
Serial.print( "IP address: " ); Serial.print("IP address: ");
Serial.println( WiFi.getMode() == WIFI_AP ? WiFi.softAPIP() : WiFi.localIP() ); Serial.println(WiFi.getMode() == WIFI_AP ? WiFi.softAPIP() : WiFi.localIP());
ESPUI.label( "Status:", COLOR_TURQUOISE, "Stop" ); ESPUI.label("Status:", COLOR_TURQUOISE, "Stop");
ESPUI.label( "Millis:", COLOR_EMERALD, "0" ); millisLabelId = ESPUI.label("Millis:", COLOR_EMERALD, "0");
ESPUI.button( "Push Button", &buttonCallback, COLOR_PETERRIVER, "Press" ); ESPUI.button("Push Button", &buttonCallback, COLOR_PETERRIVER, "Press");
ESPUI.button( "Other Button", &buttonExample, COLOR_WETASPHALT, "Press" ); ESPUI.button("Other Button", &buttonExample, COLOR_WETASPHALT, "Press");
ESPUI.pad( "Pad with center", true, &padExample, COLOR_SUNFLOWER ); ESPUI.padWithCenter("Pad with center", &padExample, COLOR_SUNFLOWER);
ESPUI.pad( "Pad without center", false, &padExample, COLOR_CARROT ); ESPUI.pad("Pad without center", &padExample, COLOR_CARROT);
ESPUI.switcher( "Switch one", false, &switchExample, COLOR_ALIZARIN ); testSwitchId = ESPUI.switcher("Switch one", &switchExample, COLOR_ALIZARIN, false);
ESPUI.switcher( "Switch two", true, &otherSwitchExample, COLOR_NONE ); ESPUI.switcher("Switch two", &otherSwitchExample, COLOR_NONE, true);
ESPUI.slider( "Slider one", &slider, COLOR_ALIZARIN, "30" ); ESPUI.slider("Slider one", &slider, COLOR_ALIZARIN, 30);
ESPUI.slider( "Slider two", &slider, COLOR_NONE, "100" ); ESPUI.slider("Slider two", &slider, COLOR_NONE, 100);
ESPUI.text( "Text Test:", &textCall, COLOR_ALIZARIN, "a Text Field" ); ESPUI.text("Text Test:", &textCall, COLOR_ALIZARIN, "a Text Field");
ESPUI.number( "Numbertest", &numberCall, COLOR_ALIZARIN, 5, 0, 10 ); ESPUI.number("Numbertest", &numberCall, COLOR_ALIZARIN, 5, 0, 10);
/* /*
* .begin loads and serves all files from PROGMEM directly. * .begin loads and serves all files from PROGMEM directly.
@ -214,19 +211,19 @@ void setup( void ) {
* Optionally you can use HTTP BasicAuth. Keep in mind that this is NOT a * Optionally you can use HTTP BasicAuth. Keep in mind that this is NOT a
* SECURE way of limiting access. * SECURE way of limiting access.
* Anyone who is able to sniff traffic will be able to intercept your password * 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, * since it is transmitted in cleartext. Just add a string as username and
* for example begin("ESPUI Control", "username", "password") * password, for example begin("ESPUI Control", "username", "password")
*/ */
ESPUI.begin( "ESPUI Control" ); ESPUI.begin("ESPUI Control");
} }
void loop( void ) { void loop(void) {
dnsServer.processNextRequest(); dnsServer.processNextRequest();
if ( millis() - oldTime > 5000 ) { if (millis() - oldTime > 5000) {
ESPUI.print( "Millis:", String( millis() ) ); ESPUI.print(millisLabelId, String(millis()));
switchi = !switchi; testSwitchState = !testSwitchState;
ESPUI.updateSwitcher( "Switch one", switchi ); ESPUI.updateSwitcher(testSwitchId, testSwitchState);
oldTime = millis(); oldTime = millis();
} }
} }

40
src/ESPUI.cpp
View File

@ -407,35 +407,41 @@ uint16_t ESPUIClass::addControl(ControlType type, const char *label, String valu
return control->id; return control->id;
} }
int ESPUIClass::label(const char *label, ControlColor color, String value) { return addControl(ControlType::Label, label, value, color); } uint16_t ESPUIClass::label(const char *label, ControlColor color, String value) { return addControl(ControlType::Label, label, value, color); }
int ESPUIClass::graph(const char *label, ControlColor color) { return addControl(ControlType::Graph, label, "", color); } uint16_t ESPUIClass::graph(const char *label, ControlColor color) { return addControl(ControlType::Graph, label, "", color); }
int ESPUIClass::slider(const char *label, void (*callback)(Control *, int), ControlColor color, String value) { uint16_t ESPUIClass::slider(const char *label, void (*callback)(Control *, int), ControlColor color, int value, int min, int max) {
return addControl(ControlType::Slider, label, "", color, Control::noParent, callback); uint16_t sliderId = addControl(ControlType::Slider, label, String(value), color, Control::noParent, callback);
addControl(ControlType::Min, label, String(min), ControlColor::None, sliderId);
addControl(ControlType::Max, label, String(max), ControlColor::None, sliderId);
return sliderId;
} }
int ESPUIClass::button(const char *label, void (*callback)(Control *, int), ControlColor color, String value) { uint16_t ESPUIClass::button(const char *label, void (*callback)(Control *, int), ControlColor color, String value) {
return addControl(ControlType::Button, label, value, color, Control::noParent, callback); return addControl(ControlType::Button, label, value, color, Control::noParent, callback);
} }
int ESPUIClass::switcher(const char *label, bool startState, void (*callback)(Control *, int), ControlColor color) { uint16_t ESPUIClass::switcher(const char *label, void (*callback)(Control *, int), ControlColor color, bool startState) {
return addControl(ControlType::Switcher, label, "", color, Control::noParent, callback); return addControl(ControlType::Switcher, label, startState ? "1" : "0", color, Control::noParent, callback);
} }
int ESPUIClass::pad(const char *label, bool center, void (*callback)(Control *, int), ControlColor color) { uint16_t ESPUIClass::pad(const char *label, void (*callback)(Control *, int), ControlColor color) {
if (center) { return addControl(ControlType::Pad, label, "", color, Control::noParent, callback);
return addControl(ControlType::PadWithCenter, label, "", color, Control::noParent, callback); }
} else { uint16_t ESPUIClass::padWithCenter(const char *label, void (*callback)(Control *, int), ControlColor color) {
return addControl(ControlType::Pad, label, "", color, Control::noParent, callback); return addControl(ControlType::PadWithCenter, label, "", color, Control::noParent, callback);
}
} }
int ESPUIClass::number(const char *label, void (*callback)(Control *, int), ControlColor color, int number, int min, int max) { uint16_t ESPUIClass::number(const char *label, void (*callback)(Control *, int), ControlColor color, int number, int min, int max) {
return addControl(ControlType::Number, label, String(number), color, Control::noParent, callback); uint16_t numberId = addControl(ControlType::Number, label, String(number), color, Control::noParent, callback);
addControl(ControlType::Min, label, String(min), ControlColor::None, numberId);
addControl(ControlType::Max, label, String(max), ControlColor::None, numberId);
return numberId;
} }
int ESPUIClass::text(const char *label, void (*callback)(Control *, int), ControlColor color, String value) { uint16_t ESPUIClass::text(const char *label, void (*callback)(Control *, int), ControlColor color, String value) {
return addControl(ControlType::Text, label, value, color, Control::noParent, callback); return addControl(ControlType::Text, label, value, color, Control::noParent, callback);
} }
@ -522,7 +528,7 @@ void ESPUIClass::updateControlValue(uint16_t id, String value, int clientId) {
Control *control = getControl(id); Control *control = getControl(id);
if (control) { if (control) {
updateControl(control, value, clientId); updateControlValue(control, value, clientId);
} else { } else {
if (this->verbosity) { if (this->verbosity) {
Serial.println(String("Error: There is no control with ID ") + String(id)); Serial.println(String("Error: There is no control with ID ") + String(id));

21
src/ESPUI.h
View File

@ -174,16 +174,20 @@ public:
uint16_t parentControl = Control::noParent, void (*callback)(Control *, int) = nullptr); uint16_t parentControl = Control::noParent, void (*callback)(Control *, int) = nullptr);
// create Elements // create Elements
int button(const char *label, void (*callback)(Control *, int), ControlColor color, String value = ""); // Create Event Button uint16_t button(const char *label, void (*callback)(Control *, int), ControlColor color, String value = ""); // Create Event Button
int switcher(const char *label, bool startState, void (*callback)(Control *, int), ControlColor color); // Create Toggle Button uint16_t switcher(const char *label, void (*callback)(Control *, int), ControlColor color, bool startState = false); // Create Toggle Button
int pad(const char *label, bool centerButton, void (*callback)(Control *, int), ControlColor color); // Create Pad Control uint16_t pad(const char *label, void (*callback)(Control *, int), ControlColor color); // Create Pad Control
int slider(const char *label, void (*callback)(Control *, int), ControlColor color, String value); // Create Slider Control uint16_t padWithCenter(const char *label, void (*callback)(Control *, int), ControlColor color); // Create Pad Control with Centerbutton
int number(const char *label, void (*callback)(Control *, int), ControlColor color, int number, int min, int max); // Create a Number Input Control
int text(const char *label, void (*callback)(Control *, int), ControlColor color, String value = ""); // Create a Text Input Control uint16_t slider(const char *label, void (*callback)(Control *, int), ControlColor color, int value, int min = 0,
int max = 100); // Create Slider Control
uint16_t number(const char *label, void (*callback)(Control *, int), ControlColor color, int value, int min = 0,
int max = 100); // Create a Number Input Control
uint16_t text(const char *label, void (*callback)(Control *, int), ControlColor color, String value = ""); // Create a Text Input Control
// Output only // Output only
int label(const char *label, ControlColor color, String value = ""); // Create Label uint16_t label(const char *label, ControlColor color, String value = ""); // Create Label
int graph(const char *label, ControlColor color); // Create Graph display uint16_t graph(const char *label, ControlColor color); // Create Graph display
// Update Elements // Update Elements
@ -191,7 +195,6 @@ public:
// Update Elements // Update Elements
void updateControlValue(uint16_t id, String value, int clientId = -1); void updateControlValue(uint16_t id, String value, int clientId = -1);
void updateControlValue(uint16_t id, String value, int clientId = -1);
void updateControlValue(Control *control, String value, int clientId = -1); void updateControlValue(Control *control, String value, int clientId = -1);
void updateControl(uint16_t id, int clientId = -1); void updateControl(uint16_t id, int clientId = -1);