djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix esp-camera. 32 was dropped so the path doesn't have esp32 in it.

This commit is contained in:
Scott Shawcroft 2023-09-11 15:57:09 -07:00
parent 5937f4c0c0
commit cb6b4d0d4a
No known key found for this signature in database
GPG Key ID: 0DFD512649C052DA
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/espressif/Makefile
View File

@ -275,8 +275,8 @@ SRC_CAMERA := \
$(wildcard common-hal/espcamera/*.c) \
$(wildcard bindings/espcamera/*.c)
SRC_C += $(SRC_CAMERA)
CFLAGS += -isystem esp32-camera/driver/include
CFLAGS += -isystem esp32-camera/conversions/include
CFLAGS += -isystem esp-camera/driver/include
CFLAGS += -isystem esp-camera/conversions/include
endif
ifneq ($(CIRCUITPY_ESPIDF),0)
@ -436,7 +436,7 @@ ESP_IDF_COMPONENTS_EXPANDED += esp-idf/components/xtensa/$(IDF_TARGET)/libxt_hal
endif
ifneq ($(CIRCUITPY_ESPCAMERA),0)
ESP_IDF_COMPONENTS_EXPANDED += $(BUILD)/esp-idf/esp-idf/esp32-camera/libesp32-camera.a
ESP_IDF_COMPONENTS_EXPANDED += $(BUILD)/esp-idf/esp-idf/esp-camera/libesp-camera.a
#$(error $(ESP_IDF_COMPONENTS_EXPANDED))
endif

2
ports/espressif/common-hal/espcamera/Camera.c
View File

@ -35,7 +35,7 @@
#include "shared-bindings/util.h"
#include "common-hal/microcontroller/Pin.h"
#include "esp32-camera/driver/private_include/cam_hal.h"
#include "esp-camera/driver/private_include/cam_hal.h"
#if !CONFIG_SPIRAM
#error espcamera only works on boards configured with spiram, disable it in mpconfigboard.mk

1
ports/espressif/esp-idf-config/sdkconfig-psram-qio.defaults
View File

@ -1 +1,2 @@
CONFIG_SPIRAM_MODE_QUAD=y
# CONFIG_SPIRAM_MODE_OCT is not set