From 4b331eb0960b7ec8a2a7290334a0f37f43061487 Mon Sep 17 00:00:00 2001 From: per1234 Date: Thu, 19 Oct 2017 23:52:29 -0700 Subject: [PATCH 1/6] Use correct separator in keywords.txt The Arduino IDE requires the use of a tab separator between the name and identifier. Without this tab the keyword is not highlighted. Reference: https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5:-Library-specification#keywords --- keywords.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/keywords.txt b/keywords.txt index 4b19b1d..7d99580 100644 --- a/keywords.txt +++ b/keywords.txt @@ -1,8 +1,8 @@ -EasyUI KEYWORD1 +EasyUI KEYWORD1 -detectCDN KEYWORD2 -title KEYWORD2 -begin KEYWORD2 -label KEYWORD2 -toggleButton KEYWORD2 -loop KEYWORD2 +detectCDN KEYWORD2 +title KEYWORD2 +begin KEYWORD2 +label KEYWORD2 +toggleButton KEYWORD2 +loop KEYWORD2 From 4ee8b7e6b43bd89e0dd3431b27fbc4c668c90cdf Mon Sep 17 00:00:00 2001 From: Lukas Bachschwell Date: Fri, 20 Oct 2017 11:28:10 +0200 Subject: [PATCH 2/6] Update keywords.txt --- keywords.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/keywords.txt b/keywords.txt index 7d99580..05095b7 100644 --- a/keywords.txt +++ b/keywords.txt @@ -1,8 +1,10 @@ -EasyUI KEYWORD1 +ESPUI KEYWORD1 -detectCDN KEYWORD2 -title KEYWORD2 -begin KEYWORD2 label KEYWORD2 -toggleButton KEYWORD2 -loop KEYWORD2 +button KEYWORD2 +switcher KEYWORD2 +pad KEYWORD2 + +begin KEYWORD2 +print KEYWORD2 +updateSwitcher KEYWORD2 From 929aa109e44940ec0b0d00f3a873486c48fcf26d Mon Sep 17 00:00:00 2001 From: Lukas Bachschwell Date: Fri, 20 Oct 2017 11:49:54 +0200 Subject: [PATCH 3/6] Update gui.ino typo --- examples/gui/gui.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/gui/gui.ino b/examples/gui/gui.ino index 2753631..a8f8287 100644 --- a/examples/gui/gui.ino +++ b/examples/gui/gui.ino @@ -1,5 +1,5 @@ #include -#include +#include const char* ssid = "ESP32"; const char* password = ""; From 436c7001392ad59171497f8f806292da750593c1 Mon Sep 17 00:00:00 2001 From: Lukas Bachschwell Date: Fri, 20 Oct 2017 11:52:43 +0200 Subject: [PATCH 4/6] Version bump --- library.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library.properties b/library.properties index 065a7c3..ee070cf 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=ESPUI -version=1.0 +version=1.1 author=Lukas Bachschwell maintainer=Lukas Bachschwell sentence=ESP32 Web Interface Library From 356f3d6edd6e929a92f4c4a79660729d06d8db66 Mon Sep 17 00:00:00 2001 From: Lukas Bachschwell Date: Fri, 20 Oct 2017 12:04:03 +0200 Subject: [PATCH 5/6] More example mistakes when stressed out... --- examples/gui/gui.ino | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/gui/gui.ino b/examples/gui/gui.ino index a8f8287..f27620a 100644 --- a/examples/gui/gui.ino +++ b/examples/gui/gui.ino @@ -31,22 +31,22 @@ void setup(void) { Serial.println(WiFi.localIP()); */ - EasyUI.label("Status: Stop"); - EasyUI.label("0"); - EasyUI.button("Push Button", &buttonCallback); - EasyUI.button("Push Button", &buttonExample); - EasyUI.pad("center", true, &padExample); - EasyUI.pad("NoCenter", false, &padExample); - EasyUI.switcher("Switch one", false, &switchExample); - EasyUI.switcher("Switch two", true, &otherSwitchExample); + ESPUI.label("Status: Stop"); + ESPUI.label("0"); + ESPUI.button("Push Button", &buttonCallback); + ESPUI.button("Push Button", &buttonExample); + ESPUI.pad("center", true, &padExample); + ESPUI.pad("NoCenter", false, &padExample); + ESPUI.switcher("Switch one", false, &switchExample); + ESPUI.switcher("Switch two", true, &otherSwitchExample); - EasyUI.begin("ESP32 Control"); + ESPUI.begin("ESP32 Control"); } void loop(void) { if (millis() - oldTime > 5000) { - EasyUI.print(1, String(millis())); + ESPUI.print(1, String(millis())); oldTime = millis(); } } @@ -67,11 +67,11 @@ void buttonExample(int id, int type) { switch (type) { case B_DOWN: Serial.println("Status: Start"); - EasyUI.print(0, "Status: Start"); + ESPUI.print(0, "Status: Start"); break; case B_UP: Serial.println("Status: Stop"); - EasyUI.print(0, "Status: Stop"); + ESPUI.print(0, "Status: Stop"); break; } } From 0f0162ad8b7d1569a762af4bf3f15ef87cb1f07d Mon Sep 17 00:00:00 2001 From: Lukas Bachschwell Date: Fri, 20 Oct 2017 12:40:48 +0200 Subject: [PATCH 6/6] Versionbump --- library.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library.properties b/library.properties index ee070cf..b9caa9c 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=ESPUI -version=1.1 +version=1.1.1 author=Lukas Bachschwell maintainer=Lukas Bachschwell sentence=ESP32 Web Interface Library