Skip to content

Commit ac01755

Browse files
committed
Add optional argument (user) to WifiConnectionHandler and related conditional to substitute Wifi.beginEnterprise method() when modified from default value.
1 parent 5cca5c1 commit ac01755

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

src/Arduino_WiFiConnectionHandler.cpp

+14-3
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@
2727
CTOR/DTOR
2828
******************************************************************************/
2929

30-
WiFiConnectionHandler::WiFiConnectionHandler(char const * ssid, char const * pass, bool const keep_alive)
30+
WiFiConnectionHandler::WiFiConnectionHandler(char const * ssid, char const * pass, char const * user, bool const keep_alive)
3131
: ConnectionHandler{keep_alive}
3232
, _ssid{ssid}
3333
, _pass{pass}
34+
, _user{user}
3435
{
3536

3637
}
@@ -85,7 +86,12 @@ NetworkConnectionState WiFiConnectionHandler::update_handleInit()
8586
Debug.print(DBG_ERROR, F("WiFi status ESP: %d"), WiFi.status());
8687
WiFi.disconnect();
8788
delay(300);
88-
WiFi.begin(_ssid, _pass);
89+
if (_user != "default"){
90+
WiFi.beginEnterprise(_ssid, _user, _pass);
91+
}
92+
else{
93+
WiFi.begin(_ssid, _pass);
94+
}
8995
delay(1000);
9096
#endif /* #if !defined(BOARD_ESP8266) && !defined(ESP32) */
9197

@@ -97,7 +103,12 @@ NetworkConnectionState WiFiConnectionHandler::update_handleConnecting()
97103
#if !defined(BOARD_ESP8266) && !defined(ESP32)
98104
if (WiFi.status() != WL_CONNECTED)
99105
{
100-
WiFi.begin(_ssid, _pass);
106+
if (_user != "default"){
107+
WiFi.beginEnterprise(_ssid, _user, _pass);
108+
}
109+
else{
110+
WiFi.begin(_ssid, _pass);
111+
}
101112
}
102113
#endif /* ifndef BOARD_ESP8266 */
103114

src/Arduino_WiFiConnectionHandler.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class WiFiConnectionHandler : public ConnectionHandler
3434
{
3535
public:
3636

37-
WiFiConnectionHandler(char const * ssid, char const * pass, bool const keep_alive = true);
37+
WiFiConnectionHandler(char const * ssid, char const * pass, char const * user = "default", bool const keep_alive = true);
3838

3939

4040
virtual unsigned long getTime() override;
@@ -54,6 +54,7 @@ class WiFiConnectionHandler : public ConnectionHandler
5454

5555
char const * _ssid;
5656
char const * _pass;
57+
char const * _user;
5758

5859
WiFiUDP _wifi_udp;
5960
WiFiClient _wifi_client;

0 commit comments

Comments
 (0)