Small changes

geza-pycom · geza-pycom · commit ca673c0cd065 · 2020-10-25T13:17:50.000+01:00
diff --git a/esp32/mods/modbt.c b/esp32/mods/modbt.c
@@ -1436,7 +1436,13 @@ static mp_obj_t bt_connect_helper(mp_obj_t addr, TickType_t timeout){
 
     /* Initiate a background connection, esp_ble_gattc_open returns immediately */
     if (ESP_OK != esp_ble_gattc_open(bt_obj.gattc_if, bufinfo.buf, BLE_ADDR_TYPE_PUBLIC, true)) {
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_operation_failed));
+        // Only drop exception if not called from bt_resume() API, otherwise return with mp_const_none on error
+        if(mod_bt_allow_resume_deinit == false) {
+            nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_operation_failed));
+        }
+        else {
+            return mp_const_none;
+        }
     }
 
     MP_THREAD_GIL_EXIT();
diff --git a/esp32/mods/modmachine.c b/esp32/mods/modmachine.c
@@ -442,6 +442,7 @@ STATIC mp_obj_t machine_sleep (uint n_args, const mp_obj_t *arg) {
     {
         nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "Wifi or BT not stopped before sleep"));
     }
+
     /* resume wlan */
     wlan_resume(reconnect);
     /* resume bt */
diff --git a/esp32/mods/modwlan.c b/esp32/mods/modwlan.c
@@ -988,7 +988,6 @@ static void TASK_SMART_CONFIG (void *pvParameters) {
 
 smartConf_start:
     wlan_smart_config_enabled = true;
-    mp_printf(&mp_plat_print, "\n-------SmartConfig Started-------\n");
     /*create Timer */
     wlan_smartConfig_timeout = xTimerCreate("smartConfig_Timer", 60000 / portTICK_PERIOD_MS, 0, 0, wlan_timer_callback);
     /*start Timer */
@@ -2489,7 +2488,7 @@ STATIC mp_obj_t wlan_country(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_
     if(wlan_obj.country == NULL) {
         wlan_obj.country = (wifi_country_t*)malloc(sizeof(wifi_country_t));
     }
-    memcpy(&(wlan_obj.country), &country_config, sizeof(wlan_obj.country));
+    memcpy(wlan_obj.country, &country_config, sizeof(wifi_country_t));
 
     return mp_const_none;
 }

Original file line number	Diff line number	Diff line change
`@@ -442,6 +442,7 @@ STATIC mp_obj_t machine_sleep (uint n_args, const mp_obj_t *arg) {`
`442`	`442`	`{`
`443`	`443`	`nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "Wifi or BT not stopped before sleep"));`
`444`	`444`	`}`
	`445`	`+`
`445`	`446`	`/* resume wlan */`
`446`	`447`	`wlan_resume(reconnect);`
`447`	`448`	`/* resume bt */`
Original file line number	Diff line number	Diff line change
`@@ -988,7 +988,6 @@ static void TASK_SMART_CONFIG (void *pvParameters) {`
`988`	`988`
`989`	`989`	`smartConf_start:`
`990`	`990`	`wlan_smart_config_enabled = true;`
`991`		`- mp_printf(&mp_plat_print, "\n-------SmartConfig Started-------\n");`
`992`	`991`	`/create Timer /`
`993`	`992`	`wlan_smartConfig_timeout = xTimerCreate("smartConfig_Timer", 60000 / portTICK_PERIOD_MS, 0, 0, wlan_timer_callback);`
`994`	`993`	`/start Timer /`
`@@ -2489,7 +2488,7 @@ STATIC mp_obj_t wlan_country(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_`
`2489`	`2488`	`if(wlan_obj.country == NULL) {`
`2490`	`2489`	`wlan_obj.country = (wifi_country_t*)malloc(sizeof(wifi_country_t));`
`2491`	`2490`	`}`
`2492`		`- memcpy(&(wlan_obj.country), &country_config, sizeof(wlan_obj.country));`
	`2491`	`+ memcpy(wlan_obj.country, &country_config, sizeof(wifi_country_t));`
`2493`	`2492`
`2494`	`2493`	`return mp_const_none;`
`2495`	`2494`	`}`