lbsadmin/ESPUI
1
0
Fork 0
mirror of https://github.com/s00500/ESPUI.git synced 2025-06-11 02:30:39 +00:00
Code Issues Releases Activity

Changed signature of the callback

Browse Source 
Call the callback with a pointer instead of a copy of the Control.
Changed all the examples
This commit is contained in:
Christian Riggenbach
2019-03-04 20:49:18 +01:00
parent 2b31e81f50
commit 3c42b43fe6
5 changed files with 197 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,19 +18,23 @@ const char* ssid = "ESPUI";
const char* password = "espui";
const char* hostname = "EspuiTest";
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.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.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 ) {
void buttonCallback( Control* sender, int type ) {
switch ( type ) {
case B_DOWN:
Serial.println( "Button DOWN" );
@ -42,20 +46,20 @@ void buttonCallback( Control sender, int type ) {
}
}
void buttonExample( Control sender, int type ) {
void buttonExample( Control* sender, int type ) {
switch ( type ) {
case B_DOWN:
Serial.println( "Status: Start" );
ESPUI.updateControl( "Status", "Start" );
ESPUI.updateControl( "Status:", "Start" );
break;
case B_UP:
Serial.println( "Status: Stop" );
ESPUI.updateControl( "Status", "Stop" );
ESPUI.updateControl( "Status:", "Stop" );
break;
}
}
void padExample( Control sender, int value ) {
void padExample( Control* sender, int value ) {
switch ( value ) {
case P_LEFT_DOWN:
Serial.print( "left down" );
@ -99,10 +103,10 @@ void padExample( Control sender, int value ) {
}
Serial.print( " " );
Serial.println( sender.id );
Serial.println( sender->id );
}
void switchExample( Control sender, int value ) {
void switchExample( Control* sender, int value ) {
switch ( value ) {
case S_ACTIVE:
Serial.print( "Active:" );
@ -117,7 +121,7 @@ void switchExample( Control sender, int value ) {
Serial.println( sender.id );
}
void otherSwitchExample( Control sender, int value ) {
void otherSwitchExample( Control* sender, int value ) {
switch ( value ) {
case S_ACTIVE:
Serial.print( "Active:" );
@ -129,7 +133,7 @@ void otherSwitchExample( Control sender, int value ) {
}
Serial.print( " " );
Serial.println( sender.id );
Serial.println( sender->id );
}
void setup( void ) {
@ -181,18 +185,18 @@ void setup( void ) {
Serial.print( "IP address: " );
Serial.println( WiFi.getMode() == WIFI_AP ? WiFi.softAPIP() : WiFi.localIP() );
ESPUI.addControl( ControlType::Label, "Status:", "Stop" );
ESPUI.addControl( ControlType::Label, "Millis:", "0", ControlColor::Emerald );
ESPUI.addControl( ControlType::Button, "Push Button", "Press", ControlColor::Peterriver, &buttonCallback );
ESPUI.addControl( ControlType::Button, "Other Button", "Press", ControlColor::Wetasphalt, &buttonExample );
ESPUI.addControl( ControlType::Cpad, "Pad with center", "", ControlColor::Sunflower, &padExample );
ESPUI.addControl( ControlType::Pad, "Pad without center", "", ControlColor::Carrot, &padExample );
ESPUI.addControl( ControlType::Switcher, "Switch one", "", ControlColor::Alizarin, &switchExample );
ESPUI.addControl( ControlType::Switcher, "Switch two", "", ControlColor::None, &otherSwitchExample );
ESPUI.addControl( ControlType::Slider, "Slider one", "30", ControlColor::Alizarin, &slider );
ESPUI.addControl( ControlType::Slider, "Slider two", "100", ControlColor::Alizarin, &slider );
ESPUI.addControl( ControlType::Text, "Text Test:", "a Text Field", ControlColor::Alizarin, &textCall );
ESPUI.addControl( ControlType::Number, "Number:", "50", ControlColor::Alizarin, &numberCall );
ESPUI.addControl( ControlType::Label, "Status:", "Stop", ControlColor::Turquoise );
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::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 );
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.
@ -223,3 +227,5 @@ void loop( void ) {
oldTime = millis();
}
}

41
examples/gui/gui.ino
View File

@ -21,19 +21,26 @@ const char* hostname = "EspuiTest";
long oldTime = 0;
bool switchi = false;
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.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.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 ) {
void buttonCallback( Control* sender, int type ) {
switch ( type ) {
case B_DOWN:
Serial.println( "Button DOWN" );
@ -45,20 +52,20 @@ void buttonCallback( Control sender, int type ) {
}
}
void buttonExample( Control sender, int type ) {
void buttonExample( Control* sender, int type ) {
switch ( type ) {
case B_DOWN:
Serial.println( "Status: Start" );
ESPUI.print( 0, "Status: Start" );
ESPUI.updateControl( "Status:", "Start" );
break;
case B_UP:
Serial.println( "Status: Stop" );
ESPUI.print( 0, "Status: Stop" );
ESPUI.updateControl( "Status:", "Stop" );
break;
}
}
void padExample( Control sender, int value ) {
void padExample( Control* sender, int value ) {
switch ( value ) {
case P_LEFT_DOWN:
Serial.print( "left down" );
@ -102,10 +109,10 @@ void padExample( Control sender, int value ) {
}
Serial.print( " " );
Serial.println( sender.id );
Serial.println( sender->id );
}
void switchExample( Control sender, int value ) {
void switchExample( Control* sender, int value ) {
switch ( value ) {
case S_ACTIVE:
Serial.print( "Active:" );
@ -117,10 +124,10 @@ void switchExample( Control sender, int value ) {
}
Serial.print( " " );
Serial.println( sender.id );
Serial.println( sender->id );
}
void otherSwitchExample( Control sender, int value ) {
void otherSwitchExample( Control* sender, int value ) {
switch ( value ) {
case S_ACTIVE:
Serial.print( "Active:" );
@ -132,7 +139,7 @@ void otherSwitchExample( Control sender, int value ) {
}
Serial.print( " " );
Serial.println( sender.id );
Serial.println( sender->id );
}
void setup( void ) {
@ -186,7 +193,7 @@ void setup( void ) {
ESPUI.label( "Status:", COLOR_TURQUOISE, "Stop" );
ESPUI.label( "Millis:", COLOR_EMERALD, "0" );
ESPUI.button( "Push Button", &buttonCallback, COLOR_PETERRIVER );
ESPUI.button( "Push Button", &buttonCallback, COLOR_PETERRIVER, "Press" );
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 );

70
examples/tabbedGui/tabbedGui.ino
View File

@ -18,19 +18,23 @@ const char* ssid = "ESPUI";
const char* password = "espui";
const char* hostname = "EspuiTest";
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.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.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 ) {
void buttonCallback( Control* sender, int type ) {
switch ( type ) {
case B_DOWN:
Serial.println( "Button DOWN" );
@ -42,7 +46,7 @@ void buttonCallback( Control sender, int type ) {
}
}
void buttonExample( Control sender, int type ) {
void buttonExample( Control* sender, int type ) {
switch ( type ) {
case B_DOWN:
Serial.println( "Status: Start" );
@ -55,7 +59,7 @@ void buttonExample( Control sender, int type ) {
break;
}
}
void padExample( Control sender, int value ) {
void padExample( Control* sender, int value ) {
switch ( value ) {
case P_LEFT_DOWN:
Serial.print( "left down" );
@ -99,10 +103,10 @@ void padExample( Control sender, int value ) {
}
Serial.print( " " );
Serial.println( sender.id );
Serial.println( sender->id );
}
void switchExample( Control sender, int value ) {
void switchExample( Control* sender, int value ) {
switch ( value ) {
case S_ACTIVE:
Serial.print( "Active:" );
@ -117,7 +121,7 @@ void switchExample( Control sender, int value ) {
Serial.println( sender.id );
}
void otherSwitchExample( Control sender, int value ) {
void otherSwitchExample( Control* sender, int value ) {
switch ( value ) {
case S_ACTIVE:
Serial.print( "Active:" );
@ -129,7 +133,7 @@ void otherSwitchExample( Control sender, int value ) {
}
Serial.print( " " );
Serial.println( sender.id );
Serial.println( sender->id );
}
void setup( void ) {
@ -180,23 +184,27 @@ void setup( void ) {
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");
ESPUI.addControl( ControlType::Label, "Status:", "Stop",ControlColor::Turquoise, nullptr, tab1 );
ESPUI.addControl( ControlType::Label, "Millis:", "0", ControlColor::Emerald, nullptr, tab1 );
ESPUI.addControl( ControlType::Button, "Push Button", "Press", ControlColor::Peterriver, &buttonCallback, tab1 );
ESPUI.addControl( ControlType::Button, "Other Button", "Press", ControlColor::Wetasphalt, &buttonExample, tab1 );
ESPUI.addControl( ControlType::PadWithCenter, "Pad with center", "", ControlColor::Sunflower, &padExample, tab2 );
ESPUI.addControl( ControlType::Pad, "Pad without center", "", ControlColor::Carrot, &padExample, tab3 );
ESPUI.addControl( ControlType::Switcher, "Switch one", "", ControlColor::Alizarin, &switchExample, tab3 );
ESPUI.addControl( ControlType::Switcher, "Switch two", "", ControlColor::None, &otherSwitchExample, tab3 );
ESPUI.addControl( ControlType::Slider, "Slider one", "30", ControlColor::Alizarin, &slider, tab1 );
ESPUI.addControl( ControlType::Slider, "Slider two", "100", ControlColor::Alizarin, &slider, tab3 );
ESPUI.addControl( ControlType::Text, "Text Test:", "a Text Field", ControlColor::Alizarin, &textCall, tab3 );
ESPUI.addControl( ControlType::Number, "Number:", "50", ControlColor::Alizarin, &numberCall, tab3 );
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
ESPUI.addControl( ControlType::Label, "Status:", "Stop", ControlColor::Turquoise );
ESPUI.addControl( ControlType::Text, "Text Test:", "a Text Field", ControlColor::Alizarin, tab1, &textCall );
// tabbed controls
ESPUI.addControl( ControlType::Label, "Millis:", "0", ControlColor::Emerald, tab1 );
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 );
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 );
/*
* .begin loads and serves all files from PROGMEM directly.