增加配网功能
This commit is contained in:
parent
19103250d5
commit
c0f0ee00f0
17
main/main.c
17
main/main.c
@ -73,9 +73,9 @@ static void echo_task(void *arg)
|
||||
// Write data back to the USB SERIAL JTAG
|
||||
if (len) {
|
||||
// usb_serial_jtag_write_bytes((const char *) data, len, 20 / portTICK_PERIOD_MS);
|
||||
uart_write_bytes(EX_UART_NUM, (const char *) data, len);
|
||||
// uart_write_bytes(EX_UART_NUM, (const char *) data, len);
|
||||
data[len] = '\0';
|
||||
// ESP_LOG_BUFFER_HEXDUMP("Recv str: ", data, len, ESP_LOG_INFO);
|
||||
ESP_LOG_BUFFER_HEXDUMP("Recv str: ", data, len, ESP_LOG_INFO);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -224,7 +224,7 @@ void app_main(void)
|
||||
//Install UART driver, and get the queue.
|
||||
// uart_driver_install(EX_UART_NUM, BUF_SIZE * 2, BUF_SIZE * 2, 20, &uart0_queue, 0);
|
||||
// uart_param_config(EX_UART_NUM, &uart_config);
|
||||
// xTaskCreate(echo_task, "USB SERIAL JTAG_echo_task", ECHO_TASK_STACK_SIZE, NULL, 10, NULL);
|
||||
xTaskCreate(echo_task, "USB SERIAL JTAG_echo_task", ECHO_TASK_STACK_SIZE, NULL, 10, NULL);
|
||||
//Create a task to handler UART event from ISR
|
||||
// xTaskCreate(uart_event_task, "uart_event_task", 2048*10, NULL, 12, NULL);
|
||||
|
||||
@ -232,7 +232,18 @@ void app_main(void)
|
||||
wifi_config_html.html_data = load_html2Ram(wifi_config_html);
|
||||
// favicon_ico.html_data = load_html2Ram(favicon_ico);
|
||||
// ESP_LOGI(TAG, "ESP_WIFI_MODE_STA");
|
||||
// ESP_LOGI(TAG,"def_name:%s",Sys_wifi_config.def_AP_Name);
|
||||
ESP_LOGI(TAG,"sizeof--Sys_wifi_config:%d",sizeof(wifi_Save_info_t));
|
||||
Read_ESPFlash(0x40,0,&Sys_wifi_config,sizeof(wifi_Save_info_t));
|
||||
ESP_LOGI(TAG,"wifi_ssid:%s",Sys_wifi_config.wifi_ssid);
|
||||
ESP_LOGI(TAG,"wifi_password:%s",Sys_wifi_config.wifi_password);
|
||||
if(Sys_wifi_config.wifi_mode != 0x55)
|
||||
{
|
||||
wifi_init_softap();
|
||||
}else{
|
||||
wifi_init_station();
|
||||
}
|
||||
|
||||
|
||||
vTaskDelay(1000/ portTICK_PERIOD_MS);
|
||||
start_web_server();
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#include "wifi_task.h"
|
||||
#include "esp_http_server.h"
|
||||
#include "esp_vfs.h"
|
||||
|
||||
#include "bsp_flash.h"
|
||||
#include "cJSON.h"
|
||||
static const char *TAG = "wifi_html";
|
||||
|
||||
@ -108,27 +108,14 @@ static esp_err_t wifi_config_handler(httpd_req_t *req)
|
||||
printf("%c",wifi_password[i]);
|
||||
}
|
||||
printf("\r\n");
|
||||
// esp_err_t e = httpd_query_key_value(buf,"wifi_name",wifi_name,sizeof(wifi_name));
|
||||
// if(e == ESP_OK) {
|
||||
// printf("ssid = %s\r\n",wifi_name);
|
||||
// }
|
||||
// else {
|
||||
// printf("error = %d\r\n",e);
|
||||
// }
|
||||
|
||||
// e = httpd_query_key_value(buf,"wifi_code",wifi_password,sizeof(wifi_password));
|
||||
// if(e == ESP_OK) {
|
||||
// printf("pswd = %s\r\n",wifi_password);
|
||||
// }
|
||||
// else {
|
||||
// printf("error = %d\r\n",e);
|
||||
// }
|
||||
// sprintf(esp_wifi_info.ssid,"%s",wifi_name);
|
||||
// sprintf(esp_wifi_info.password,"%s",wifi_password);
|
||||
sprintf(Sys_wifi_config.wifi_ssid,"%s",wifi_name);
|
||||
sprintf(Sys_wifi_config.wifi_password,"%s",wifi_password);
|
||||
Sys_wifi_config.wifi_mode = 0x55;
|
||||
// esp_wifi_info.reboot = false;
|
||||
// wifi_config_data.SubType = 0x40;
|
||||
// wifi_config_data.addr = 0;
|
||||
// Write_ESPFlash(wifi_config_data.SubType,wifi_config_data.addr,(uint8_t *)&wifi_config_data,sizeof(struct save_flash_t) + sizeof(wifi_info_t));
|
||||
Write_ESPFlash(0x40,0,(uint8_t *)&Sys_wifi_config,sizeof(wifi_Save_info_t));
|
||||
|
||||
/* Log data received */
|
||||
ESP_LOGI(TAG, "=========== RECEIVED DATA ==========");
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
|
||||
static const char *TAG = "wifi_sta";
|
||||
|
||||
#define EXAMPLE_ESP_WIFI_SSID "Yu886"
|
||||
#define EXAMPLE_ESP_WIFI_PASS "2023yu2023"
|
||||
#define EXAMPLE_ESP_WIFI_SSID "A-301-55"
|
||||
#define EXAMPLE_ESP_WIFI_PASS "whyt2019"
|
||||
#define EXAMPLE_ESP_MAXIMUM_RETRY 5
|
||||
|
||||
|
||||
@ -83,6 +83,10 @@ void wifi_init_station(void)
|
||||
.sae_h2e_identifier = "",
|
||||
},
|
||||
};
|
||||
memset(&wifi_config.sta.ssid[0],0x00,sizeof(wifi_config.sta.ssid));
|
||||
memset(&wifi_config.sta.password[0],0x00,sizeof(wifi_config.sta.password));
|
||||
memcpy(&wifi_config.sta.ssid[0],Sys_wifi_config.wifi_ssid,strlen(Sys_wifi_config.wifi_ssid));
|
||||
memcpy(&wifi_config.sta.password[0],Sys_wifi_config.wifi_password,strlen(Sys_wifi_config.wifi_password));
|
||||
ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));
|
||||
ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config));
|
||||
ESP_ERROR_CHECK(esp_wifi_start());
|
||||
|
||||
@ -8,6 +8,11 @@ static const char *TAG = "wifi_task";
|
||||
#define KEEPALIVE_COUNT 3
|
||||
|
||||
|
||||
|
||||
wifi_Save_info_t Sys_wifi_config = {
|
||||
// .def_AP_Name = "ESP32_Online_Link",
|
||||
};
|
||||
|
||||
static void do_retransmit(const int sock)
|
||||
{
|
||||
int len;
|
||||
|
||||
@ -35,6 +35,17 @@ typedef struct wifi_html_
|
||||
uint8_t* html_data;
|
||||
}wifi_html_t;
|
||||
|
||||
typedef struct wifi_Save_info_
|
||||
{
|
||||
char wifi_ssid[24];
|
||||
char wifi_password[24];
|
||||
uint8_t retry_count;
|
||||
uint8_t wifi_mode;
|
||||
}wifi_Save_info_t;
|
||||
|
||||
|
||||
extern wifi_Save_info_t Sys_wifi_config;
|
||||
|
||||
extern wifi_html_t home_html;
|
||||
extern wifi_html_t wifi_config_html;
|
||||
extern wifi_html_t favicon_ico;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user