From d7566411abcf547f28d871414c6b349b74a3554b Mon Sep 17 00:00:00 2001 From: Miroslav Pivovarsky Date: Thu, 27 Jun 2024 22:21:56 +0200 Subject: [PATCH] added parameter for settings PSRAM --- ESP32_PrusaConnectCam/camera.cpp | 6 +++++- ESP32_PrusaConnectCam/module_AI_Thinker_ESP32-CAM.h | 1 + ESP32_PrusaConnectCam/module_ESP32-S3-EYE_2_2.h | 13 +++++++------ ESP32_PrusaConnectCam/module_ESP32-WROVER-DEV.h | 1 + ESP32_PrusaConnectCam/module_ESP32_S3_CAM.h | 1 + 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ESP32_PrusaConnectCam/camera.cpp b/ESP32_PrusaConnectCam/camera.cpp index 01c6f80..a3d338d 100644 --- a/ESP32_PrusaConnectCam/camera.cpp +++ b/ESP32_PrusaConnectCam/camera.cpp @@ -110,7 +110,11 @@ void Camera::InitCameraModule() { CameraConfig.jpeg_quality = PhotoQuality; /* 10-63 lower number means higher quality */ CameraConfig.fb_count = 1; /* picture frame buffer alocation */ CameraConfig.grab_mode = CAMERA_GRAB_LATEST; /* CAMERA_GRAB_WHEN_EMPTY or CAMERA_GRAB_LATEST */ +#if (true == ENABLE_PSRAM) CameraConfig.fb_location = CAMERA_FB_IN_PSRAM; /* CAMERA_FB_IN_PSRAM or CAMERA_FB_IN_DRAM */ +#else + CameraConfig.fb_location = CAMERA_FB_IN_DRAM; /* CAMERA_FB_IN_PSRAM or CAMERA_FB_IN_DRAM */ +#endif if (CameraConfig.fb_location == CAMERA_FB_IN_DRAM) { log->AddEvent(LogLevel_Verbose, F("Camera frame buffer location: DRAM")); @@ -125,7 +129,7 @@ void Camera::InitCameraModule() { if (err != ESP_OK) { log->AddEvent(LogLevel_Warning, F("Camera init failed. Error: "), String(err, HEX)); log->AddEvent(LogLevel_Warning, F("Reset ESP32-cam!")); - //ESP.restart(); + ESP.restart(); } } diff --git a/ESP32_PrusaConnectCam/module_AI_Thinker_ESP32-CAM.h b/ESP32_PrusaConnectCam/module_AI_Thinker_ESP32-CAM.h index ba7d43a..3a982e1 100644 --- a/ESP32_PrusaConnectCam/module_AI_Thinker_ESP32-CAM.h +++ b/ESP32_PrusaConnectCam/module_AI_Thinker_ESP32-CAM.h @@ -47,6 +47,7 @@ /* ------------------ MCU CFG ------------------*/ #define ENABLE_BROWN_OUT_DETECTION true ///< Enable brown out detection +#define ENABLE_PSRAM true ///< Enable PSRAM /* --------------- OTA UPDATE CFG --------------*/ #define OTA_UPDATE_FW_FILE PSTR("ESP32_PrusaConnectCam.ino.bin") ///< OTA update firmware file name diff --git a/ESP32_PrusaConnectCam/module_ESP32-S3-EYE_2_2.h b/ESP32_PrusaConnectCam/module_ESP32-S3-EYE_2_2.h index 45b525a..2bca8ee 100644 --- a/ESP32_PrusaConnectCam/module_ESP32-S3-EYE_2_2.h +++ b/ESP32_PrusaConnectCam/module_ESP32-S3-EYE_2_2.h @@ -19,10 +19,10 @@ Tools -> Arduino Runs On -> Core 0 Tools -> USB Firmware MSC On Boot -> Disable Tools -> Partition scheme -> Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS) - Tools -> PSRAM -> QSPI PSRAM + Tools -> PSRAM -> OPI PSRAM Tools -> Upload Mode -> USB-OTG CDC (TinyUSB) Tools -> Upload Speed -> 921600 - Tools -> USB Mode -> USB-OTG (TinyUSB) + Tools -> USB Mode -> Hardware CDC and JTAG Tools -> Zigbee mode -> Disable https://github.com/espressif/esp-who/blob/master/docs/en/get-started/ESP32-S3-EYE_Getting_Started_Guide.md @@ -57,6 +57,7 @@ /* ------------------ MCU CFG ------------------*/ #define ENABLE_BROWN_OUT_DETECTION false ///< Enable brown out detection +#define ENABLE_PSRAM true ///< Enable PSRAM /* --------------- OTA UPDATE CFG --------------*/ #define OTA_UPDATE_FW_FILE PSTR("ESP32_S3_EYE_22_PrusaConnectCam.ino.bin") ///< OTA update firmware file name @@ -71,18 +72,18 @@ #define FLASH_PWM_RESOLUTION 8 ///< range 1-20bit. 8bit = 0-255 range /* --------------- SD CARD CFG ---------------*/ -#define ENABLE_SD_CARD true ///< Enable SD card function +#define ENABLE_SD_CARD true ///< Enable SD card function #define SD_PIN_CLK 39 ///< GPIO pin for SD card clock #define SD_PIN_CMD 38 ///< GPIO pin for SD card command #define SD_PIN_DATA0 40 ///< GPIO pin for SD card data 0 /* ---------- RESET CFG CONFIGURATION ----------*/ -#define CFG_RESET_PIN 2 ///< GPIO 16 is for reset CFG to default +#define CFG_RESET_PIN 1 ///< GPIO 16 is for reset CFG to default /* -------------- STATUS LED CFG ----------------*/ #define STATUS_LED_ENABLE true ///< enable/disable status LED -#define STATUS_LED_GPIO_NUM 34 ///< GPIO pin for status LED -#define STATUS_LED_OFF_PIN_LEVEL LOW ///< GPIO pin level for status LED ON +#define STATUS_LED_GPIO_NUM 3 ///< GPIO pin for status LED +#define STATUS_LED_OFF_PIN_LEVEL HIGH ///< GPIO pin level for status LED ON #endif // ESP32_WROVER_DEV /* EOF */ \ No newline at end of file diff --git a/ESP32_PrusaConnectCam/module_ESP32-WROVER-DEV.h b/ESP32_PrusaConnectCam/module_ESP32-WROVER-DEV.h index e418003..fe720ba 100644 --- a/ESP32_PrusaConnectCam/module_ESP32-WROVER-DEV.h +++ b/ESP32_PrusaConnectCam/module_ESP32-WROVER-DEV.h @@ -47,6 +47,7 @@ /* ------------------ MCU CFG ------------------*/ #define ENABLE_BROWN_OUT_DETECTION true ///< Enable brown out detection +#define ENABLE_PSRAM true ///< Enable PSRAM /* --------------- OTA UPDATE CFG --------------*/ #define OTA_UPDATE_FW_FILE PSTR("ESP32_WROVER_DEV_PrusaConnectCam.ino.bin") ///< OTA update firmware file name diff --git a/ESP32_PrusaConnectCam/module_ESP32_S3_CAM.h b/ESP32_PrusaConnectCam/module_ESP32_S3_CAM.h index 1b66444..698b411 100644 --- a/ESP32_PrusaConnectCam/module_ESP32_S3_CAM.h +++ b/ESP32_PrusaConnectCam/module_ESP32_S3_CAM.h @@ -57,6 +57,7 @@ /* ------------------ MCU CFG ------------------*/ #define ENABLE_BROWN_OUT_DETECTION false ///< Enable brown out detection +#define ENABLE_PSRAM true ///< Enable PSRAM /* --------------- OTA UPDATE CFG --------------*/ #define OTA_UPDATE_FW_FILE PSTR("ESP32_S3_CAM_PrusaConnectCam.ino.bin") ///< OTA update firmware file name