MirrorMirror
/
01
mirror of https://github.com/OpenInterpreter/01.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: esp32 use port only if specified + captive portal UI changes

This commit is contained in:
Shiven Mian 2024-02-29 19:23:52 -08:00
parent 9fa3ef5302
commit 4065b15b1b
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
01OS/01OS/clients/esp32/src/client/client.ino
View File

@ -164,13 +164,24 @@ void connectToWifi(String ssid, String password)
} }
} }
void connectTo01OS(String server_address) bool connectTo01OS(String server_address)
{ {
int err = 0; int err = 0;
String domain = server_address.substring(0, server_address.indexOf(':')); String domain;
String portStr = server_address.substring(server_address.indexOf(':') + 1); String portStr;
int port = portStr.toInt();
if (server_address.indexOf(":") != -1) {
domain = server_address.substring(0, server_address.indexOf(':'));
portStr = server_address.substring(server_address.indexOf(':') + 1);
} else {
domain = server_address;
portStr = ""; // or any default value you want to assign
}
int port = 0; // Default port value
if (portStr.length() > 0) {
port = portStr.toInt();
}
WiFiClient c; WiFiClient c;
HttpClient http(c, domain.c_str(), port); HttpClient http(c, domain.c_str(), port);
@ -178,6 +189,7 @@ void connectTo01OS(String server_address)
Serial.println("Connecting to 01OS at " + domain + ":" + port + "/ping"); Serial.println("Connecting to 01OS at " + domain + ":" + port + "/ping");
err = http.get("/ping"); err = http.get("/ping");
// err = http.get("arduino.cc", "/"); // err = http.get("arduino.cc", "/");
bool connectionSuccess = false;
if (err == 0) if (err == 0)
{ {
@ -193,6 +205,7 @@ void connectTo01OS(String server_address)
{ {
server_domain = domain; server_domain = domain;
server_port = port; server_port = port;
connectionSuccess = true;
} }
err = http.skipResponseHeaders(); err = http.skipResponseHeaders();
@ -246,6 +259,7 @@ void connectTo01OS(String server_address)
Serial.print("Connect failed: "); Serial.print("Connect failed: ");
Serial.println(err); Serial.println(err);
} }
return connectionSuccess;
} }
void setUpWebserver(AsyncWebServer &server, const IPAddress &localIP) void setUpWebserver(AsyncWebServer &server, const IPAddress &localIP)
@ -352,10 +366,20 @@ void setUpWebserver(AsyncWebServer &server, const IPAddress &localIP)
} }
// Attempt to connect to the Wi-Fi network with these credentials // Attempt to connect to the Wi-Fi network with these credentials
connectTo01OS(server_address); bool connectedToServer = connectTo01OS(server_address);
// Redirect user or send a response back // Redirect user or send a response back
request->send(200, "text/plain", "Attempting to connect to 01OS " + server_address); }); String connectionMessage;
if (connectedToServer)
{
connectionMessage = "Connected to 01OS " + server_address;
}
else
{
connectionMessage = "Couldn't connect to 01OS " + server_address;
}
request->send(200, "text/plain", connectionMessage); });
} }
// ----------------------- END OF WIFI CAPTIVE PORTAL ------------------- // ----------------------- END OF WIFI CAPTIVE PORTAL -------------------