Merge pull request #803 from jesserockz/jesserockz-2025-434

me-no-dev · web-flow · commit dfeaa71f0aa7 · 2025-09-22T18:14:54.000+03:00
Use renamed sdkconfig option
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/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
-

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;`