From e3638beb14fc6592e28060f08cd50f4c93017df3 Mon Sep 17 00:00:00 2001 From: Lukas Bachschwell Date: Sat, 8 Jan 2022 17:31:37 +0100 Subject: [PATCH] Some example improvements by @thomastech Signed-off-by: Lukas Bachschwell --- examples/gui-generic-api/gui-generic-api.ino | 15 +++++++++-- examples/gui/gui.ino | 16 +++++++++-- examples/tabbedGui/tabbedGui.ino | 16 +++++++++-- pio_examples/gui/platformio.ini | 28 ++++++++++++++------ pio_examples/gui/src/gui.ino | 17 ++++++++++-- 5 files changed, 76 insertions(+), 16 deletions(-) diff --git a/examples/gui-generic-api/gui-generic-api.ino b/examples/gui-generic-api/gui-generic-api.ino index 05bb1c9..6d1f6e9 100644 --- a/examples/gui-generic-api/gui-generic-api.ino +++ b/examples/gui-generic-api/gui-generic-api.ino @@ -2,7 +2,7 @@ #include const byte DNS_PORT = 53; -IPAddress apIP(192, 168, 1, 1); +IPAddress apIP(192, 168, 4, 1); DNSServer dnsServer; #if defined(ESP32) @@ -200,8 +200,19 @@ void setup(void) Serial.print("\n\nCreating hotspot"); WiFi.mode(WIFI_AP); + delay(100); WiFi.softAPConfig(apIP, apIP, IPAddress(255, 255, 255, 0)); - WiFi.softAP(ssid); +#if defined(ESP32) + uint32_t chipid = 0; + for (int i = 0; i < 17; i = i + 8) + { + chipid |= ((ESP.getEfuseMac() >> (40 - i)) & 0xff) << i; + } +#else + uint32_t chipid = ESP.getChipId(); +#endif char ap_ssid[25]; + snprintf(ap_ssid, 26, "ESPUI-%08X", chipid); + WiFi.softAP(ap_ssid); timeout = 5; diff --git a/examples/gui/gui.ino b/examples/gui/gui.ino index 954ef2b..361150e 100644 --- a/examples/gui/gui.ino +++ b/examples/gui/gui.ino @@ -2,7 +2,7 @@ #include const byte DNS_PORT = 53; -IPAddress apIP(192, 168, 1, 1); +IPAddress apIP(192, 168, 4, 1); DNSServer dnsServer; #if defined(ESP32) @@ -190,8 +190,20 @@ void setup(void) Serial.print("\n\nCreating hotspot"); WiFi.mode(WIFI_AP); + delay(100); WiFi.softAPConfig(apIP, apIP, IPAddress(255, 255, 255, 0)); - WiFi.softAP(ssid); +#if defined(ESP32) + uint32_t chipid = 0; + for (int i = 0; i < 17; i = i + 8) + { + chipid |= ((ESP.getEfuseMac() >> (40 - i)) & 0xff) << i; + } +#else + uint32_t chipid = ESP.getChipId(); +#endif + char ap_ssid[25]; + snprintf(ap_ssid, 26, "ESPUI-%08X", chipid); + WiFi.softAP(ap_ssid); timeout = 5; diff --git a/examples/tabbedGui/tabbedGui.ino b/examples/tabbedGui/tabbedGui.ino index edc6428..a1ecd31 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, 4, 1); DNSServer dnsServer; #if defined(ESP32) @@ -198,8 +198,20 @@ void setup(void) Serial.print("\n\nCreating hotspot"); WiFi.mode(WIFI_AP); + delay(100); WiFi.softAPConfig(apIP, apIP, IPAddress(255, 255, 255, 0)); - WiFi.softAP(ssid); +#if defined(ESP32) + uint32_t chipid = 0; + for (int i = 0; i < 17; i = i + 8) + { + chipid |= ((ESP.getEfuseMac() >> (40 - i)) & 0xff) << i; + } +#else + uint32_t chipid = ESP.getChipId(); +#endif + char ap_ssid[25]; + snprintf(ap_ssid, 26, "ESPUI-%08X", chipid); + WiFi.softAP(ap_ssid); timeout = 5; diff --git a/pio_examples/gui/platformio.ini b/pio_examples/gui/platformio.ini index c3564da..e366dd8 100644 --- a/pio_examples/gui/platformio.ini +++ b/pio_examples/gui/platformio.ini @@ -8,18 +8,30 @@ ; Please visit documentation for the other options and examples ; https://docs.platformio.org/page/projectconf.html +[platformio] +src_dir = ./src +data_dir = ../../data + +[env] +lib_extra_dirs = ../../ +board_build.filesystem = littlefs +; Additional scripts: Usage: see https://github.com/s00500/ESPUI/issues/144#issuecomment-1005135077 +;extra_scripts = +; LittleFSBuilder.py + [env:esp8266] platform = espressif8266 -board = nodemcuv2 framework = arduino - -lib_extra_dirs = ../../ +board = nodemcuv2 +lib_deps = + bblanchon/ArduinoJson @ ^6.18.5 + me-no-dev/ESP Async WebServer @ ^1.2.3 [env:esp32] platform = espressif32 -board = esp32dev framework = arduino - -lib_extra_dirs = ../../ - -lib_deps = lorol/LittleFS_esp32 +board = esp32dev +lib_deps = + lorol/LittleFS_esp32@^1.0.6 + bblanchon/ArduinoJson @ ^6.18.5 + me-no-dev/ESP Async WebServer @ ^1.2.3 diff --git a/pio_examples/gui/src/gui.ino b/pio_examples/gui/src/gui.ino index 3c17925..e998061 100644 --- a/pio_examples/gui/src/gui.ino +++ b/pio_examples/gui/src/gui.ino @@ -2,7 +2,7 @@ #include const byte DNS_PORT = 53; -IPAddress apIP(192, 168, 1, 1); +IPAddress apIP(192, 168, 4, 1); DNSServer dnsServer; #if defined(ESP32) @@ -190,8 +190,21 @@ void setup(void) Serial.print("\n\nCreating hotspot"); WiFi.mode(WIFI_AP); + delay(100); WiFi.softAPConfig(apIP, apIP, IPAddress(255, 255, 255, 0)); - WiFi.softAP(ssid); +#if defined(ESP32) + uint32_t chipid = 0; + for (int i = 0; i < 17; i = i + 8) + { + chipid |= ((ESP.getEfuseMac() >> (40 - i)) & 0xff) << i; + } +#else + uint32_t chipid = ESP.getChipId(); +#endif + + char ap_ssid[25]; + snprintf(ap_ssid, 26, "ESPUI-%08X", chipid); + WiFi.softAP(ap_ssid); timeout = 5;