lbsadmin
/
ESPUI
mirror of https://github.com/s00500/ESPUI.git
1
0
Fork 0
Code Issues Releases Activity

Reformat examples 

Signed-off-by: Lukas Bachschwell <lukas@lbsfilm.at>
This commit is contained in:
Lukas Bachschwell 2022-01-04 11:20:04 +01:00
parent 232ca3ead4
commit 3cbae2ff1b
Signed by: lbsadmin
GPG Key ID: CCC6AA87CC8DF425
4 changed files with 597 additions and 528 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
examples/gui-generic-api/gui-generic-api.ino
View File

@ -20,26 +20,31 @@ uint16_t button1;
uint16_t millisLabelId;
uint16_t switchOne;
void numberCall( Control* sender, int type ) {
void numberCall(Control* sender, int type)
{
Serial.println(sender->value);
}
void textCall(Control *sender, int type) {
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) {
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;
@ -50,8 +55,10 @@ void buttonCallback(Control *sender, int type) {
}
}
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");
@ -70,8 +77,10 @@ void buttonExample(Control *sender, int type) {
}
}
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;
@ -117,8 +126,10 @@ void padExample(Control *sender, int value) {
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;
@ -132,15 +143,18 @@ void switchExample(Control *sender, int value) {
Serial.println(sender->id);
}
void selectExample(Control *sender, int 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;
@ -154,7 +168,8 @@ void otherSwitchExample(Control *sender, int value) {
Serial.println(sender->id);
}
void setup(void) {
void setup(void)
{
ESPUI.setVerbosity(Verbosity::VerboseJSON);
Serial.begin(115200);
@ -172,14 +187,16 @@ void setup(void) {
uint8_t timeout = 10;
// Wait for connection, 5s timeout
do {
do
{
delay(500);
Serial.print(".");
timeout--;
} while (timeout && WiFi.status() != WL_CONNECTED);
// not connected -> create hotspot
if (WiFi.status() != WL_CONNECTED) {
if (WiFi.status() != WL_CONNECTED)
{
Serial.print("\n\nCreating hotspot");
WiFi.mode(WIFI_AP);
@ -188,7 +205,8 @@ void setup(void) {
timeout = 5;
do {
do
{
delay(500);
Serial.print(".");
timeout--;
@ -206,28 +224,35 @@ void setup(void) {
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::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);
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);
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
* If you want to serve the files from LITTLEFS use ESPUI.beginLITTLEFS
* (.prepareFileSystem has to be run in an empty sketch before)
*/
@ -242,17 +267,18 @@ void setup(void) {
* password, for example begin("ESPUI Control", "username", "password")
*/
ESPUI.begin("ESPUI Control");
}
void loop(void) {
void loop(void)
{
dnsServer.processNextRequest();
static long oldTime = 0;
static bool testSwitchState = false;
if (millis() - oldTime > 5000) {
if (millis() - oldTime > 5000)
{
ESPUI.updateControlValue(millisLabelId, String(millis()));
testSwitchState = !testSwitchState;
ESPUI.updateControlValue(switchOne, testSwitchState ? "1" : "0");

62
examples/gui/gui.ino
View File

@ -21,16 +21,21 @@ int graphId;
int millisLabelId;
int testSwitchId;
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) {
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) {
void slider(Control* sender, int type)
{
Serial.print("Slider: ID: ");
Serial.print(sender->id);
Serial.print(", Value: ");
@ -41,8 +46,10 @@ void slider(Control *sender, int type) {
Serial.println(sliderValueWithOffset);
}
void buttonCallback(Control *sender, int type) {
switch (type) {
void buttonCallback(Control* sender, int type)
{
switch (type)
{
case B_DOWN:
Serial.println("Button DOWN");
break;
@ -53,8 +60,10 @@ void buttonCallback(Control *sender, int type) {
}
}
void buttonExample(Control *sender, int type) {
switch (type) {
void buttonExample(Control* sender, int type)
{
switch (type)
{
case B_DOWN:
Serial.println("Status: Start");
ESPUI.print(statusLabelId, "Start");
@ -66,8 +75,10 @@ void buttonExample(Control *sender, int type) {
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;
@ -113,8 +124,10 @@ void padExample(Control *sender, int value) {
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;
@ -128,8 +141,10 @@ void switchExample(Control *sender, int value) {
Serial.println(sender->id);
}
void otherSwitchExample(Control *sender, int value) {
switch (value) {
void otherSwitchExample(Control* sender, int value)
{
switch (value)
{
case S_ACTIVE:
Serial.print("Active:");
break;
@ -143,7 +158,8 @@ void otherSwitchExample(Control *sender, int value) {
Serial.println(sender->id);
}
void setup(void) {
void setup(void)
{
ESPUI.setVerbosity(Verbosity::VerboseJSON);
Serial.begin(115200);
@ -161,14 +177,16 @@ void setup(void) {
uint8_t timeout = 10;
// Wait for connection, 5s timeout
do {
do
{
delay(500);
Serial.print(".");
timeout--;
} while (timeout && WiFi.status() != WL_CONNECTED);
// not connected -> create hotspot
if (WiFi.status() != WL_CONNECTED) {
if (WiFi.status() != WL_CONNECTED)
{
Serial.print("\n\nCreating hotspot");
WiFi.mode(WIFI_AP);
@ -177,7 +195,8 @@ void setup(void) {
timeout = 5;
do {
do
{
delay(500);
Serial.print(".");
timeout--;
@ -210,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)
*/
@ -225,17 +244,18 @@ void setup(void) {
* password, for example begin("ESPUI Control", "username", "password")
*/
ESPUI.begin("ESPUI Control");
}
void loop(void) {
void loop(void)
{
dnsServer.processNextRequest();
static long oldTime = 0;
static bool testSwitchState = false;
if (millis() - oldTime > 5000) {
if (millis() - oldTime > 5000)
{
ESPUI.print(millisLabelId, String(millis()));
ESPUI.addGraphPoint(graphId, random(1, 50));

75
examples/tabbedGui/tabbedGui.ino
View File

@ -19,24 +19,31 @@ uint16_t button1;
uint16_t switchOne;
uint16_t status;
void numberCall( Control* sender, int type ) {
void numberCall(Control* sender, int type)
{
Serial.println(sender->value);
}
void textCall( Control* sender, int type ) {
void textCall(Control* sender, int type)
{
Serial.print("Text: ID: ");
Serial.print(sender->id);
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(sender->id);
Serial.print(", Value: ");
Serial.println( sender->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;
@ -47,8 +54,10 @@ void buttonCallback( Control* sender, int type ) {
}
}
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");
@ -67,8 +76,10 @@ void buttonExample( Control* sender, int type ) {
}
}
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;
@ -114,8 +125,10 @@ void padExample( Control* sender, int value ) {
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;
@ -129,15 +142,18 @@ void switchExample( Control* sender, int value ) {
Serial.println(sender->id);
}
void selectExample( Control* sender, int 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;
@ -151,7 +167,8 @@ void otherSwitchExample( Control* sender, int value ) {
Serial.println(sender->id);
}
void setup( void ) {
void setup(void)
{
Serial.begin(115200);
#if defined(ESP32)
@ -168,14 +185,16 @@ void setup( void ) {
uint8_t timeout = 10;
// Wait for connection, 5s timeout
do {
do
{
delay(500);
Serial.print(".");
timeout--;
} while (timeout && WiFi.status() != WL_CONNECTED);
// not connected -> create hotspot
if ( WiFi.status() != WL_CONNECTED ) {
if (WiFi.status() != WL_CONNECTED)
{
Serial.print("\n\nCreating hotspot");
WiFi.mode(WIFI_AP);
@ -184,7 +203,8 @@ void setup( void ) {
timeout = 5;
do {
do
{
delay(500);
Serial.print(".");
timeout--;
@ -207,7 +227,8 @@ void setup( void ) {
// 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 );
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);
@ -216,7 +237,8 @@ void setup( void ) {
// tabbed controls
ESPUI.addControl(ControlType::Label, "Millis:", "0", ControlColor::Emerald, tab1);
button1 = ESPUI.addControl( ControlType::Button, "Push Button", "Press", ControlColor::Peterriver, tab1, &buttonCallback );
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);
@ -228,7 +250,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)
*/
@ -243,17 +265,18 @@ void setup( void ) {
* password, for example begin("ESPUI Control", "username", "password")
*/
ESPUI.begin("ESPUI Control");
}
void loop( void ) {
void loop(void)
{
dnsServer.processNextRequest();
static long oldTime = 0;
static bool switchi = false;
if ( millis() - oldTime > 5000 ) {
if (millis() - oldTime > 5000)
{
switchi = !switchi;
ESPUI.updateControlValue(switchOne, switchi ? "1" : "0");

4
pio_examples/gui/src/gui.ino
View File

@ -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)
*/