From 1f6cd496c7b547d7ec25b11184c9dda25de1d541 Mon Sep 17 00:00:00 2001
From: anecdata <16617689+anecdata@users.noreply.github.com>
Date: Thu, 21 Jan 2021 13:54:19 -0600
Subject: [PATCH] 1. check enabled before scan; 2. make start-station() the
 single control point for esp_wifi_set_mode()

---
 locale/circuitpython.pot              | 8 ++++----
 ports/esp32s2/common-hal/wifi/Radio.c | 8 +++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index ab404ca002..5d870f30f2 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -564,10 +564,6 @@ msgstr ""
 msgid "Can only alarm on two low pins from deep sleep."
 msgstr ""
 
-#: ports/esp32s2/common-hal/wifi/Radio.c
-msgid "Can't connect when wifi is not enabled"
-msgstr ""
-
 #: ports/nrf/common-hal/_bleio/Characteristic.c
 msgid "Can't set CCCD on local Characteristic"
 msgstr ""
@@ -3910,6 +3906,10 @@ msgstr ""
 msgid "width must be greater than zero"
 msgstr ""
 
+#: ports/esp32s2/common-hal/wifi/Radio.c
+msgid "wifi is not enabled"
+msgstr ""
+
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
 msgstr ""
diff --git a/ports/esp32s2/common-hal/wifi/Radio.c b/ports/esp32s2/common-hal/wifi/Radio.c
index 24ec210091..574bab0a19 100644
--- a/ports/esp32s2/common-hal/wifi/Radio.c
+++ b/ports/esp32s2/common-hal/wifi/Radio.c
@@ -72,7 +72,7 @@ void common_hal_wifi_radio_set_enabled(wifi_radio_obj_t *self, bool enabled) {
     }
     if (!self->started && enabled) {
 	// esp_wifi_start() would default to soft-AP, thus setting it to station
-        ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));
+        start_station(self);
         ESP_ERROR_CHECK(esp_wifi_start());
         self->started = true;
         return;
@@ -89,7 +89,9 @@ mp_obj_t common_hal_wifi_radio_start_scanning_networks(wifi_radio_obj_t *self) {
     if (self->current_scan != NULL) {
         mp_raise_RuntimeError(translate("Already scanning for wifi networks"));
     }
-    // check enabled
+    if (!common_hal_wifi_radio_get_enabled(self)) {
+        mp_raise_RuntimeError(translate("wifi is not enabled"));
+    }
     start_station(self);
 
     wifi_scannednetworks_obj_t *scan = m_new_obj(wifi_scannednetworks_obj_t);
@@ -127,7 +129,7 @@ void common_hal_wifi_radio_set_hostname(wifi_radio_obj_t *self, const char *host
 
 wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t* ssid, size_t ssid_len, uint8_t* password, size_t password_len, uint8_t channel, mp_float_t timeout, uint8_t* bssid, size_t bssid_len) {
     if (!common_hal_wifi_radio_get_enabled(self)) {
-        mp_raise_RuntimeError(translate("Can't connect when wifi is not enabled"));
+        mp_raise_RuntimeError(translate("wifi is not enabled"));
     }
 
     EventBits_t bits;