378f8f72f0
1. Fix wrong timeout setting in join command, also alter the default timeout value to 10 seconds 2. Don't clear the CONNECTED_BIT when connected to AP.
130 lines
3.8 KiB
C
130 lines
3.8 KiB
C
/* Console example — WiFi commands
|
|
|
|
This example code is in the Public Domain (or CC0 licensed, at your option.)
|
|
|
|
Unless required by applicable law or agreed to in writing, this
|
|
software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
|
|
CONDITIONS OF ANY KIND, either express or implied.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include "esp_log.h"
|
|
#include "esp_console.h"
|
|
#include "argtable3/argtable3.h"
|
|
#include "cmd_decl.h"
|
|
#include "freertos/FreeRTOS.h"
|
|
#include "freertos/event_groups.h"
|
|
#include "esp_wifi.h"
|
|
#include "tcpip_adapter.h"
|
|
#include "esp_event_loop.h"
|
|
#include "cmd_wifi.h"
|
|
|
|
#define JOIN_TIMEOUT_MS (10000)
|
|
|
|
static EventGroupHandle_t wifi_event_group;
|
|
const int CONNECTED_BIT = BIT0;
|
|
|
|
static esp_err_t event_handler(void *ctx, system_event_t *event)
|
|
{
|
|
switch (event->event_id) {
|
|
case SYSTEM_EVENT_STA_GOT_IP:
|
|
xEventGroupSetBits(wifi_event_group, CONNECTED_BIT);
|
|
break;
|
|
case SYSTEM_EVENT_STA_DISCONNECTED:
|
|
esp_wifi_connect();
|
|
xEventGroupClearBits(wifi_event_group, CONNECTED_BIT);
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
return ESP_OK;
|
|
}
|
|
|
|
static void initialise_wifi(void)
|
|
{
|
|
esp_log_level_set("wifi", ESP_LOG_WARN);
|
|
static bool initialized = false;
|
|
if (initialized) {
|
|
return;
|
|
}
|
|
tcpip_adapter_init();
|
|
wifi_event_group = xEventGroupCreate();
|
|
ESP_ERROR_CHECK( esp_event_loop_init(event_handler, NULL) );
|
|
wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
|
|
ESP_ERROR_CHECK( esp_wifi_init(&cfg) );
|
|
ESP_ERROR_CHECK( esp_wifi_set_storage(WIFI_STORAGE_RAM) );
|
|
ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_NULL) );
|
|
ESP_ERROR_CHECK( esp_wifi_start() );
|
|
initialized = true;
|
|
}
|
|
|
|
static bool wifi_join(const char *ssid, const char *pass, int timeout_ms)
|
|
{
|
|
initialise_wifi();
|
|
wifi_config_t wifi_config = { 0 };
|
|
strncpy((char *) wifi_config.sta.ssid, ssid, sizeof(wifi_config.sta.ssid));
|
|
if (pass) {
|
|
strncpy((char *) wifi_config.sta.password, pass, sizeof(wifi_config.sta.password));
|
|
}
|
|
|
|
ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) );
|
|
ESP_ERROR_CHECK( esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) );
|
|
ESP_ERROR_CHECK( esp_wifi_connect() );
|
|
|
|
int bits = xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT,
|
|
pdFALSE, pdTRUE, timeout_ms / portTICK_PERIOD_MS);
|
|
return (bits & CONNECTED_BIT) != 0;
|
|
}
|
|
|
|
/** Arguments used by 'join' function */
|
|
static struct {
|
|
struct arg_int *timeout;
|
|
struct arg_str *ssid;
|
|
struct arg_str *password;
|
|
struct arg_end *end;
|
|
} join_args;
|
|
|
|
static int connect(int argc, char **argv)
|
|
{
|
|
int nerrors = arg_parse(argc, argv, (void **) &join_args);
|
|
if (nerrors != 0) {
|
|
arg_print_errors(stderr, join_args.end, argv[0]);
|
|
return 1;
|
|
}
|
|
ESP_LOGI(__func__, "Connecting to '%s'",
|
|
join_args.ssid->sval[0]);
|
|
|
|
/* set default value*/
|
|
if (join_args.timeout->count == 0) {
|
|
join_args.timeout->ival[0] = JOIN_TIMEOUT_MS;
|
|
}
|
|
|
|
bool connected = wifi_join(join_args.ssid->sval[0],
|
|
join_args.password->sval[0],
|
|
join_args.timeout->ival[0]);
|
|
if (!connected) {
|
|
ESP_LOGW(__func__, "Connection timed out");
|
|
return 1;
|
|
}
|
|
ESP_LOGI(__func__, "Connected");
|
|
return 0;
|
|
}
|
|
|
|
void register_wifi()
|
|
{
|
|
join_args.timeout = arg_int0(NULL, "timeout", "<t>", "Connection timeout, ms");
|
|
join_args.ssid = arg_str1(NULL, NULL, "<ssid>", "SSID of AP");
|
|
join_args.password = arg_str0(NULL, NULL, "<pass>", "PSK of AP");
|
|
join_args.end = arg_end(2);
|
|
|
|
const esp_console_cmd_t join_cmd = {
|
|
.command = "join",
|
|
.help = "Join WiFi AP as a station",
|
|
.hint = NULL,
|
|
.func = &connect,
|
|
.argtable = &join_args
|
|
};
|
|
|
|
ESP_ERROR_CHECK( esp_console_cmd_register(&join_cmd) );
|
|
}
|