GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-04 11:50:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove No PSRAM camera

Browse Source 
Increase Camera freq and add new settings
Add missing description for new cameras
This commit is contained in:
Luc 2022-06-07 21:51:01 +08:00
parent 1b72277569
commit 30415a24b7
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Features.md
View File

@ -36,7 +36,7 @@
* Global FS under FTP / Webdav : SD + Local FS in same directory * Global FS under FTP / Webdav : SD + Local FS in same directory
* Buzzer support * Buzzer support
* Recovery pin support * Recovery pin support
* ESP32 Camera support * ESP32 Camera support (only with PSRAM)
* Basic oled screen support * Basic oled screen support
* I2C SSD1306 128x64 * I2C SSD1306 128x64
* I2C SSDSH1106 132x64 * I2C SSDSH1106 132x64

5
esp3d/configuration.h
View File

@ -209,17 +209,14 @@
//NOTIFICATION_FEATURE : allow to push notifications //NOTIFICATION_FEATURE : allow to push notifications
#define NOTIFICATION_FEATURE #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_CUSTOM 0 //Edit the pins in include/pins.h
//CAMERA_MODEL_ESP_EYE 1 //CAMERA_MODEL_ESP_EYE 1
//CAMERA_MODEL_M5STACK_PSRAM 2 //CAMERA_MODEL_M5STACK_PSRAM 2
//CAMERA_MODEL_M5STACK_V2_PSRAM 3 //CAMERA_MODEL_M5STACK_V2_PSRAM 3
//CAMERA_MODEL_M5STACK_WIDE 4 //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_AI_THINKER 7 e.g. used by ESP32-CAM
//CAMERA_MODEL_WROVER_KIT 8 //CAMERA_MODEL_WROVER_KIT 8
//CAMERA_MODEL_TTGO_T_JOURNAL 9
//CAMERA_MODEL_ESP32_CAM_BOARD 10 //CAMERA_MODEL_ESP32_CAM_BOARD 10
//CAMERA_MODEL_ESP32S2_CAM_BOARD 11 //CAMERA_MODEL_ESP32S2_CAM_BOARD 11
//CAMERA_MODEL_ESP32S3_CAM_LCD 12 //CAMERA_MODEL_ESP32S3_CAM_LCD 12

3
esp3d/src/include/defines.h
View File

@ -224,11 +224,8 @@
#define CAMERA_MODEL_M5STACK_PSRAM 2 #define CAMERA_MODEL_M5STACK_PSRAM 2
#define CAMERA_MODEL_M5STACK_V2_PSRAM 3 #define CAMERA_MODEL_M5STACK_V2_PSRAM 3
#define CAMERA_MODEL_M5STACK_WIDE 4 #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_AI_THINKER 7
#define CAMERA_MODEL_WROVER_KIT 8 #define CAMERA_MODEL_WROVER_KIT 8
#define CAMERA_MODEL_TTGO_T_JOURNAL 9
#define CAMERA_MODEL_ESP32_CAM_BOARD 10 #define CAMERA_MODEL_ESP32_CAM_BOARD 10
#define CAMERA_MODEL_ESP32S2_CAM_BOARD 11 #define CAMERA_MODEL_ESP32S2_CAM_BOARD 11
#define CAMERA_MODEL_ESP32S3_CAM_LCD 12 #define CAMERA_MODEL_ESP32S3_CAM_LCD 12

15
esp3d/src/modules/camera/camera.cpp
View File

@ -209,11 +209,13 @@ bool Camera::initHardware()
config.pin_sscb_scl = SIOC_GPIO_NUM; config.pin_sscb_scl = SIOC_GPIO_NUM;
config.pin_pwdn = PWDN_GPIO_NUM; config.pin_pwdn = PWDN_GPIO_NUM;
config.pin_reset = RESET_GPIO_NUM; config.pin_reset = RESET_GPIO_NUM;
config.xclk_freq_hz = 10000000; config.xclk_freq_hz = 20000000;
config.pixel_format = PIXFORMAT_JPEG; config.pixel_format = PIXFORMAT_JPEG;
config.jpeg_quality = 5; config.jpeg_quality = 5;
config.fb_count = 1; config.fb_count = 1;
config.frame_size = DEFAULT_FRAME_SIZE; config.frame_size = DEFAULT_FRAME_SIZE;
config.fb_location = CAMERA_FB_IN_PSRAM;
config.grab_mode = CAMERA_GRAB_LATEST;
if(!psramFound()) { if(!psramFound()) {
_initialised = false; _initialised = false;
log_esp3d("psram is not enabled"); log_esp3d("psram is not enabled");
@ -317,15 +319,18 @@ const char *Camera::GetModelString()
case CAMERA_MODEL_WROVER_KIT: case CAMERA_MODEL_WROVER_KIT:
return "WROVER Kit"; return "WROVER Kit";
break; break;
case CAMERA_MODEL_ESP32S3_EYE:
case CAMERA_MODEL_ESP_EYE: case CAMERA_MODEL_ESP_EYE:
return "ESP Eye"; return "ESP Eye";
break; break;
case CAMERA_MODEL_M5STACK_PSRAM:
return "M5Stack with PSRam";
break;
case CAMERA_MODEL_M5STACK_WIDE: case CAMERA_MODEL_M5STACK_WIDE:
return "M5Stack wide"; case CAMERA_MODEL_M5STACK_V2_PSRAM:
case CAMERA_MODEL_M5STACK_PSRAM:
return "M5Stack";
break; break;
case CAMERA_MODEL_ESP32_CAM_BOARD:
case CAMERA_MODEL_ESP32S2_CAM_BOARD:
case CAMERA_MODEL_ESP32S3_CAM_LCD:
case CAMERA_MODEL_AI_THINKER: case CAMERA_MODEL_AI_THINKER:
return "ESP32 Cam"; return "ESP32 Cam";
break; break;