nam/esp32-camera-driver
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some 7725 fixes

Browse Source
This commit is contained in:
me-no-dev
2020-06-03 22:54:57 +03:00
parent eacd640b8d
commit af931850f4
3 changed files with 249 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
driver/camera.c
View File

@@ -1307,20 +1307,20 @@ esp_err_t esp_camera_init(const camera_config_t* config)
goto fail;
}
if (camera_model == CAMERA_OV7725) {
ESP_LOGD(TAG, "Detected OV7725 camera");
ESP_LOGI(TAG, "Detected OV7725 camera");
if(config->pixel_format == PIXFORMAT_JPEG) {
ESP_LOGE(TAG, "Camera does not support JPEG");
err = ESP_ERR_CAMERA_NOT_SUPPORTED;
goto fail;
}
} else if (camera_model == CAMERA_OV2640) {
ESP_LOGD(TAG, "Detected OV2640 camera");
ESP_LOGI(TAG, "Detected OV2640 camera");
} else if (camera_model == CAMERA_OV3660) {
ESP_LOGD(TAG, "Detected OV3660 camera");
ESP_LOGI(TAG, "Detected OV3660 camera");
} else if (camera_model == CAMERA_OV5640) {
ESP_LOGD(TAG, "Detected OV5640 camera");
ESP_LOGI(TAG, "Detected OV5640 camera");
} else {
ESP_LOGE(TAG, "Camera not supported");
ESP_LOGI(TAG, "Camera not supported");
err = ESP_ERR_CAMERA_NOT_SUPPORTED;
goto fail;
}
@@ -1425,7 +1425,7 @@ sensor_t * esp_camera_sensor_get()
esp_err_t esp_camera_save_to_nvs(const char *key)
{
#ifdef ESP_IDF_VERSION_MAJOR
#if ESP_IDF_VERSION_MAJOR > 3
nvs_handle_t handle;
#else
nvs_handle handle;
@@ -1453,7 +1453,7 @@ esp_err_t esp_camera_save_to_nvs(const char *key)
esp_err_t esp_camera_load_from_nvs(const char *key)
{
#ifdef ESP_IDF_VERSION_MAJOR
#if ESP_IDF_VERSION_MAJOR > 3
nvs_handle_t handle;
#else
nvs_handle handle;

2
driver/sccb.c
View File

@@ -26,7 +26,7 @@ static const char* TAG = "sccb";
#ifdef CONFIG_SCCB_HARDWARE_I2C
#include "driver/i2c.h"
#define SCCB_FREQ 200000 /*!< I2C master frequency*/
#define SCCB_FREQ 100000 /*!< I2C master frequency*/
#define WRITE_BIT I2C_MASTER_WRITE /*!< I2C master write */
#define READ_BIT I2C_MASTER_READ /*!< I2C master read */
#define ACK_CHECK_EN 0x1 /*!< I2C master will check ack from slave*/