From 529145d7ac4f09a44ac16bebfc41245860c55a3b Mon Sep 17 00:00:00 2001 From: CaCO3 Date: Thu, 28 Dec 2023 16:47:34 +0100 Subject: [PATCH] Migration to new IDF --- .../jomjol_fileserver_ota/miniz/miniz.h | 2 +- .../jomjol_fileserver_ota/server_file.cpp | 2 +- code/components/jomjol_helper/sdcard_check.cpp | 1 + code/components/jomjol_wlan/connect_wlan.cpp | 4 ++-- code/dependencies.lock | 15 ++++++++++++++- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/code/components/jomjol_fileserver_ota/miniz/miniz.h b/code/components/jomjol_fileserver_ota/miniz/miniz.h index 35c740c72..278898d15 100644 --- a/code/components/jomjol_fileserver_ota/miniz/miniz.h +++ b/code/components/jomjol_fileserver_ota/miniz/miniz.h @@ -153,7 +153,7 @@ /*#define MINIZ_NO_MALLOC */ #ifdef MINIZ_NO_INFLATE_APIS -#define MINIZ_NO_ARCHIVE_APIS +//#define MINIZ_NO_ARCHIVE_APIS #endif #ifdef MINIZ_NO_DEFLATE_APIS diff --git a/code/components/jomjol_fileserver_ota/server_file.cpp b/code/components/jomjol_fileserver_ota/server_file.cpp index 8da898736..50e2c8f2d 100644 --- a/code/components/jomjol_fileserver_ota/server_file.cpp +++ b/code/components/jomjol_fileserver_ota/server_file.cpp @@ -547,7 +547,7 @@ static esp_err_t download_get_handler(httpd_req_t *req) /* Get value of expected key from query string */ if (httpd_query_key_value(buf, "readonly", param, sizeof(param)) == ESP_OK) { ESP_LOGI(TAG, "Found URL query parameter => readonly=%s", param); - readonly = param && strcmp(param,"true")==0; + readonly = (strcmp(param,"true") == 0); } } } diff --git a/code/components/jomjol_helper/sdcard_check.cpp b/code/components/jomjol_helper/sdcard_check.cpp index e8ac9d241..39c5d4798 100644 --- a/code/components/jomjol_helper/sdcard_check.cpp +++ b/code/components/jomjol_helper/sdcard_check.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include #include diff --git a/code/components/jomjol_wlan/connect_wlan.cpp b/code/components/jomjol_wlan/connect_wlan.cpp index 085e4b676..603751265 100644 --- a/code/components/jomjol_wlan/connect_wlan.cpp +++ b/code/components/jomjol_wlan/connect_wlan.cpp @@ -378,7 +378,7 @@ void wifi_scan(void) else { if (esp_wifi_scan_get_ap_records(&max_number_of_ap_found, wifi_ap_records) != ESP_OK) { // Retrieve results (and free internal heap) LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "wifi_scan: esp_wifi_scan_get_ap_records: Error retrieving datasets"); - delete wifi_ap_records; + delete[] wifi_ap_records; return; } } @@ -401,7 +401,7 @@ void wifi_scan(void) APWithBetterRSSI = true; } } - delete wifi_ap_records; + delete[] wifi_ap_records; } diff --git a/code/dependencies.lock b/code/dependencies.lock index 6d9f7a29f..657dda225 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.1.2 +manifest_hash: a5f7be33336cfab90d6c2eb74757b616296d8c1e61665336749ed18905905567 target: esp32 version: 1.0.0