From 3fcd4a61aaf5ccc6b6a00459f0dc6e03eee1fae2 Mon Sep 17 00:00:00 2001
From: Jm Casler <jm@casler.org>
Date: Tue, 15 Sep 2020 20:24:03 -0700
Subject: [PATCH] commenting out the strcpy to manually set the wifi info.

---
 src/meshwifi/meshwifi.cpp    | 4 ++--
 src/nimble/BluetoothUtil.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/meshwifi/meshwifi.cpp b/src/meshwifi/meshwifi.cpp
index 8c5d0a2a..19a52bf5 100644
--- a/src/meshwifi/meshwifi.cpp
+++ b/src/meshwifi/meshwifi.cpp
@@ -13,8 +13,8 @@ void deinitWifi()
 
 void initWifi()
 {
-    strcpy(radioConfig.preferences.wifi_ssid, WiFi_SSID_NAME);
-    strcpy(radioConfig.preferences.wifi_password, WiFi_SSID_PASSWORD);
+    //strcpy(radioConfig.preferences.wifi_ssid, WiFi_SSID_NAME);
+    //strcpy(radioConfig.preferences.wifi_password, WiFi_SSID_PASSWORD);
     if (radioConfig.has_preferences) {
         const char *wifiName = radioConfig.preferences.wifi_ssid;
 
diff --git a/src/nimble/BluetoothUtil.cpp b/src/nimble/BluetoothUtil.cpp
index f5595c5a..00e7deea 100644
--- a/src/nimble/BluetoothUtil.cpp
+++ b/src/nimble/BluetoothUtil.cpp
@@ -528,7 +528,7 @@ void setBluetoothEnable(bool on)
         } else {
             // We have to totally teardown our bluetooth objects to prevent leaks
             deinitBLE();
-            WiFi.mode(WIFI_MODE_NULL); // shutdown wifi
+            deinitWifi(); // shutdown wifi
 
             Serial.printf("Shutdown BT: %u heap size\n", ESP.getFreeHeap());
             // ESP_ERROR_CHECK( heap_trace_stop() );