Skip to content

Commit cb6b4d0

Browse files
committed
Fix esp-camera. 32 was dropped so the path doesn't have esp32 in it.
1 parent 5937f4c commit cb6b4d0

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

ports/espressif/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,8 @@ SRC_CAMERA := \
275275
$(wildcard common-hal/espcamera/*.c) \
276276
$(wildcard bindings/espcamera/*.c)
277277
SRC_C += $(SRC_CAMERA)
278-
CFLAGS += -isystem esp32-camera/driver/include
279-
CFLAGS += -isystem esp32-camera/conversions/include
278+
CFLAGS += -isystem esp-camera/driver/include
279+
CFLAGS += -isystem esp-camera/conversions/include
280280
endif
281281

282282
ifneq ($(CIRCUITPY_ESPIDF),0)
@@ -436,7 +436,7 @@ ESP_IDF_COMPONENTS_EXPANDED += esp-idf/components/xtensa/$(IDF_TARGET)/libxt_hal
436436
endif
437437

438438
ifneq ($(CIRCUITPY_ESPCAMERA),0)
439-
ESP_IDF_COMPONENTS_EXPANDED += $(BUILD)/esp-idf/esp-idf/esp32-camera/libesp32-camera.a
439+
ESP_IDF_COMPONENTS_EXPANDED += $(BUILD)/esp-idf/esp-idf/esp-camera/libesp-camera.a
440440
#$(error $(ESP_IDF_COMPONENTS_EXPANDED))
441441
endif
442442

ports/espressif/common-hal/espcamera/Camera.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "shared-bindings/util.h"
3636
#include "common-hal/microcontroller/Pin.h"
3737

38-
#include "esp32-camera/driver/private_include/cam_hal.h"
38+
#include "esp-camera/driver/private_include/cam_hal.h"
3939

4040
#if !CONFIG_SPIRAM
4141
#error espcamera only works on boards configured with spiram, disable it in mpconfigboard.mk
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
CONFIG_SPIRAM_MODE_QUAD=y
2+
# CONFIG_SPIRAM_MODE_OCT is not set

0 commit comments

Comments
 (0)