From 9ea4b3d04fb92458a7a2526d493bfec2d623cef6 Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Thu, 1 Aug 2024 11:36:57 +0300 Subject: [PATCH 1/4] feat(net): Add NAPT examples for STA and ETH --- .../ETH_WIFI_BRIDGE/ETH_WIFI_BRIDGE.ino | 93 +++++++++++++++++++ .../examples/WiFiExtender/WiFiExtender.ino | 83 +++++++++++++++++ libraries/WiFi/examples/WiFiExtender/ci.json | 5 + 3 files changed, 181 insertions(+) create mode 100644 libraries/Ethernet/examples/ETH_WIFI_BRIDGE/ETH_WIFI_BRIDGE.ino create mode 100644 libraries/WiFi/examples/WiFiExtender/WiFiExtender.ino create mode 100644 libraries/WiFi/examples/WiFiExtender/ci.json diff --git a/libraries/Ethernet/examples/ETH_WIFI_BRIDGE/ETH_WIFI_BRIDGE.ino b/libraries/Ethernet/examples/ETH_WIFI_BRIDGE/ETH_WIFI_BRIDGE.ino new file mode 100644 index 00000000000..f93d17eb440 --- /dev/null +++ b/libraries/Ethernet/examples/ETH_WIFI_BRIDGE/ETH_WIFI_BRIDGE.ino @@ -0,0 +1,93 @@ +#include +#include +#include + +#define ETH_TYPE ETH_PHY_W5500 +#define ETH_ADDR 1 +#define ETH_CS 15 +#define ETH_IRQ 4 +#define ETH_RST 5 +#define ETH_SPI_SCK 14 +#define ETH_SPI_MISO 12 +#define ETH_SPI_MOSI 13 + +#define AP_SSID "ESP32-ETH-WIFI-BRIDGE" +#define AP_PASS "password" + +IPAddress ap_ip(192, 168, 4, 1); +IPAddress ap_mask(255, 255, 255, 0); +IPAddress ap_leaseStart(192, 168, 4, 2); +IPAddress ap_dns(8, 8, 4, 4); + +void setup() { + Serial.begin(115200); + Serial.setDebugOutput(true); + Network.onEvent(onEvent); + + WiFi.AP.begin(); + WiFi.AP.config(ap_ip, ap_ip, ap_mask, ap_leaseStart, ap_dns); + WiFi.AP.create(AP_SSID, AP_PASS); + if(!WiFi.AP.waitStatusBits(ESP_NETIF_STARTED_BIT, 1000)){ + Serial.println("Failed to start AP!"); + return; + } + delay(100); + + SPI.begin(ETH_SPI_SCK, ETH_SPI_MISO, ETH_SPI_MOSI); + ETH.begin(ETH_TYPE, ETH_ADDR, ETH_CS, ETH_IRQ, ETH_RST, SPI); +} + +void loop() { + delay(20000); +} + +void onEvent(arduino_event_id_t event, arduino_event_info_t info) { + switch (event) { + case ARDUINO_EVENT_ETH_START: + Serial.println("ETH Started"); + break; + case ARDUINO_EVENT_ETH_CONNECTED: + Serial.println("ETH Connected"); + break; + case ARDUINO_EVENT_ETH_GOT_IP: + Serial.println("ETH Got IP"); + Serial.println(ETH); + WiFi.AP.enableNAPT(true); + break; + case ARDUINO_EVENT_ETH_LOST_IP: + Serial.println("ETH Lost IP"); + WiFi.AP.enableNAPT(false); + break; + case ARDUINO_EVENT_ETH_DISCONNECTED: + Serial.println("ETH Disconnected"); + WiFi.AP.enableNAPT(false); + break; + case ARDUINO_EVENT_ETH_STOP: + Serial.println("ETH Stopped"); + break; + + case ARDUINO_EVENT_WIFI_AP_START: + Serial.println("AP Started"); + Serial.println(WiFi.AP); + break; + case ARDUINO_EVENT_WIFI_AP_STACONNECTED: + Serial.println("AP STA Connected"); + break; + case ARDUINO_EVENT_WIFI_AP_STADISCONNECTED: + Serial.println("AP STA Disconnected"); + break; + case ARDUINO_EVENT_WIFI_AP_STAIPASSIGNED: + Serial.print("AP STA IP Assigned: "); + Serial.println(IPAddress(info.wifi_ap_staipassigned.ip.addr)); + break; + case ARDUINO_EVENT_WIFI_AP_PROBEREQRECVED: + Serial.println("AP Probe Request Received"); + break; + case ARDUINO_EVENT_WIFI_AP_STOP: + Serial.println("AP Stopped"); + break; + + default: + break; + } +} diff --git a/libraries/WiFi/examples/WiFiExtender/WiFiExtender.ino b/libraries/WiFi/examples/WiFiExtender/WiFiExtender.ino new file mode 100644 index 00000000000..2ce1ac929a6 --- /dev/null +++ b/libraries/WiFi/examples/WiFiExtender/WiFiExtender.ino @@ -0,0 +1,83 @@ +#include + +#define STA_SSID "YOUR-SSID" +#define STA_PASS "YOUR-PASS" + +#define AP_SSID "ESP32-WIFI-EXTENDER" +#define AP_PASS "password" + +IPAddress ap_ip(192, 168, 4, 1); +IPAddress ap_mask(255, 255, 255, 0); +IPAddress ap_leaseStart(192, 168, 4, 2); +IPAddress ap_dns(8, 8, 4, 4); + +void setup() { + Serial.begin(115200); + Serial.setDebugOutput(true); + Network.onEvent(onEvent); + + WiFi.AP.begin(); + WiFi.AP.config(ap_ip, ap_ip, ap_mask, ap_leaseStart, ap_dns); + WiFi.AP.create(AP_SSID, AP_PASS); + if(!WiFi.AP.waitStatusBits(ESP_NETIF_STARTED_BIT, 1000)){ + Serial.println("Failed to start AP!"); + return; + } + + WiFi.begin(STA_SSID, STA_PASS); +} + +void loop() { + delay(20000); +} + +void onEvent(arduino_event_id_t event, arduino_event_info_t info) { + switch (event) { + case ARDUINO_EVENT_WIFI_STA_START: + Serial.println("STA Started"); + break; + case ARDUINO_EVENT_WIFI_STA_CONNECTED: + Serial.println("STA Connected"); + break; + case ARDUINO_EVENT_WIFI_STA_GOT_IP: + Serial.println("STA Got IP"); + Serial.println(WiFi.STA); + WiFi.AP.enableNAPT(true); + break; + case ARDUINO_EVENT_WIFI_STA_LOST_IP: + Serial.println("STA Lost IP"); + WiFi.AP.enableNAPT(false); + break; + case ARDUINO_EVENT_WIFI_STA_DISCONNECTED: + Serial.println("STA Disconnected"); + WiFi.AP.enableNAPT(false); + break; + case ARDUINO_EVENT_WIFI_STA_STOP: + Serial.println("STA Stopped"); + break; + + case ARDUINO_EVENT_WIFI_AP_START: + Serial.println("AP Started"); + Serial.println(WiFi.AP); + break; + case ARDUINO_EVENT_WIFI_AP_STACONNECTED: + Serial.println("AP STA Connected"); + break; + case ARDUINO_EVENT_WIFI_AP_STADISCONNECTED: + Serial.println("AP STA Disconnected"); + break; + case ARDUINO_EVENT_WIFI_AP_STAIPASSIGNED: + Serial.print("AP STA IP Assigned: "); + Serial.println(IPAddress(info.wifi_ap_staipassigned.ip.addr)); + break; + case ARDUINO_EVENT_WIFI_AP_PROBEREQRECVED: + Serial.println("AP Probe Request Received"); + break; + case ARDUINO_EVENT_WIFI_AP_STOP: + Serial.println("AP Stopped"); + break; + + default: + break; + } +} diff --git a/libraries/WiFi/examples/WiFiExtender/ci.json b/libraries/WiFi/examples/WiFiExtender/ci.json new file mode 100644 index 00000000000..d8b3664bc65 --- /dev/null +++ b/libraries/WiFi/examples/WiFiExtender/ci.json @@ -0,0 +1,5 @@ +{ + "targets": { + "esp32h2": false + } +} From 4872f1d30c934b525bc4bcee99eae5183c0b19d8 Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Thu, 1 Aug 2024 11:48:39 +0300 Subject: [PATCH 2/4] feat(net): Add NAPT example for PPP --- .../PPP_WIFI_BRIDGE/PPP_WIFI_BRIDGE.ino | 168 ++++++++++++++++++ 1 file changed, 168 insertions(+) create mode 100644 libraries/PPP/examples/PPP_WIFI_BRIDGE/PPP_WIFI_BRIDGE.ino diff --git a/libraries/PPP/examples/PPP_WIFI_BRIDGE/PPP_WIFI_BRIDGE.ino b/libraries/PPP/examples/PPP_WIFI_BRIDGE/PPP_WIFI_BRIDGE.ino new file mode 100644 index 00000000000..777cfe17004 --- /dev/null +++ b/libraries/PPP/examples/PPP_WIFI_BRIDGE/PPP_WIFI_BRIDGE.ino @@ -0,0 +1,168 @@ +#include +#include + +#define PPP_MODEM_APN "internet" +#define PPP_MODEM_PIN "0000" // or NULL + +// WaveShare SIM7600 HW Flow Control +#define PPP_MODEM_RST 25 +#define PPP_MODEM_RST_LOW false //active HIGH +#define PPP_MODEM_RST_DELAY 200 +#define PPP_MODEM_TX 21 +#define PPP_MODEM_RX 22 +#define PPP_MODEM_RTS 26 +#define PPP_MODEM_CTS 27 +#define PPP_MODEM_FC ESP_MODEM_FLOW_CONTROL_HW +#define PPP_MODEM_MODEL PPP_MODEM_SIM7600 + +// SIM800 basic module with just TX,RX and RST +// #define PPP_MODEM_RST 0 +// #define PPP_MODEM_RST_LOW true //active LOW +// #define PPP_MODEM_TX 2 +// #define PPP_MODEM_RX 19 +// #define PPP_MODEM_RTS -1 +// #define PPP_MODEM_CTS -1 +// #define PPP_MODEM_FC ESP_MODEM_FLOW_CONTROL_NONE +// #define PPP_MODEM_MODEL PPP_MODEM_SIM800 + +// WiFi Access Point Config +#define AP_SSID "ESP32-ETH-WIFI-BRIDGE" +#define AP_PASS "password" + +IPAddress ap_ip(192, 168, 4, 1); +IPAddress ap_mask(255, 255, 255, 0); +IPAddress ap_leaseStart(192, 168, 4, 2); +IPAddress ap_dns(8, 8, 4, 4); + +void setup() { + Serial.begin(115200); + Serial.setDebugOutput(true); + + // Listen for modem events + Network.onEvent(onEvent); + + // Start the Access Point + WiFi.AP.begin(); + WiFi.AP.config(ap_ip, ap_ip, ap_mask, ap_leaseStart, ap_dns); + WiFi.AP.create(AP_SSID, AP_PASS); + if(!WiFi.AP.waitStatusBits(ESP_NETIF_STARTED_BIT, 1000)){ + Serial.println("Failed to start AP!"); + return; + } + + // Configure the modem + PPP.setApn(PPP_MODEM_APN); + PPP.setPin(PPP_MODEM_PIN); + PPP.setResetPin(PPP_MODEM_RST, PPP_MODEM_RST_LOW, PPP_MODEM_RST_DELAY); + PPP.setPins(PPP_MODEM_TX, PPP_MODEM_RX, PPP_MODEM_RTS, PPP_MODEM_CTS, PPP_MODEM_FC); + + Serial.println("Starting the modem. It might take a while!"); + PPP.begin(PPP_MODEM_MODEL); + + Serial.print("Manufacturer: "); + Serial.println(PPP.cmd("AT+CGMI", 10000)); + Serial.print("Model: "); + Serial.println(PPP.moduleName()); + Serial.print("IMEI: "); + Serial.println(PPP.IMEI()); + + bool attached = PPP.attached(); + if (!attached) { + int i = 0; + unsigned int s = millis(); + Serial.print("Waiting to connect to network"); + while (!attached && ((++i) < 600)) { + Serial.print("."); + delay(100); + attached = PPP.attached(); + } + Serial.print((millis() - s) / 1000.0, 1); + Serial.println("s"); + attached = PPP.attached(); + } + + Serial.print("Attached: "); + Serial.println(attached); + Serial.print("State: "); + Serial.println(PPP.radioState()); + if (attached) { + Serial.print("Operator: "); + Serial.println(PPP.operatorName()); + Serial.print("IMSI: "); + Serial.println(PPP.IMSI()); + Serial.print("RSSI: "); + Serial.println(PPP.RSSI()); + int ber = PPP.BER(); + if (ber > 0) { + Serial.print("BER: "); + Serial.println(ber); + Serial.print("NetMode: "); + Serial.println(PPP.networkMode()); + } + + Serial.println("Switching to data mode..."); + PPP.mode(ESP_MODEM_MODE_CMUX); // Data and Command mixed mode + if (!PPP.waitStatusBits(ESP_NETIF_CONNECTED_BIT, 1000)) { + Serial.println("Failed to connect to internet!"); + } else { + Serial.println("Connected to internet!"); + } + } else { + Serial.println("Failed to connect to network!"); + } +} + +void loop() { + delay(20000); +} + +void onEvent(arduino_event_id_t event, arduino_event_info_t info) { + switch (event) { + case ARDUINO_EVENT_PPP_START: + Serial.println("PPP Started"); + break; + case ARDUINO_EVENT_PPP_CONNECTED: + Serial.println("PPP Connected"); + break; + case ARDUINO_EVENT_PPP_GOT_IP: + Serial.println("PPP Got IP"); + Serial.println(PPP); + WiFi.AP.enableNAPT(true); + break; + case ARDUINO_EVENT_PPP_LOST_IP: + Serial.println("PPP Lost IP"); + WiFi.AP.enableNAPT(false); + break; + case ARDUINO_EVENT_PPP_DISCONNECTED: + Serial.println("PPP Disconnected"); + WiFi.AP.enableNAPT(false); + break; + case ARDUINO_EVENT_PPP_STOP: + Serial.println("PPP Stopped"); + break; + + case ARDUINO_EVENT_WIFI_AP_START: + Serial.println("AP Started"); + Serial.println(WiFi.AP); + break; + case ARDUINO_EVENT_WIFI_AP_STACONNECTED: + Serial.println("AP STA Connected"); + break; + case ARDUINO_EVENT_WIFI_AP_STADISCONNECTED: + Serial.println("AP STA Disconnected"); + break; + case ARDUINO_EVENT_WIFI_AP_STAIPASSIGNED: + Serial.print("AP STA IP Assigned: "); + Serial.println(IPAddress(info.wifi_ap_staipassigned.ip.addr)); + break; + case ARDUINO_EVENT_WIFI_AP_PROBEREQRECVED: + Serial.println("AP Probe Request Received"); + break; + case ARDUINO_EVENT_WIFI_AP_STOP: + Serial.println("AP Stopped"); + break; + + default: + break; + } +} From 270fd42f3384080e7ce540faabb2547010a1ad91 Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Thu, 1 Aug 2024 11:59:38 +0300 Subject: [PATCH 3/4] feat(net): Add CI configs to skip H2 --- libraries/Ethernet/examples/ETH_WIFI_BRIDGE/ci.json | 5 +++++ libraries/PPP/examples/PPP_WIFI_BRIDGE/ci.json | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 libraries/Ethernet/examples/ETH_WIFI_BRIDGE/ci.json create mode 100644 libraries/PPP/examples/PPP_WIFI_BRIDGE/ci.json diff --git a/libraries/Ethernet/examples/ETH_WIFI_BRIDGE/ci.json b/libraries/Ethernet/examples/ETH_WIFI_BRIDGE/ci.json new file mode 100644 index 00000000000..d8b3664bc65 --- /dev/null +++ b/libraries/Ethernet/examples/ETH_WIFI_BRIDGE/ci.json @@ -0,0 +1,5 @@ +{ + "targets": { + "esp32h2": false + } +} diff --git a/libraries/PPP/examples/PPP_WIFI_BRIDGE/ci.json b/libraries/PPP/examples/PPP_WIFI_BRIDGE/ci.json new file mode 100644 index 00000000000..d8b3664bc65 --- /dev/null +++ b/libraries/PPP/examples/PPP_WIFI_BRIDGE/ci.json @@ -0,0 +1,5 @@ +{ + "targets": { + "esp32h2": false + } +} From 2786df33a555e8b57229fdeb32661afeb24299bf Mon Sep 17 00:00:00 2001 From: "pre-commit-ci-lite[bot]" <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 08:15:37 +0000 Subject: [PATCH 4/4] ci(pre-commit): Apply automatic fixes --- .../ETH_WIFI_BRIDGE/ETH_WIFI_BRIDGE.ino | 55 +++++++------------ .../PPP_WIFI_BRIDGE/PPP_WIFI_BRIDGE.ino | 33 +++-------- .../examples/WiFiExtender/WiFiExtender.ino | 39 ++++--------- 3 files changed, 41 insertions(+), 86 deletions(-) diff --git a/libraries/Ethernet/examples/ETH_WIFI_BRIDGE/ETH_WIFI_BRIDGE.ino b/libraries/Ethernet/examples/ETH_WIFI_BRIDGE/ETH_WIFI_BRIDGE.ino index f93d17eb440..ba89d5de607 100644 --- a/libraries/Ethernet/examples/ETH_WIFI_BRIDGE/ETH_WIFI_BRIDGE.ino +++ b/libraries/Ethernet/examples/ETH_WIFI_BRIDGE/ETH_WIFI_BRIDGE.ino @@ -2,14 +2,14 @@ #include #include -#define ETH_TYPE ETH_PHY_W5500 -#define ETH_ADDR 1 -#define ETH_CS 15 -#define ETH_IRQ 4 -#define ETH_RST 5 -#define ETH_SPI_SCK 14 -#define ETH_SPI_MISO 12 -#define ETH_SPI_MOSI 13 +#define ETH_TYPE ETH_PHY_W5500 +#define ETH_ADDR 1 +#define ETH_CS 15 +#define ETH_IRQ 4 +#define ETH_RST 5 +#define ETH_SPI_SCK 14 +#define ETH_SPI_MISO 12 +#define ETH_SPI_MOSI 13 #define AP_SSID "ESP32-ETH-WIFI-BRIDGE" #define AP_PASS "password" @@ -23,16 +23,16 @@ void setup() { Serial.begin(115200); Serial.setDebugOutput(true); Network.onEvent(onEvent); - + WiFi.AP.begin(); WiFi.AP.config(ap_ip, ap_ip, ap_mask, ap_leaseStart, ap_dns); WiFi.AP.create(AP_SSID, AP_PASS); - if(!WiFi.AP.waitStatusBits(ESP_NETIF_STARTED_BIT, 1000)){ + if (!WiFi.AP.waitStatusBits(ESP_NETIF_STARTED_BIT, 1000)) { Serial.println("Failed to start AP!"); return; } delay(100); - + SPI.begin(ETH_SPI_SCK, ETH_SPI_MISO, ETH_SPI_MOSI); ETH.begin(ETH_TYPE, ETH_ADDR, ETH_CS, ETH_IRQ, ETH_RST, SPI); } @@ -43,12 +43,8 @@ void loop() { void onEvent(arduino_event_id_t event, arduino_event_info_t info) { switch (event) { - case ARDUINO_EVENT_ETH_START: - Serial.println("ETH Started"); - break; - case ARDUINO_EVENT_ETH_CONNECTED: - Serial.println("ETH Connected"); - break; + case ARDUINO_EVENT_ETH_START: Serial.println("ETH Started"); break; + case ARDUINO_EVENT_ETH_CONNECTED: Serial.println("ETH Connected"); break; case ARDUINO_EVENT_ETH_GOT_IP: Serial.println("ETH Got IP"); Serial.println(ETH); @@ -62,32 +58,21 @@ void onEvent(arduino_event_id_t event, arduino_event_info_t info) { Serial.println("ETH Disconnected"); WiFi.AP.enableNAPT(false); break; - case ARDUINO_EVENT_ETH_STOP: - Serial.println("ETH Stopped"); - break; + case ARDUINO_EVENT_ETH_STOP: Serial.println("ETH Stopped"); break; case ARDUINO_EVENT_WIFI_AP_START: Serial.println("AP Started"); Serial.println(WiFi.AP); break; - case ARDUINO_EVENT_WIFI_AP_STACONNECTED: - Serial.println("AP STA Connected"); - break; - case ARDUINO_EVENT_WIFI_AP_STADISCONNECTED: - Serial.println("AP STA Disconnected"); - break; + case ARDUINO_EVENT_WIFI_AP_STACONNECTED: Serial.println("AP STA Connected"); break; + case ARDUINO_EVENT_WIFI_AP_STADISCONNECTED: Serial.println("AP STA Disconnected"); break; case ARDUINO_EVENT_WIFI_AP_STAIPASSIGNED: Serial.print("AP STA IP Assigned: "); Serial.println(IPAddress(info.wifi_ap_staipassigned.ip.addr)); break; - case ARDUINO_EVENT_WIFI_AP_PROBEREQRECVED: - Serial.println("AP Probe Request Received"); - break; - case ARDUINO_EVENT_WIFI_AP_STOP: - Serial.println("AP Stopped"); - break; - - default: - break; + case ARDUINO_EVENT_WIFI_AP_PROBEREQRECVED: Serial.println("AP Probe Request Received"); break; + case ARDUINO_EVENT_WIFI_AP_STOP: Serial.println("AP Stopped"); break; + + default: break; } } diff --git a/libraries/PPP/examples/PPP_WIFI_BRIDGE/PPP_WIFI_BRIDGE.ino b/libraries/PPP/examples/PPP_WIFI_BRIDGE/PPP_WIFI_BRIDGE.ino index 777cfe17004..1e3f9f9bb98 100644 --- a/libraries/PPP/examples/PPP_WIFI_BRIDGE/PPP_WIFI_BRIDGE.ino +++ b/libraries/PPP/examples/PPP_WIFI_BRIDGE/PPP_WIFI_BRIDGE.ino @@ -45,7 +45,7 @@ void setup() { WiFi.AP.begin(); WiFi.AP.config(ap_ip, ap_ip, ap_mask, ap_leaseStart, ap_dns); WiFi.AP.create(AP_SSID, AP_PASS); - if(!WiFi.AP.waitStatusBits(ESP_NETIF_STARTED_BIT, 1000)){ + if (!WiFi.AP.waitStatusBits(ESP_NETIF_STARTED_BIT, 1000)) { Serial.println("Failed to start AP!"); return; } @@ -118,12 +118,8 @@ void loop() { void onEvent(arduino_event_id_t event, arduino_event_info_t info) { switch (event) { - case ARDUINO_EVENT_PPP_START: - Serial.println("PPP Started"); - break; - case ARDUINO_EVENT_PPP_CONNECTED: - Serial.println("PPP Connected"); - break; + case ARDUINO_EVENT_PPP_START: Serial.println("PPP Started"); break; + case ARDUINO_EVENT_PPP_CONNECTED: Serial.println("PPP Connected"); break; case ARDUINO_EVENT_PPP_GOT_IP: Serial.println("PPP Got IP"); Serial.println(PPP); @@ -137,32 +133,21 @@ void onEvent(arduino_event_id_t event, arduino_event_info_t info) { Serial.println("PPP Disconnected"); WiFi.AP.enableNAPT(false); break; - case ARDUINO_EVENT_PPP_STOP: - Serial.println("PPP Stopped"); - break; + case ARDUINO_EVENT_PPP_STOP: Serial.println("PPP Stopped"); break; case ARDUINO_EVENT_WIFI_AP_START: Serial.println("AP Started"); Serial.println(WiFi.AP); break; - case ARDUINO_EVENT_WIFI_AP_STACONNECTED: - Serial.println("AP STA Connected"); - break; - case ARDUINO_EVENT_WIFI_AP_STADISCONNECTED: - Serial.println("AP STA Disconnected"); - break; + case ARDUINO_EVENT_WIFI_AP_STACONNECTED: Serial.println("AP STA Connected"); break; + case ARDUINO_EVENT_WIFI_AP_STADISCONNECTED: Serial.println("AP STA Disconnected"); break; case ARDUINO_EVENT_WIFI_AP_STAIPASSIGNED: Serial.print("AP STA IP Assigned: "); Serial.println(IPAddress(info.wifi_ap_staipassigned.ip.addr)); break; - case ARDUINO_EVENT_WIFI_AP_PROBEREQRECVED: - Serial.println("AP Probe Request Received"); - break; - case ARDUINO_EVENT_WIFI_AP_STOP: - Serial.println("AP Stopped"); - break; + case ARDUINO_EVENT_WIFI_AP_PROBEREQRECVED: Serial.println("AP Probe Request Received"); break; + case ARDUINO_EVENT_WIFI_AP_STOP: Serial.println("AP Stopped"); break; - default: - break; + default: break; } } diff --git a/libraries/WiFi/examples/WiFiExtender/WiFiExtender.ino b/libraries/WiFi/examples/WiFiExtender/WiFiExtender.ino index 2ce1ac929a6..c7f95c1b416 100644 --- a/libraries/WiFi/examples/WiFiExtender/WiFiExtender.ino +++ b/libraries/WiFi/examples/WiFiExtender/WiFiExtender.ino @@ -15,15 +15,15 @@ void setup() { Serial.begin(115200); Serial.setDebugOutput(true); Network.onEvent(onEvent); - + WiFi.AP.begin(); WiFi.AP.config(ap_ip, ap_ip, ap_mask, ap_leaseStart, ap_dns); WiFi.AP.create(AP_SSID, AP_PASS); - if(!WiFi.AP.waitStatusBits(ESP_NETIF_STARTED_BIT, 1000)){ + if (!WiFi.AP.waitStatusBits(ESP_NETIF_STARTED_BIT, 1000)) { Serial.println("Failed to start AP!"); return; } - + WiFi.begin(STA_SSID, STA_PASS); } @@ -33,12 +33,8 @@ void loop() { void onEvent(arduino_event_id_t event, arduino_event_info_t info) { switch (event) { - case ARDUINO_EVENT_WIFI_STA_START: - Serial.println("STA Started"); - break; - case ARDUINO_EVENT_WIFI_STA_CONNECTED: - Serial.println("STA Connected"); - break; + case ARDUINO_EVENT_WIFI_STA_START: Serial.println("STA Started"); break; + case ARDUINO_EVENT_WIFI_STA_CONNECTED: Serial.println("STA Connected"); break; case ARDUINO_EVENT_WIFI_STA_GOT_IP: Serial.println("STA Got IP"); Serial.println(WiFi.STA); @@ -52,32 +48,21 @@ void onEvent(arduino_event_id_t event, arduino_event_info_t info) { Serial.println("STA Disconnected"); WiFi.AP.enableNAPT(false); break; - case ARDUINO_EVENT_WIFI_STA_STOP: - Serial.println("STA Stopped"); - break; + case ARDUINO_EVENT_WIFI_STA_STOP: Serial.println("STA Stopped"); break; case ARDUINO_EVENT_WIFI_AP_START: Serial.println("AP Started"); Serial.println(WiFi.AP); break; - case ARDUINO_EVENT_WIFI_AP_STACONNECTED: - Serial.println("AP STA Connected"); - break; - case ARDUINO_EVENT_WIFI_AP_STADISCONNECTED: - Serial.println("AP STA Disconnected"); - break; + case ARDUINO_EVENT_WIFI_AP_STACONNECTED: Serial.println("AP STA Connected"); break; + case ARDUINO_EVENT_WIFI_AP_STADISCONNECTED: Serial.println("AP STA Disconnected"); break; case ARDUINO_EVENT_WIFI_AP_STAIPASSIGNED: Serial.print("AP STA IP Assigned: "); Serial.println(IPAddress(info.wifi_ap_staipassigned.ip.addr)); break; - case ARDUINO_EVENT_WIFI_AP_PROBEREQRECVED: - Serial.println("AP Probe Request Received"); - break; - case ARDUINO_EVENT_WIFI_AP_STOP: - Serial.println("AP Stopped"); - break; - - default: - break; + case ARDUINO_EVENT_WIFI_AP_PROBEREQRECVED: Serial.println("AP Probe Request Received"); break; + case ARDUINO_EVENT_WIFI_AP_STOP: Serial.println("AP Stopped"); break; + + default: break; } }