Merge branch 'master' into fix/idf6_requires

espzav · web-flow · commit 98e7849a6b9a · 2025-10-09T11:28:42.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -75,7 +75,7 @@ if(IDF_TARGET STREQUAL "esp32" OR IDF_TARGET STREQUAL "esp32s2" OR IDF_TARGET ST
       )
   endif()
 
-  set(priv_requires freertos nvs_flash)
+  set(priv_requires freertos nvs_flash esp_mm)
 
   set(min_version_for_esp_timer "4.2")
   if (idf_version VERSION_GREATER_EQUAL min_version_for_esp_timer)
diff --git a/Kconfig b/Kconfig
@@ -187,7 +187,7 @@ menu "Camera configuration"
 
     config CAMERA_TASK_STACK_SIZE
         int "CAM task stack size"
-        default 2048
+        default 4096
         help
             Camera task stack size
 
diff --git a/conversions/jpge.cpp b/conversions/jpge.cpp
@@ -30,7 +30,7 @@ namespace jpge {
             return b;
         }
     // check if SPIRAM is enabled and allocate on SPIRAM if allocatable
-#if (CONFIG_SPIRAM_SUPPORT && (CONFIG_SPIRAM_USE_CAPS_ALLOC || CONFIG_SPIRAM_USE_MALLOC))
+#if ((CONFIG_SPIRAM || CONFIG_SPIRAM_SUPPORT) && (CONFIG_SPIRAM_USE_CAPS_ALLOC || CONFIG_SPIRAM_USE_MALLOC))
         return heap_caps_malloc(nSize, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT);
 #else
         return NULL;
diff --git a/conversions/to_bmp.c b/conversions/to_bmp.c
@@ -54,7 +54,7 @@ typedef struct {
 static void *_malloc(size_t size)
 {
     // check if SPIRAM is enabled and allocate on SPIRAM if allocatable
-#if (CONFIG_SPIRAM_SUPPORT && (CONFIG_SPIRAM_USE_CAPS_ALLOC || CONFIG_SPIRAM_USE_MALLOC))
+#if ((CONFIG_SPIRAM || CONFIG_SPIRAM_SUPPORT) && (CONFIG_SPIRAM_USE_CAPS_ALLOC || CONFIG_SPIRAM_USE_MALLOC))
     return heap_caps_malloc(size, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT);
 #endif
     // try allocating in internal memory
diff --git a/conversions/to_jpg.cpp b/conversions/to_jpg.cpp
@@ -37,7 +37,7 @@ static void *_malloc(size_t size)
     }
 
     // check if SPIRAM is enabled and is allocatable
-#if (CONFIG_SPIRAM_SUPPORT && (CONFIG_SPIRAM_USE_CAPS_ALLOC || CONFIG_SPIRAM_USE_MALLOC))
+#if ((CONFIG_SPIRAM || CONFIG_SPIRAM_SUPPORT) && (CONFIG_SPIRAM_USE_CAPS_ALLOC || CONFIG_SPIRAM_USE_MALLOC))
     return heap_caps_malloc(size, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT);
 #endif
     return NULL;
diff --git a/driver/cam_hal.c b/driver/cam_hal.c
diff --git a/examples/camera_example/sdkconfig.defaults b/examples/camera_example/sdkconfig.defaults
@@ -9,9 +9,9 @@ CONFIG_FREERTOS_HZ=1000
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 
+CONFIG_SPIRAM=y
 CONFIG_SPIRAM_SUPPORT=y
 CONFIG_ESP32_SPIRAM_SUPPORT=y
 CONFIG_ESP32S2_SPIRAM_SUPPORT=y
 CONFIG_ESP32S3_SPIRAM_SUPPORT=y
 CONFIG_SPIRAM_SPEED_80M=y
-
diff --git a/idf_component.yml b/idf_component.yml
@@ -4,6 +4,7 @@ issues: https://github.com/espressif/esp32-camera/issues
 documentation: https://github.com/espressif/esp32-camera/tree/main/README.md
 repository: https://github.com/espressif/esp32-camera.git
 dependencies:
+  idf: ">=5.1"
   esp_jpeg:
     version: "^1.3.1"
     public: true
diff --git a/target/esp32/ll_cam.c b/target/esp32/ll_cam.c
@@ -39,6 +39,7 @@ static inline int gpio_ll_get_level(gpio_dev_t *hw, int gpio_num)
 #endif
 
 #if (ESP_IDF_VERSION_MAJOR >= 5)
+#include "driver/gpio.h"
 #define GPIO_PIN_INTR_POSEDGE GPIO_INTR_POSEDGE
 #define GPIO_PIN_INTR_NEGEDGE GPIO_INTR_NEGEDGE
 #define gpio_matrix_in(a,b,c) esp_rom_gpio_connect_in_signal(a,b,c)
diff --git a/target/esp32s2/ll_cam.c b/target/esp32s2/ll_cam.c
@@ -26,6 +26,7 @@
 #endif
 
 #if (ESP_IDF_VERSION_MAJOR >= 5)
+#include "driver/gpio.h"
 #define GPIO_PIN_INTR_POSEDGE GPIO_INTR_POSEDGE
 #define GPIO_PIN_INTR_NEGEDGE GPIO_INTR_NEGEDGE
 #define gpio_matrix_in(a,b,c) esp_rom_gpio_connect_in_signal(a,b,c)
diff --git a/target/esp32s3/ll_cam.c b/target/esp32s3/ll_cam.c
@@ -27,6 +27,7 @@
 #include "esp_rom_gpio.h"
 
 #if (ESP_IDF_VERSION_MAJOR >= 5)
+#include "driver/gpio.h"
 #include "soc/gpio_sig_map.h"
 #include "soc/gpio_periph.h"
 #include "soc/io_mux_reg.h"
diff --git a/target/xclk.c b/target/xclk.c
@@ -51,7 +51,10 @@ esp_err_t camera_enable_out_clock(const camera_config_t* config)
     ch_conf.gpio_num = config->pin_xclk;
     ch_conf.speed_mode = LEDC_LOW_SPEED_MODE;
     ch_conf.channel = config->ledc_channel;
-    ch_conf.intr_type = LEDC_INTR_DISABLE;
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(6,0,0)  
+    // no need to explicitly configure interrupt, handled in the driver (IDF v6.0 and above)
+    ch_conf.intr_type = LEDC_INTR_DISABLE; 
+#endif
     ch_conf.timer_sel = config->ledc_timer;
     ch_conf.duty = 1;
     ch_conf.hpoint = 0;

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ if(IDF_TARGET STREQUAL "esp32" OR IDF_TARGET STREQUAL "esp32s2" OR IDF_TARGET ST`
`75`	`75`	`)`
`76`	`76`	`endif()`
`77`	`77`
`78`		`- set(priv_requires freertos nvs_flash)`
	`78`	`+ set(priv_requires freertos nvs_flash esp_mm)`
`79`	`79`
`80`	`80`	`set(min_version_for_esp_timer "4.2")`
`81`	`81`	`if (idf_version VERSION_GREATER_EQUAL min_version_for_esp_timer)`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ namespace jpge {`
`30`	`30`	`return b;`
`31`	`31`	`}`
`32`	`32`	`// check if SPIRAM is enabled and allocate on SPIRAM if allocatable`
`33`		`-#if (CONFIG_SPIRAM_SUPPORT && (CONFIG_SPIRAM_USE_CAPS_ALLOC \|\| CONFIG_SPIRAM_USE_MALLOC))`
	`33`	`+#if ((CONFIG_SPIRAM \|\| CONFIG_SPIRAM_SUPPORT) && (CONFIG_SPIRAM_USE_CAPS_ALLOC \|\| CONFIG_SPIRAM_USE_MALLOC))`
`34`	`34`	`return heap_caps_malloc(nSize, MALLOC_CAP_SPIRAM \| MALLOC_CAP_8BIT);`
`35`	`35`	`#else`
`36`	`36`	`return NULL;`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ typedef struct {`
`54`	`54`	`static void *_malloc(size_t size)`
`55`	`55`	`{`
`56`	`56`	`// check if SPIRAM is enabled and allocate on SPIRAM if allocatable`
`57`		`-#if (CONFIG_SPIRAM_SUPPORT && (CONFIG_SPIRAM_USE_CAPS_ALLOC \|\| CONFIG_SPIRAM_USE_MALLOC))`
	`57`	`+#if ((CONFIG_SPIRAM \|\| CONFIG_SPIRAM_SUPPORT) && (CONFIG_SPIRAM_USE_CAPS_ALLOC \|\| CONFIG_SPIRAM_USE_MALLOC))`
`58`	`58`	`return heap_caps_malloc(size, MALLOC_CAP_SPIRAM \| MALLOC_CAP_8BIT);`
`59`	`59`	`#endif`
`60`	`60`	`// try allocating in internal memory`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ static void *_malloc(size_t size)`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`// check if SPIRAM is enabled and is allocatable`
`40`		`-#if (CONFIG_SPIRAM_SUPPORT && (CONFIG_SPIRAM_USE_CAPS_ALLOC \|\| CONFIG_SPIRAM_USE_MALLOC))`
	`40`	`+#if ((CONFIG_SPIRAM \|\| CONFIG_SPIRAM_SUPPORT) && (CONFIG_SPIRAM_USE_CAPS_ALLOC \|\| CONFIG_SPIRAM_USE_MALLOC))`
`41`	`41`	`return heap_caps_malloc(size, MALLOC_CAP_SPIRAM \| MALLOC_CAP_8BIT);`
`42`	`42`	`#endif`
`43`	`43`	`return NULL;`