diff --git a/code/components/jomjol_helper/sdcard_init.c b/code/components/jomjol_helper/sdcard_init.c index 02bac5cb..1c306ac9 100644 --- a/code/components/jomjol_helper/sdcard_init.c +++ b/code/components/jomjol_helper/sdcard_init.c @@ -35,15 +35,15 @@ static const char* TAG = "sdcard_init"; } \ } while(0) -typedef struct vfs_fat_sd_ctx_t { +typedef struct mh_vfs_fat_sd_ctx_t { BYTE pdrv; //Drive number that is mounted esp_vfs_fat_mount_config_t mount_config; //Mount configuration FATFS *fs; //FAT structure pointer that is registered sdmmc_card_t *card; //Card info char *base_path; //Path where partition is registered -} vfs_fat_sd_ctx_t; +} mh_vfs_fat_sd_ctx_t; -static vfs_fat_sd_ctx_t *s_ctx[FF_VOLUMES] = {}; +static mh_vfs_fat_sd_ctx_t *s_ctx[FF_VOLUMES] = {}; /** * This `s_saved_ctx_id` is only used by `esp_vfs_fat_sdmmc_unmount`, which is deprecated. @@ -185,14 +185,9 @@ BYTE ff_diskio_get_pdrv_card_mh(const sdmmc_card_t* card) return 0xff; } - - - - - static bool s_get_context_id_by_card_mh(const sdmmc_card_t *card, uint32_t *out_id) { - vfs_fat_sd_ctx_t *p_ctx = NULL; + mh_vfs_fat_sd_ctx_t *p_ctx = NULL; for (int i = 0; i < FF_VOLUMES; i++) { p_ctx = s_ctx[i]; if (p_ctx) { @@ -378,7 +373,7 @@ static esp_err_t init_sdmmc_host_mh(int slot, const void *slot_config, int *out_ esp_err_t esp_vfs_fat_sdmmc_mount_mh(const char* base_path, const sdmmc_host_t* host_config, const void* slot_config, const esp_vfs_fat_mount_config_t* mount_config, sdmmc_card_t** out_card) { esp_err_t err; - vfs_fat_sd_ctx_t *ctx = NULL; + mh_vfs_fat_sd_ctx_t *ctx = NULL; uint32_t ctx_id = FF_VOLUMES; FATFS *fs = NULL; int card_handle = -1; //uninitialized @@ -419,7 +414,7 @@ esp_err_t esp_vfs_fat_sdmmc_mount_mh(const char* base_path, const sdmmc_host_t* s_saved_ctx_id = 0; } - ctx = calloc(sizeof(vfs_fat_sd_ctx_t), 1); + ctx = calloc(sizeof(mh_vfs_fat_sd_ctx_t), 1); if (!ctx) { CHECK_EXECUTE_RESULT(ESP_ERR_NO_MEM, "no mem"); @@ -462,7 +457,7 @@ esp_err_t esp_vfs_fat_sdspi_mount_mh(const char* base_path, const sdmmc_host_t* { const sdmmc_host_t* host_config = host_config_input; esp_err_t err; - vfs_fat_sd_ctx_t *ctx = NULL; + mh_vfs_fat_sd_ctx_t *ctx = NULL; uint32_t ctx_id = FF_VOLUMES; FATFS *fs = NULL; int card_handle = -1; //uninitialized @@ -514,7 +509,7 @@ esp_err_t esp_vfs_fat_sdspi_mount_mh(const char* base_path, const sdmmc_host_t* s_saved_ctx_id = 0; } - ctx = calloc(sizeof(vfs_fat_sd_ctx_t), 1); + ctx = calloc(sizeof(mh_vfs_fat_sd_ctx_t), 1); if (!ctx) { CHECK_EXECUTE_RESULT(ESP_ERR_NO_MEM, "no mem"); diff --git a/code/dependencies.lock b/code/dependencies.lock index 6e49cb19..8ce5d933 100644 --- a/code/dependencies.lock +++ b/code/dependencies.lock @@ -1,3 +1,16 @@ -manifest_hash: 63f5c6c9f0bcebc7b9ca12d2aa8b26b2c5f5218d377dc4b2375d9b9ca1df7815 +dependencies: + espressif/esp-nn: + component_hash: b32869798bdb40dec6bc99caca48cd65d42f8a9f506b9ab9c598a076f891ede9 + source: + pre_release: true + service_url: https://api.components.espressif.com/ + type: service + version: 1.0.2 + idf: + component_hash: null + source: + type: idf + version: 5.3.0 +manifest_hash: 6995555b9b41e897235448c868ca92c0c3401fd2ff90df084be9bb8629958f2c target: esp32 -version: 1.0.0 \ No newline at end of file +version: 1.0.0 diff --git a/code/main/server_main.cpp b/code/main/server_main.cpp index 7527614b..ef24fd19 100644 --- a/code/main/server_main.cpp +++ b/code/main/server_main.cpp @@ -451,7 +451,7 @@ void register_server_main_uri(httpd_handle_t server, const char *base_path) httpd_handle_t start_webserver(void) { httpd_handle_t server = NULL; - httpd_config_t config = { }; + httpd_config_t config = HTTPD_DEFAULT_CONFIG(); config.task_priority = tskIDLE_PRIORITY+3; // previously -> 2022-12-11: tskIDLE_PRIORITY+1; 2021-09-24: tskIDLE_PRIORITY+5 config.stack_size = 12288; // previously -> 2023-01-02: 32768 diff --git a/code/platformio.ini b/code/platformio.ini index 3c86e4a6..f8456df1 100644 --- a/code/platformio.ini +++ b/code/platformio.ini @@ -20,7 +20,7 @@ [common:esp32-idf] extends = common:idf ; PlatformIO releases, see https://github.com/platformio/platform-espressif32/releases - platform = platformio/espressif32 @ 6.7.0 + platform = platformio/espressif32 @ 6.8.1 framework = espidf lib_deps = ${common:idf.lib_deps}