From c3d5a6a288e7899dbfd763205f27287081d77687 Mon Sep 17 00:00:00 2001 From: Lupino Date: Wed, 9 Jan 2019 09:38:01 +0800 Subject: [PATCH 1/2] add esp32 modsmartconfig --- ports/esp32/Makefile | 1 + ports/esp32/modsmartconfig.c | 169 +++++++++++++++++++++++++++++++++++ ports/esp32/mpconfigport.h | 2 + 3 files changed, 172 insertions(+) create mode 100644 ports/esp32/modsmartconfig.c diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile index ea90c9f3f5a9d..f81c3dd434a5c 100644 --- a/ports/esp32/Makefile +++ b/ports/esp32/Makefile @@ -192,6 +192,7 @@ SRC_C = \ machine_wdt.c \ mpthreadport.c \ machine_rtc.c \ + modsmartconfig.c \ $(SRC_MOD) EXTMOD_SRC_C = $(addprefix extmod/,\ diff --git a/ports/esp32/modsmartconfig.c b/ports/esp32/modsmartconfig.c new file mode 100644 index 0000000000000..3cfd4097b0756 --- /dev/null +++ b/ports/esp32/modsmartconfig.c @@ -0,0 +1,169 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * Development of the code in this file was sponsored by Microbric Pty Ltd + * + * The MIT License (MIT) + * + * Copyright (c) 2015 Paul Sokolovsky + * Copyright (c) 2016 Damien P. George + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include +#include + +#include "esp_log.h" +#include "esp_wifi.h" +#include "esp_smartconfig.h" +#include "freertos/event_groups.h" + +#include "py/runtime.h" + +static const char *TAG = "sc"; + +wifi_config_t * wifi_config; +char phoneip[15] = {0}; + +static EventGroupHandle_t wait_event_group; +static const int SMARTCONFIG_DONE_BIT = BIT1; + +void STATIC smartconfig_callback(smartconfig_status_t status, void *pdata) { + switch(status) { + case SC_STATUS_WAIT: + ESP_LOGI(TAG, "SC_STATUS_WAIT"); + break; + case SC_STATUS_FIND_CHANNEL: + ESP_LOGI(TAG, "SC_STATUS_FINDING_CHANNEL"); + break; + case SC_STATUS_GETTING_SSID_PSWD: + ESP_LOGI(TAG, "SC_STATUS_GETTING_SSID_PSWD"); + break; + case SC_STATUS_LINK: + ESP_LOGI(TAG, "SC_STATUS_LINK"); + wifi_config = (wifi_config_t *)pdata; + ESP_LOGI(TAG, "SSID:%s", wifi_config->sta.ssid); + ESP_LOGI(TAG, "PASSWORD:%s", wifi_config->sta.password); + ESP_ERROR_CHECK( esp_wifi_disconnect() ); + ESP_ERROR_CHECK( esp_wifi_set_config(ESP_IF_WIFI_STA, wifi_config) ); + ESP_ERROR_CHECK( esp_wifi_connect() ); + break; + case SC_STATUS_LINK_OVER: + ESP_LOGI(TAG, "SC_STATUS_LINK_OVER"); + if (pdata != NULL) { + uint8_t phone_ip[4] = {0}; + memcpy(phone_ip, (uint8_t* )pdata, 4); + ESP_LOGI(TAG, "Phone ip: %d.%d.%d.%d\n", phone_ip[0], phone_ip[1], phone_ip[2], phone_ip[3]); + sprintf(phoneip, "%d.%d.%d.%d", phone_ip[0], phone_ip[1], phone_ip[2], phone_ip[3]); + } + xEventGroupSetBits(wait_event_group, SMARTCONFIG_DONE_BIT); + break; + } +} + +STATIC mp_obj_t espsmartconfig_set_type(size_t n_args, const mp_obj_t *args) { + smartconfig_type_t tp = SC_TYPE_ESPTOUCH; + if (n_args > 0) { + tp = mp_obj_get_int(args[0]); + } + esp_smartconfig_set_type(tp); + return mp_const_none; +} +STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espsmartconfig_set_type_obj, 0, 1, espsmartconfig_set_type); + +STATIC mp_obj_t espsmartconfig_start(void) { + wait_event_group = xEventGroupCreate(); + esp_smartconfig_start(smartconfig_callback); + return mp_const_none; +} +MP_DEFINE_CONST_FUN_OBJ_0(espsmartconfig_start_obj, espsmartconfig_start); + +STATIC mp_obj_t espsmartconfig_stop(void) { + esp_smartconfig_stop(); + vEventGroupDelete(wait_event_group); + return mp_const_none; +} +MP_DEFINE_CONST_FUN_OBJ_0(espsmartconfig_stop_obj, espsmartconfig_stop); + +STATIC mp_obj_t espsmartconfig_getssid(void) { + if (wifi_config != NULL) { + char ssid[32] = {0}; + sprintf(ssid, "%s", wifi_config->sta.ssid); + return mp_obj_new_str(ssid, strlen(ssid)); + } else { + return mp_const_none; + } +} + +MP_DEFINE_CONST_FUN_OBJ_0(espsmartconfig_getssid_obj, espsmartconfig_getssid); + +STATIC mp_obj_t espsmartconfig_getpassword(void) { + if (wifi_config != NULL) { + char password[64] = {0}; + sprintf(password, "%s", wifi_config->sta.password); + return mp_obj_new_str(password, strlen(password)); + } else { + return mp_const_none; + } +} + +MP_DEFINE_CONST_FUN_OBJ_0(espsmartconfig_getpassword_obj, espsmartconfig_getpassword); + +STATIC mp_obj_t espsmartconfig_getphoneip(void) { + return mp_obj_new_str(phoneip, strlen(phoneip)); +} + +MP_DEFINE_CONST_FUN_OBJ_0(espsmartconfig_getphoneip_obj, espsmartconfig_getphoneip); + +STATIC mp_obj_t espsmartconfig_wait(void) { + EventBits_t uxBits; + while (1) { + uxBits = xEventGroupWaitBits(wait_event_group, SMARTCONFIG_DONE_BIT, true, false, portMAX_DELAY); + if(uxBits & SMARTCONFIG_DONE_BIT) { + break; + } + } + + return mp_const_none; +} + +MP_DEFINE_CONST_FUN_OBJ_0(espsmartconfig_wait_obj, espsmartconfig_wait); + + +STATIC const mp_map_elem_t mo_module_espsmartconfig_globals_table[] = { + { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_smartconfig) }, + { MP_ROM_QSTR(MP_QSTR_set_type), (mp_obj_t)&espsmartconfig_set_type_obj }, + { MP_ROM_QSTR(MP_QSTR_start), (mp_obj_t)&espsmartconfig_start_obj }, + { MP_ROM_QSTR(MP_QSTR_stop), (mp_obj_t)&espsmartconfig_stop_obj }, + { MP_ROM_QSTR(MP_QSTR_get_ssid), (mp_obj_t)&espsmartconfig_getssid_obj }, + { MP_ROM_QSTR(MP_QSTR_get_password), (mp_obj_t)&espsmartconfig_getpassword_obj }, + { MP_ROM_QSTR(MP_QSTR_get_phoneip), (mp_obj_t)&espsmartconfig_getphoneip_obj }, + { MP_ROM_QSTR(MP_QSTR_wait), (mp_obj_t)&espsmartconfig_wait_obj }, + { MP_ROM_QSTR(MP_QSTR_ESPTOUCH), MP_ROM_INT(SC_TYPE_ESPTOUCH) }, + { MP_ROM_QSTR(MP_QSTR_AIRKISS), MP_ROM_INT(SC_TYPE_AIRKISS) }, + { MP_ROM_QSTR(MP_QSTR_ESPTOUCH_AIRKISS), MP_ROM_INT(SC_TYPE_ESPTOUCH_AIRKISS) }, +}; + +STATIC MP_DEFINE_CONST_DICT(mo_module_espsmartconfig_globals, mo_module_espsmartconfig_globals_table); + +const mp_obj_module_t mp_module_espsmartconfig = { + .base = { &mp_type_module }, + .globals = (mp_obj_dict_t*)&mo_module_espsmartconfig_globals, +}; diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h index 7b9b40025035a..274794cceecbf 100644 --- a/ports/esp32/mpconfigport.h +++ b/ports/esp32/mpconfigport.h @@ -178,6 +178,7 @@ extern const struct _mp_obj_module_t mp_module_usocket; extern const struct _mp_obj_module_t mp_module_machine; extern const struct _mp_obj_module_t mp_module_network; extern const struct _mp_obj_module_t mp_module_onewire; +extern const struct _mp_obj_module_t mp_module_espsmartconfig; #define MICROPY_PORT_BUILTIN_MODULES \ { MP_OBJ_NEW_QSTR(MP_QSTR_esp), (mp_obj_t)&esp_module }, \ @@ -189,6 +190,7 @@ extern const struct _mp_obj_module_t mp_module_onewire; { MP_OBJ_NEW_QSTR(MP_QSTR_network), (mp_obj_t)&mp_module_network }, \ { MP_OBJ_NEW_QSTR(MP_QSTR__onewire), (mp_obj_t)&mp_module_onewire }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_uhashlib), (mp_obj_t)&mp_module_uhashlib }, \ + { MP_OBJ_NEW_QSTR(MP_QSTR_smartconfig), (mp_obj_t)&mp_module_espsmartconfig }, \ #define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \ { MP_OBJ_NEW_QSTR(MP_QSTR_binascii), (mp_obj_t)&mp_module_ubinascii }, \ From 30feca2a2da8dd045ec4d629a6aa1e78c60fda8e Mon Sep 17 00:00:00 2001 From: Lupino Date: Wed, 9 Jan 2019 15:53:07 +0800 Subject: [PATCH 2/2] implement esp32 modsmartconfig status --- ports/esp32/modsmartconfig.c | 47 ++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/ports/esp32/modsmartconfig.c b/ports/esp32/modsmartconfig.c index 3cfd4097b0756..33f5b9f216969 100644 --- a/ports/esp32/modsmartconfig.c +++ b/ports/esp32/modsmartconfig.c @@ -42,8 +42,7 @@ static const char *TAG = "sc"; wifi_config_t * wifi_config; char phoneip[15] = {0}; -static EventGroupHandle_t wait_event_group; -static const int SMARTCONFIG_DONE_BIT = BIT1; +smartconfig_status_t smartconfig_status; void STATIC smartconfig_callback(smartconfig_status_t status, void *pdata) { switch(status) { @@ -73,9 +72,9 @@ void STATIC smartconfig_callback(smartconfig_status_t status, void *pdata) { ESP_LOGI(TAG, "Phone ip: %d.%d.%d.%d\n", phone_ip[0], phone_ip[1], phone_ip[2], phone_ip[3]); sprintf(phoneip, "%d.%d.%d.%d", phone_ip[0], phone_ip[1], phone_ip[2], phone_ip[3]); } - xEventGroupSetBits(wait_event_group, SMARTCONFIG_DONE_BIT); break; } + smartconfig_status = status; } STATIC mp_obj_t espsmartconfig_set_type(size_t n_args, const mp_obj_t *args) { @@ -89,7 +88,7 @@ STATIC mp_obj_t espsmartconfig_set_type(size_t n_args, const mp_obj_t *args) { STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espsmartconfig_set_type_obj, 0, 1, espsmartconfig_set_type); STATIC mp_obj_t espsmartconfig_start(void) { - wait_event_group = xEventGroupCreate(); + smartconfig_status = SC_STATUS_WAIT; esp_smartconfig_start(smartconfig_callback); return mp_const_none; } @@ -97,7 +96,6 @@ MP_DEFINE_CONST_FUN_OBJ_0(espsmartconfig_start_obj, espsmartconfig_start); STATIC mp_obj_t espsmartconfig_stop(void) { esp_smartconfig_stop(); - vEventGroupDelete(wait_event_group); return mp_const_none; } MP_DEFINE_CONST_FUN_OBJ_0(espsmartconfig_stop_obj, espsmartconfig_stop); @@ -132,33 +130,30 @@ STATIC mp_obj_t espsmartconfig_getphoneip(void) { MP_DEFINE_CONST_FUN_OBJ_0(espsmartconfig_getphoneip_obj, espsmartconfig_getphoneip); -STATIC mp_obj_t espsmartconfig_wait(void) { - EventBits_t uxBits; - while (1) { - uxBits = xEventGroupWaitBits(wait_event_group, SMARTCONFIG_DONE_BIT, true, false, portMAX_DELAY); - if(uxBits & SMARTCONFIG_DONE_BIT) { - break; - } - } - - return mp_const_none; +STATIC mp_obj_t espsmartconfig_status(void) { + return mp_obj_new_int(smartconfig_status); } -MP_DEFINE_CONST_FUN_OBJ_0(espsmartconfig_wait_obj, espsmartconfig_wait); +MP_DEFINE_CONST_FUN_OBJ_0(espsmartconfig_status_obj, espsmartconfig_status); STATIC const mp_map_elem_t mo_module_espsmartconfig_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_smartconfig) }, - { MP_ROM_QSTR(MP_QSTR_set_type), (mp_obj_t)&espsmartconfig_set_type_obj }, - { MP_ROM_QSTR(MP_QSTR_start), (mp_obj_t)&espsmartconfig_start_obj }, - { MP_ROM_QSTR(MP_QSTR_stop), (mp_obj_t)&espsmartconfig_stop_obj }, - { MP_ROM_QSTR(MP_QSTR_get_ssid), (mp_obj_t)&espsmartconfig_getssid_obj }, - { MP_ROM_QSTR(MP_QSTR_get_password), (mp_obj_t)&espsmartconfig_getpassword_obj }, - { MP_ROM_QSTR(MP_QSTR_get_phoneip), (mp_obj_t)&espsmartconfig_getphoneip_obj }, - { MP_ROM_QSTR(MP_QSTR_wait), (mp_obj_t)&espsmartconfig_wait_obj }, - { MP_ROM_QSTR(MP_QSTR_ESPTOUCH), MP_ROM_INT(SC_TYPE_ESPTOUCH) }, - { MP_ROM_QSTR(MP_QSTR_AIRKISS), MP_ROM_INT(SC_TYPE_AIRKISS) }, - { MP_ROM_QSTR(MP_QSTR_ESPTOUCH_AIRKISS), MP_ROM_INT(SC_TYPE_ESPTOUCH_AIRKISS) }, + { MP_ROM_QSTR(MP_QSTR_set_type), MP_ROM_PTR((mp_obj_t *)&espsmartconfig_set_type_obj) }, + { MP_ROM_QSTR(MP_QSTR_start), MP_ROM_PTR((mp_obj_t *)&espsmartconfig_start_obj) }, + { MP_ROM_QSTR(MP_QSTR_stop), MP_ROM_PTR((mp_obj_t *)&espsmartconfig_stop_obj) }, + { MP_ROM_QSTR(MP_QSTR_get_ssid), MP_ROM_PTR((mp_obj_t *)&espsmartconfig_getssid_obj) }, + { MP_ROM_QSTR(MP_QSTR_get_password), MP_ROM_PTR((mp_obj_t *)&espsmartconfig_getpassword_obj) }, + { MP_ROM_QSTR(MP_QSTR_get_phoneip), MP_ROM_PTR((mp_obj_t *)&espsmartconfig_getphoneip_obj) }, + { MP_ROM_QSTR(MP_QSTR_status), MP_ROM_PTR((mp_obj_t *)&espsmartconfig_status_obj) }, + { MP_ROM_QSTR(MP_QSTR_SC_TYPE_ESPTOUCH), MP_ROM_INT(SC_TYPE_ESPTOUCH) }, + { MP_ROM_QSTR(MP_QSTR_SC_TYPE_AIRKISS), MP_ROM_INT(SC_TYPE_AIRKISS) }, + { MP_ROM_QSTR(MP_QSTR_SC_TYPE_ESPTOUCH_AIRKISS), MP_ROM_INT(SC_TYPE_ESPTOUCH_AIRKISS) }, + { MP_ROM_QSTR(MP_QSTR_SC_STATUS_WAIT), MP_ROM_INT((mp_uint_t)SC_STATUS_WAIT) }, + { MP_ROM_QSTR(MP_QSTR_SC_STATUS_FIND_CHANNEL), MP_ROM_INT((mp_uint_t)SC_STATUS_FIND_CHANNEL) }, + { MP_ROM_QSTR(MP_QSTR_SC_STATUS_GETTING_SSID_PSWD), MP_ROM_INT((mp_uint_t)SC_STATUS_GETTING_SSID_PSWD) }, + { MP_ROM_QSTR(MP_QSTR_SC_STATUS_LINK), MP_ROM_INT((mp_uint_t)SC_STATUS_LINK) }, + { MP_ROM_QSTR(MP_QSTR_SC_STATUS_LINK_OVER), MP_ROM_INT((mp_uint_t)SC_STATUS_LINK_OVER) }, }; STATIC MP_DEFINE_CONST_DICT(mo_module_espsmartconfig_globals, mo_module_espsmartconfig_globals_table); pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy