From 73a1bcdd603f919e9362ef896a276dc139c13cfb Mon Sep 17 00:00:00 2001 From: Bruno Chabrier Date: Wed, 8 May 2019 08:57:29 +0200 Subject: [PATCH] Allow specifying a ap_ssid (and possibly password) in Automesh mode --- user/user_main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/user/user_main.c b/user/user_main.c index 4afe99a..af9a222 100644 --- a/user/user_main.c +++ b/user/user_main.c @@ -3680,7 +3680,7 @@ void ICACHE_FLASH_ATTR automesh_scan_done(void *arg, STATUS status) for (bss_link = (struct bss_info *)arg; bss_link != NULL; bss_link = bss_link->next.stqe_next) { - if (os_strcmp(bss_link->ssid, config.ssid) == 0) { + if (os_strcmp(bss_link->ssid, config.ssid) == 0 || os_strcmp(bss_link->ssid, config.ap_ssid) == 0) { uint8_t this_mesh_level; os_printf("Found: %d,\"%s\",%d,\""MACSTR"\",%d", @@ -3888,8 +3888,13 @@ struct espconn *pCon; // In Automesh STA and AP passwords and credentials are the same if (config.automesh_mode != AUTOMESH_OFF) { + if (os_strcmp(config.ap_ssid, "none") == 0) { os_memcpy(config.ap_ssid, config.ssid, sizeof(config.ssid)); + } else { + if (os_strcmp(config.ap_ssid, "none") == 0) { os_memcpy(config.ap_password, config.password, sizeof(config.password)); + } + } if (config.automesh_mode == AUTOMESH_LEARNING) { config.ap_on = 0;