From 30415a24b7a00e12d0bdd24e17bf23b595af1f15 Mon Sep 17 00:00:00 2001
From: Luc <8822552+luc-github@users.noreply.github.com>
Date: Tue, 7 Jun 2022 21:51:01 +0800
Subject: [PATCH] Remove No PSRAM camera

Increase Camera freq and add new settings
Add missing description for new cameras
---
 Features.md                         |  2 +-
 esp3d/configuration.h               |  5 +----
 esp3d/src/include/defines.h         |  3 ---
 esp3d/src/modules/camera/camera.cpp | 15 ++++++++++-----
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Features.md b/Features.md
index e95ce928..be5e9ac7 100644
--- a/Features.md
+++ b/Features.md
@@ -36,7 +36,7 @@
 * Global FS under FTP / Webdav : SD + Local FS in same directory
 * Buzzer support
 * Recovery pin support
-* ESP32 Camera support
+* ESP32 Camera support (only with PSRAM)
 * Basic oled screen support
     * I2C SSD1306 128x64
     * I2C SSDSH1106 132x64
diff --git a/esp3d/configuration.h b/esp3d/configuration.h
index 6168643f..e158ab09 100644
--- a/esp3d/configuration.h
+++ b/esp3d/configuration.h
@@ -209,17 +209,14 @@
 //NOTIFICATION_FEATURE : allow to push notifications
 #define NOTIFICATION_FEATURE
 
-//CAMERA_DEVICE: Enable the support of connected camera
+//CAMERA_DEVICE: Enable the support of connected camera (Only Camera with PSRAM are supported)
 //CAMERA_MODEL_CUSTOM           0 //Edit the pins in include/pins.h
 //CAMERA_MODEL_ESP_EYE          1
 //CAMERA_MODEL_M5STACK_PSRAM    2
 //CAMERA_MODEL_M5STACK_V2_PSRAM 3
 //CAMERA_MODEL_M5STACK_WIDE     4
-//CAMERA_MODEL_M5STACK_ESP32CAM 5
-//CAMERA_MODEL_M5STACK_UNITCAM  6
 //CAMERA_MODEL_AI_THINKER       7  e.g. used by ESP32-CAM
 //CAMERA_MODEL_WROVER_KIT       8
-//CAMERA_MODEL_TTGO_T_JOURNAL   9
 //CAMERA_MODEL_ESP32_CAM_BOARD 10
 //CAMERA_MODEL_ESP32S2_CAM_BOARD 11
 //CAMERA_MODEL_ESP32S3_CAM_LCD   12
diff --git a/esp3d/src/include/defines.h b/esp3d/src/include/defines.h
index 24ecc17a..dfdae97a 100644
--- a/esp3d/src/include/defines.h
+++ b/esp3d/src/include/defines.h
@@ -224,11 +224,8 @@
 #define CAMERA_MODEL_M5STACK_PSRAM    2
 #define CAMERA_MODEL_M5STACK_V2_PSRAM 3
 #define CAMERA_MODEL_M5STACK_WIDE     4
-#define CAMERA_MODEL_M5STACK_ESP32CAM 5
-#define CAMERA_MODEL_M5STACK_UNITCAM  6
 #define CAMERA_MODEL_AI_THINKER       7
 #define CAMERA_MODEL_WROVER_KIT       8
-#define CAMERA_MODEL_TTGO_T_JOURNAL   9
 #define CAMERA_MODEL_ESP32_CAM_BOARD 10
 #define CAMERA_MODEL_ESP32S2_CAM_BOARD 11
 #define CAMERA_MODEL_ESP32S3_CAM_LCD   12
diff --git a/esp3d/src/modules/camera/camera.cpp b/esp3d/src/modules/camera/camera.cpp
index a1144b27..813ff8e4 100644
--- a/esp3d/src/modules/camera/camera.cpp
+++ b/esp3d/src/modules/camera/camera.cpp
@@ -209,11 +209,13 @@ bool Camera::initHardware()
     config.pin_sscb_scl = SIOC_GPIO_NUM;
     config.pin_pwdn = PWDN_GPIO_NUM;
     config.pin_reset = RESET_GPIO_NUM;
-    config.xclk_freq_hz = 10000000;
+    config.xclk_freq_hz = 20000000;
     config.pixel_format = PIXFORMAT_JPEG;
     config.jpeg_quality = 5;
     config.fb_count = 1;
     config.frame_size = DEFAULT_FRAME_SIZE;
+    config.fb_location = CAMERA_FB_IN_PSRAM;
+    config.grab_mode = CAMERA_GRAB_LATEST;
     if(!psramFound()) {
         _initialised = false;
         log_esp3d("psram is not enabled");
@@ -317,15 +319,18 @@ const char *Camera::GetModelString()
     case CAMERA_MODEL_WROVER_KIT:
         return "WROVER Kit";
         break;
+    case CAMERA_MODEL_ESP32S3_EYE:
     case CAMERA_MODEL_ESP_EYE:
         return "ESP Eye";
         break;
-    case CAMERA_MODEL_M5STACK_PSRAM:
-        return "M5Stack with PSRam";
-        break;
     case CAMERA_MODEL_M5STACK_WIDE:
-        return "M5Stack wide";
+    case CAMERA_MODEL_M5STACK_V2_PSRAM:
+    case CAMERA_MODEL_M5STACK_PSRAM:
+        return "M5Stack";
         break;
+    case CAMERA_MODEL_ESP32_CAM_BOARD:
+    case CAMERA_MODEL_ESP32S2_CAM_BOARD:
+    case CAMERA_MODEL_ESP32S3_CAM_LCD:
     case CAMERA_MODEL_AI_THINKER:
         return "ESP32 Cam";
         break;