From 29d8f6aaec6a71641ac9298cfa055f9c0a12d3ba Mon Sep 17 00:00:00 2001 From: YuXifeng <2860280851@qq.com> Date: Sun, 16 Mar 2025 18:43:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BD=91=E9=A1=B5=E9=85=8D?= =?UTF-8?q?=E7=BD=91=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=AE=9E=E7=8E=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=8B=E5=8F=91=E5=88=B0ESP32?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Partitions_4M.csv | 11 ++++++ main/CMakeLists.txt | 6 ++-- main/file_system/dr_sdmmc.c | 56 +++++++++++++++++++++++++++++ main/file_system/spiffs.c | 53 +++++++++++++++++++++++++++ main/file_system/spiffs.h | 31 ++++++++++++++++ main/main.c | 10 +++++- main/wifi/file/favicon.ico | Bin 0 -> 106008 bytes main/wifi/wifi_html.c | 46 +++++++++++++++++++----- main/wifi/www/wifi_config.html | 64 ++++++++++++++++++++++++++++++++- tools/esptools.py | 14 ++++++++ 10 files changed, 278 insertions(+), 13 deletions(-) create mode 100644 Partitions_4M.csv create mode 100644 main/file_system/dr_sdmmc.c create mode 100644 main/file_system/spiffs.c create mode 100644 main/file_system/spiffs.h create mode 100644 main/wifi/file/favicon.ico create mode 100644 tools/esptools.py diff --git a/Partitions_4M.csv b/Partitions_4M.csv new file mode 100644 index 0000000..05cc121 --- /dev/null +++ b/Partitions_4M.csv @@ -0,0 +1,11 @@ +# ESP-IDF Partition Table +# Name, Type, SubType, Offset, Size, Flags +nvs, data, nvs, 0x9000, 0x4000, +otadata, data, ota, 0xd000, 0x2000, +phy_init, data, phy, 0xf000, 0x1000, +ota_0, app, ota_0, 0x10000, 896K, +ota_1, app, ota_1, 0xf0000, 896K, +Config, data, 0x40, 0x1d0000,4K, +storage, data, spiffs, 0x1d1000,1M, +html, data, 0x41, 0x2d1000,64K, +user, data, 0x45, 0x2e1000,1148K, \ No newline at end of file diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index cecdbf6..f8cb5cc 100755 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -1,10 +1,12 @@ file(GLOB PORT_SRCS "wifi/*.c" ) -file(GLOB HTML_SRCS "wifi/www/*.html" ) +file(GLOB HTML_SRCS "wifi/www/*.html" "wifi/file/favicon.ico") +file(GLOB FILE_SYS_SRCS "file_system/spiffs.c" ) -idf_component_register(SRCS "main.c" ${PORT_SRCS} +idf_component_register(SRCS "main.c" ${PORT_SRCS} ${FILE_SYS_SRCS} EMBED_FILES ${HTML_SRCS} INCLUDE_DIRS "." + INCLUDE_DIRS "file_system/" INCLUDE_DIRS "wifi/") diff --git a/main/file_system/dr_sdmmc.c b/main/file_system/dr_sdmmc.c new file mode 100644 index 0000000..4c0811e --- /dev/null +++ b/main/file_system/dr_sdmmc.c @@ -0,0 +1,56 @@ +#include +#include "esp_vfs_fat.h" +#include "sdmmc_cmd.h" +#include "driver/sdmmc_host.h" +#include "esp_log.h" + +static const char *TAG = "dr_sdmmc"; +#define MOUNT_POINT "/sdcard" + +esp_err_t sdmmc_init(void) +{ + esp_err_t ret; + + // Options for mounting the filesystem. + // If format_if_mount_failed is set to true, SD card will be partitioned and + // formatted in case when mounting fails. + esp_vfs_fat_sdmmc_mount_config_t mount_config = { + .format_if_mount_failed = false, + .max_files = 5, + .allocation_unit_size = 1024 * 1024 *2 + }; + sdmmc_card_t *card; + const char mount_point[] = MOUNT_POINT; + ESP_LOGI(TAG, "Initializing SD card"); + + ESP_LOGI(TAG, "Using SDMMC peripheral"); + sdmmc_host_t host = SDMMC_HOST_DEFAULT(); + sdmmc_slot_config_t slot_config = SDMMC_SLOT_CONFIG_DEFAULT(); + + slot_config.width = 4; + slot_config.clk = 7; + slot_config.cmd = 2; + slot_config.d0 = 6; + slot_config.d1 = 5; + slot_config.d2 = 39; + slot_config.d3 = 38; + slot_config.gpio_cd = 33; + slot_config.flags |= SDMMC_SLOT_FLAG_INTERNAL_PULLUP; + + ESP_LOGI(TAG, "Mounting filesystem"); + ret = esp_vfs_fat_sdmmc_mount(mount_point, &host, &slot_config, &mount_config, &card); + + if (ret != ESP_OK) { + if (ret == ESP_FAIL) { + ESP_LOGE(TAG, "Failed to mount filesystem. " + "If you want the card to be formatted, set the EXAMPLE_FORMAT_IF_MOUNT_FAILED menuconfig option."); + } else { + ESP_LOGE(TAG, "Failed to initialize the card (%s). " + "Make sure SD card lines have pull-up resistors in place.", esp_err_to_name(ret)); + } + return ESP_FAIL; + } + ESP_LOGI(TAG, "Filesystem mounted"); + sdmmc_card_print_info(stdout, card); + return ESP_OK; +} \ No newline at end of file diff --git a/main/file_system/spiffs.c b/main/file_system/spiffs.c new file mode 100644 index 0000000..30eb2e0 --- /dev/null +++ b/main/file_system/spiffs.c @@ -0,0 +1,53 @@ +#include "spiffs.h" + +static const char *TAG = "file System"; + +esp_err_t init_spiffs(void) +{ + ESP_LOGI(TAG, "Initializing SPIFFS"); + + esp_vfs_spiffs_conf_t conf = { + .base_path = "/spiffs", + .partition_label = NULL, + .max_files = 10, // This decides the maximum number of files that can be created on the storage + .format_if_mount_failed = true + }; + + esp_err_t ret = esp_vfs_spiffs_register(&conf); + if (ret != ESP_OK) { + if (ret == ESP_FAIL) { + ESP_LOGE(TAG, "Failed to mount or format filesystem"); + } else if (ret == ESP_ERR_NOT_FOUND) { + ESP_LOGE(TAG, "Failed to find SPIFFS partition"); + } else { + ESP_LOGE(TAG, "Failed to initialize SPIFFS (%s)", esp_err_to_name(ret)); + } + return ESP_FAIL; + } + + size_t total = 0, used = 0; + ret = esp_spiffs_info(NULL, &total, &used); + if (ret != ESP_OK) { + ESP_LOGE(TAG, "Failed to get SPIFFS partition information (%s)", esp_err_to_name(ret)); + return ESP_FAIL; + } + + ESP_LOGI(TAG, "Partition size: total: %d, used: %d", total, used); + return ESP_OK; +} + +// void Read_file(char* filename, Read_data data,uint16_t size) +// { +// FILE* f ; + +// f = fopen(filename, "rb"); +// if (f == NULL) { +// ESP_LOGE(FILE_TAG, "Failed to open file for writing"); +// return; +// } +// data.size = fread(data.buf,1,size,f); +// data.type = SPIFFS; +// fclose(f); + +// } + diff --git a/main/file_system/spiffs.h b/main/file_system/spiffs.h new file mode 100644 index 0000000..53b8964 --- /dev/null +++ b/main/file_system/spiffs.h @@ -0,0 +1,31 @@ +#ifndef _SPIFFS_H +#define _SPIFFS_H + +#include +#include +#include +#include +#include "esp_err.h" +#include "esp_log.h" +#include "esp_spiffs.h" + + +#define FILE_TAG "spiffs" + + +typedef struct +{ + uint8_t type; + uint32_t file_size; + uint16_t buff_size; + char file_name[20]; + uint8_t buff[256]; +}spiffs_data_t; + +extern esp_err_t init_spiffs(void); +extern esp_err_t sdmmc_init(void); +// void Read_file(char* filename, Read_data data,uint16_t size); + + + +#endif \ No newline at end of file diff --git a/main/main.c b/main/main.c index 158d0ef..b974aba 100755 --- a/main/main.c +++ b/main/main.c @@ -32,6 +32,7 @@ #include "driver/gpio.h" #include "wifi_task.h" +#include "spiffs.h" #define EX_UART_NUM UART_NUM_0 @@ -171,9 +172,16 @@ static void uart_event_task(void *pvParameters) void app_main(void) { - ESP_ERROR_CHECK(nvs_flash_init()); + esp_err_t err = nvs_flash_init(); + if (err == ESP_ERR_NVS_NO_FREE_PAGES || err == ESP_ERR_NVS_NEW_VERSION_FOUND) { + ESP_ERROR_CHECK(nvs_flash_erase()); // 擦除 NVS 分区 + err = nvs_flash_init(); // 重新初始化 + } + ESP_ERROR_CHECK(err); ESP_ERROR_CHECK(esp_netif_init()); ESP_ERROR_CHECK(esp_event_loop_create_default()); + + init_spiffs(); /* Configure parameters of an UART driver, * communication pins and install the driver */ uart_config_t uart_config = { diff --git a/main/wifi/file/favicon.ico b/main/wifi/file/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..83643f2644e9528f3c2d7187369fd13febba8fcf GIT binary patch literal 106008 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 F{10ru390}9 literal 0 HcmV?d00001 diff --git a/main/wifi/wifi_html.c b/main/wifi/wifi_html.c index af39c69..68754c3 100644 --- a/main/wifi/wifi_html.c +++ b/main/wifi/wifi_html.c @@ -8,8 +8,8 @@ static const char *TAG = "wifi_html"; static esp_err_t index_get_handler(httpd_req_t *req) { - extern const unsigned char wifi_config_start[] asm("_binary_wifi_html_start"); - extern const unsigned char wifi_config_end[] asm("_binary_wifi_html_end"); + extern const unsigned char wifi_config_start[] asm("_binary_wifi_config_html_start"); + extern const unsigned char wifi_config_end[] asm("_binary_wifi_config_html_end"); const size_t wifi_config_size = (wifi_config_end - wifi_config_start); /* Add file upload form and script which on execution sends a POST request to /upload */ @@ -56,9 +56,22 @@ static esp_err_t Save_file_handler(httpd_req_t *req) return ESP_OK; } +/* Handler to respond with an icon file embedded in flash. + * Browsers expect to GET website icon at URI /favicon.ico. + * This can be overridden by uploading file with same name */ +static esp_err_t favicon_get_handler(httpd_req_t *req) +{ + extern const unsigned char favicon_ico_start[] asm("_binary_favicon_ico_start"); + extern const unsigned char favicon_ico_end[] asm("_binary_favicon_ico_end"); + const size_t favicon_ico_size = (favicon_ico_end - favicon_ico_start); + httpd_resp_set_type(req, "image/x-icon"); + httpd_resp_send(req, (const char *)favicon_ico_start, favicon_ico_size); + return ESP_OK; +} + char wifi_name[20] = {0}; char wifi_password[12] = {0}; -static esp_err_t echo_post_handler(httpd_req_t *req) +static esp_err_t wifi_config_handler(httpd_req_t *req) { char buf[100]; // char ssid[10]; @@ -77,8 +90,8 @@ static esp_err_t echo_post_handler(httpd_req_t *req) return ESP_FAIL; } - /* Send back the same data */ - httpd_resp_send_chunk(req, buf, ret); + // /* Send back the same data */ + // httpd_resp_send_chunk(req, buf, ret); remaining -= ret; cJSON *root = cJSON_Parse(buf); @@ -105,7 +118,7 @@ static esp_err_t echo_post_handler(httpd_req_t *req) for(int i = 0;i

ESP32 WIFI 配网

-
+
@@ -82,3 +82,65 @@ + + \ No newline at end of file diff --git a/tools/esptools.py b/tools/esptools.py new file mode 100644 index 0000000..c90f11a --- /dev/null +++ b/tools/esptools.py @@ -0,0 +1,14 @@ +import esptool + + +#/Users/yu/.espressif/python_env/idf5.3_py3.9_env/bin/python /Users/yu/esp/v5.3.2/esp-idf/components/esptool_py/esptool/esptool.py -p /dev/tty.wchusbserial54CE0416791 -b 460800 --before default_reset --after hard_reset --chip esp32s3 write_flash --flash_mode dio --flash_freq 80m --flash_size 4MB 0x0 bootloader/bootloader.bin 0x10000 usb_serial_jtag_echo.bin 0x8000 partition_table/partition-table.bin 0xd000 ota_data_initial.bin + + +esptool.main([ + "--chip", "esp32c3", + "--port", "/dev/tty.usbmodem11401", + "--baud", "460800", + "write_flash", + "-z", + "0x2d1000", "/Users/yu/esp/esp32c3-usb_serial/main/wifi/www/wifi_config.html" +]) \ No newline at end of file