Skip to content

Commit 3e3f7f8

Browse files
author
joerggollnick
committed
added flip and mirror and others to camera driver
1 parent cc16bd4 commit 3e3f7f8

10 files changed

+1687
-30
lines changed

.gitignore

+7
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,10 @@ modules.order
5050
Module.symvers
5151
Mkfile.old
5252
dkms.conf
53+
54+
# emacs backup
55+
*~
56+
# tarball
57+
*.tgz
58+
*.txz
59+

Makefile

+8-7
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,7 @@ EXTMOD_SRC_C += $(addprefix extmod/,\
369369
)
370370

371371
LIB_SRC_C = $(addprefix lib/,\
372+
mbedtls_errors/mp_mbedtls_errors.c \
372373
mp-readline/readline.c \
373374
netutils/netutils.c \
374375
timeutils/timeutils.c \
@@ -513,11 +514,12 @@ ESPIDF_LWIP_O = $(patsubst %.c,%.o,\
513514
$(wildcard $(ESPCOMP)/lwip/port/esp32/*/*.c) \
514515
)
515516

516-
ESPIDF_MBEDTLS_O = $(patsubst %.c,%.o,\
517+
# Mbedtls source files, exclude error.c in favor of lib/mbedtls_errors/mp_mbedtls_errors.c
518+
ESPIDF_MBEDTLS_O = $(patsubst %.c,%.o, $(filter-out %/error.c,\
517519
$(wildcard $(ESPCOMP)/mbedtls/mbedtls/library/*.c) \
518520
$(wildcard $(ESPCOMP)/mbedtls/port/*.c) \
519521
$(wildcard $(ESPCOMP)/mbedtls/port/esp32/*.c) \
520-
)
522+
))
521523

522524
ESPIDF_MDNS_O = $(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/mdns/*.c))
523525

@@ -607,10 +609,10 @@ endif
607609
endif
608610

609611
ESP32_CAM_O = $(patsubst %.c,%.o,\
610-
$(wildcard $(ESPCOMP)/esp32-camera/driver/*.c) \
611-
$(wildcard $(ESPCOMP)/esp32-camera/sensors/*.c) \
612-
$(wildcard $(ESPCOMP)/esp32-camera/conversions/*.c) \
613-
)
612+
$(wildcard $(ESPCOMP)/esp32-camera/driver/*.c) \
613+
$(wildcard $(ESPCOMP)/esp32-camera/sensors/*.c) \
614+
$(wildcard $(ESPCOMP)/esp32-camera/conversions/*.c) \
615+
)
614616

615617
OBJ_ESPIDF =
616618
LIB_ESPIDF =
@@ -654,7 +656,6 @@ $(eval $(call gen_espidf_lib_rule,sdmmc,$(ESPIDF_SDMMC_O)))
654656
$(eval $(call gen_espidf_lib_rule,bt_nimble,$(ESPIDF_BT_NIMBLE_O)))
655657
$(eval $(call gen_espidf_lib_rule,esp32_cam,$(ESP32_CAM_O)))
656658

657-
658659
ifeq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH_V4))
659660
$(eval $(call gen_espidf_lib_rule,esp_common,$(ESPIDF_ESP_COMMON_O)))
660661
$(eval $(call gen_espidf_lib_rule,esp_event,$(ESPIDF_ESP_EVENT_O)))

0 commit comments

Comments
 (0)