From d1b89fca91890916ee89826509e7ecc9fe6a2855 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Thu, 4 Aug 2022 15:11:55 -0500
Subject: [PATCH] Reset camera when interpreter is reset

---
 ports/espressif/Makefile          | 6 ------
 ports/espressif/supervisor/port.c | 8 ++++----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index e8baf35935..1f01513d32 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -292,12 +292,6 @@ CFLAGS += -isystem esp32-camera/driver/include
 CFLAGS += -isystem esp32-camera/conversions/include
 endif
 
-ifneq ($(CIRCUITPY_IMAGECAPTURE),0)
-$(error IMAGECAPTURE)
-SRC_C += cam.c
-endif
-
-
 SRC_COMMON_HAL_EXPANDED = \
 	$(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
 	$(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index c6766fdf8a..3727d8af44 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -76,8 +76,8 @@
 #include "shared-bindings/_bleio/__init__.h"
 #endif
 
-#if CIRCUITPY_IMAGECAPTURE
-#include "cam.h"
+#if CIRCUITPY_ESP32_CAMERA
+#include "esp_camera.h"
 #endif
 
 #ifndef CONFIG_IDF_TARGET_ESP32
@@ -335,8 +335,8 @@ safe_mode_t port_init(void) {
 
 void reset_port(void) {
     // TODO deinit for esp32-camera
-    #if CIRCUITPY_IMAGECAPTURE
-    cam_deinit();
+    #if CIRCUITPY_ESP32_CAMERA
+    esp_camera_deinit();
     #endif
 
     reset_all_pins();