From 7c44daf8f47fc8c19b9e0cfcedc4c1e10e9ac0dd Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Sat, 19 Sep 2020 12:50:43 -0700 Subject: [PATCH] pushing my chances to personal branch so i can get the changes from the laptop --- src/meshwifi/meshhttp.cpp | 11 +++++++++++ src/meshwifi/meshwifi.cpp | 13 +++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/meshwifi/meshhttp.cpp b/src/meshwifi/meshhttp.cpp index 0f8988dd..86348655 100644 --- a/src/meshwifi/meshhttp.cpp +++ b/src/meshwifi/meshhttp.cpp @@ -8,6 +8,17 @@ WebServer webserver(80); +struct message { + char sender[10]; + char message[250]; + int32_t gpsLat; + int32_t gpsLong; + uint32_t time; + bool fromMe; +}; + +struct message arrayMessages[50]; + String something = ""; String sender = ""; diff --git a/src/meshwifi/meshwifi.cpp b/src/meshwifi/meshwifi.cpp index a88ed6ae..112b5034 100644 --- a/src/meshwifi/meshwifi.cpp +++ b/src/meshwifi/meshwifi.cpp @@ -16,6 +16,11 @@ bool isWifiAvailable() const char *wifiPsw = radioConfig.preferences.wifi_password; if (*wifiName && *wifiPsw) { + + + // + + return 1; } else { return 0; @@ -26,7 +31,7 @@ bool isWifiAvailable() void deinitWifi() { /* - Note from Jm (Sept 16, 2020): + Note from Jm (jm@casler.org - Sept 16, 2020): A bug in the ESP32 SDK was introduced in Oct 2019 that keeps the WiFi radio from turning back on after it's shut off. See: @@ -52,16 +57,16 @@ void initWifi() const char *wifiName = radioConfig.preferences.wifi_ssid; const char *wifiPsw = radioConfig.preferences.wifi_password; - /* - if (1) { + if (0) { radioConfig.preferences.wifi_ap_mode = 1; strcpy(radioConfig.preferences.wifi_ssid, "MeshTest2"); strcpy(radioConfig.preferences.wifi_password, "12345678"); } else { radioConfig.preferences.wifi_ap_mode = 0; - strcpy(radioConfig.preferences.wifi_ssid, "meshtastic"); + strcpy(radioConfig.preferences.wifi_ssid, "meshtastic1"); strcpy(radioConfig.preferences.wifi_password, "meshtastic!"); } + /* */ if (*wifiName && *wifiPsw) {