rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-22 10:42:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

#561 Add escapes to strings

Browse Source
This commit is contained in:
Jm Casler
2020-12-12 21:35:21 -08:00
parent 17297db2b1
commit 5249608dce
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/meshwifi/meshhttp.cpp
View File

@@ -927,7 +927,11 @@ void handleScanNetworks(HTTPRequest *req, HTTPResponse *res)
for (int i = 0; i < n; ++i) { for (int i = 0; i < n; ++i) {
char ssidArray[50]; char ssidArray[50];
String(WiFi.SSID(i)).toCharArray(ssidArray, WiFi.SSID(i).length()); String ssidString = String(WiFi.SSID(i));
//String ssidString = String(WiFi.SSID(i)).toCharArray(ssidArray, WiFi.SSID(i).length());
ssidString.replace("\"", "\\\"");
ssidString.toCharArray(ssidArray, 50);
if (WiFi.encryptionType(i) != WIFI_AUTH_OPEN) { if (WiFi.encryptionType(i) != WIFI_AUTH_OPEN) {
//res->println("{\"ssid\": \"%s\",\"rssi\": -75}, ", String(WiFi.SSID(i).c_str() ); //res->println("{\"ssid\": \"%s\",\"rssi\": -75}, ", String(WiFi.SSID(i).c_str() );
@@ -939,7 +943,7 @@ void handleScanNetworks(HTTPRequest *req, HTTPResponse *res)
} }
} }
// Yield some cpu cycles to IP stack. // Yield some cpu cycles to IP stack.
// This is important in case the list is large and it takes us tome to return // This is important in case the list is large and it takes us time to return
// to the main loop. // to the main loop.
yield(); yield();
} }

4
src/meshwifi/meshwifi.cpp
View File

@@ -40,8 +40,8 @@ bool isWifiAvailable()
// strcpy(radioConfig.preferences.wifi_ssid, ""); // strcpy(radioConfig.preferences.wifi_ssid, "");
// strcpy(radioConfig.preferences.wifi_password, ""); // strcpy(radioConfig.preferences.wifi_password, "");
strcpy(radioConfig.preferences.wifi_ssid, "meshtastic"); // strcpy(radioConfig.preferences.wifi_ssid, "meshtastic");
strcpy(radioConfig.preferences.wifi_password, "meshtastic!"); // strcpy(radioConfig.preferences.wifi_password, "meshtastic!");
if (*wifiName && *wifiPsw) { if (*wifiName && *wifiPsw) {
return 1; return 1;