alex/esp-rainmaker
1
0
Fork 0
mirror of https://github.com/espressif/esp-rainmaker.git synced 2026-01-19 07:39:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

rmaker_app_network: added menuconfig to control app_network_start() return behaviour

Browse Source
This commit is contained in:
Shreyash Bubane
2025-12-11 00:23:09 +05:30
parent a3b153a48b
commit d02b2f4d0f
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
examples/common/rmaker_app_network/Kconfig.projbuild
View File

@@ -74,6 +74,13 @@ menu "ESP RainMaker App Wi-Fi Provisioning"
help
Provisioning Name Prefix.
config APP_NETWORK_ASYNCHRONOUS_CONNECTION
bool "Asynchronous network connection"
default n
help
If this option is enabled, app_network_start() will perform the network connection asynchronously.
If this option is disabled, app_network_start() will return *after* network connection is established.
config APP_WIFI_PROV_COMPAT
bool "Stay compatible with App Wi-Fi component"
depends on ESP_RMAKER_NETWORK_OVER_WIFI

12
examples/common/rmaker_app_network/app_network.c
View File

@@ -45,14 +45,16 @@
ESP_EVENT_DEFINE_BASE(APP_NETWORK_EVENT);
static const char *TAG = "app_network";
#if !CONFIG_APP_NETWORK_ASYNCHRONOUS_CONNECTION
static const int NETWORK_CONNECTED_EVENT = BIT0;
static EventGroupHandle_t network_event_group;
#endif /* CONFIG_APP_NETWORK_ASYNCHRONOUS_CONNECTION */
#define PROV_QR_VERSION "v1"
#define PROV_TRANSPORT_SOFTAP "softap"
#define PROV_TRANSPORT_BLE "ble"
#define QRCODE_BASE_URL "https://rainmaker.espressif.com/qrcode.html"
#define QRCODE_BASE_URL "https://rainmaker.espressif.com/qrcode.html"
#define CREDENTIALS_NAMESPACE "rmaker_creds"
#define RANDOM_NVS_KEY "random"
@@ -319,14 +321,18 @@ static void network_event_handler(void* arg, esp_event_base_t event_base, int32_
if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {
ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data;
ESP_LOGI(TAG, "Connected with IP Address:" IPSTR, IP2STR(&event->ip_info.ip));
#if !CONFIG_APP_NETWORK_ASYNCHRONOUS_CONNECTION
/* Signal main application to continue execution */
xEventGroupSetBits(network_event_group, NETWORK_CONNECTED_EVENT);
#endif /* CONFIG_APP_NETWORK_ASYNCHRONOUS_CONNECTION */
}
#endif /* CONFIG_ESP_RMAKER_NETWORK_OVER_WIFI */
#ifdef CONFIG_ESP_RMAKER_NETWORK_OVER_THREAD
if (event_base == OPENTHREAD_EVENT && event_id == OPENTHREAD_EVENT_ATTACHED) {
#if !CONFIG_APP_NETWORK_ASYNCHRONOUS_CONNECTION
/* Signal main application to continue execution */
xEventGroupSetBits(network_event_group, NETWORK_CONNECTED_EVENT);
#endif /* CONFIG_APP_NETWORK_ASYNCHRONOUS_CONNECTION */
}
#endif /* CONFIG_ESP_RMAKER_NETWORK_OVER_THREAD */
if (event_base == NETWORK_PROV_EVENT && event_id == NETWORK_PROV_END) {
@@ -358,7 +364,9 @@ void app_network_init()
#ifdef CONFIG_ESP_RMAKER_NETWORK_OVER_THREAD
ESP_ERROR_CHECK(thread_init());
#endif
#if !CONFIG_APP_NETWORK_ASYNCHRONOUS_CONNECTION
network_event_group = xEventGroupCreate();
#endif /* CONFIG_APP_NETWORK_ASYNCHRONOUS_CONNECTION */
#ifdef APP_PROV_STOP_ON_CREDS_MISMATCH
ESP_ERROR_CHECK(esp_event_handler_register(PROTOCOMM_SECURITY_SESSION_EVENT, ESP_EVENT_ANY_ID, &network_event_handler, NULL));
#endif
@@ -448,7 +456,9 @@ esp_err_t app_network_start(app_network_pop_type_t pop_type)
custom_mfg_data = NULL;
custom_mfg_data_len = 0;
}
#if !CONFIG_APP_NETWORK_ASYNCHRONOUS_CONNECTION
/* Wait for Network connection */
xEventGroupWaitBits(network_event_group, NETWORK_CONNECTED_EVENT, false, true, portMAX_DELAY);
#endif /* CONFIG_APP_NETWORK_ASYNCHRONOUS_CONNECTION */
return err;
}