espressif/esp32-camera
1
0
Fork 0
mirror of https://github.com/espressif/esp32-camera.git synced 2025-07-03 23:55:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

SCCB configured externally

Browse Source
This commit is contained in:
apiesse
2020-05-14 11:31:45 +02:00
parent 528c97a872
commit d109e5cc19
4 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
driver/camera.c
View File

@ -959,7 +959,7 @@ esp_err_t camera_probe(const camera_config_t* config, camera_model_t* out_camera
camera_enable_out_clock(config); camera_enable_out_clock(config);
ESP_LOGD(TAG, "Initializing SSCB"); ESP_LOGD(TAG, "Initializing SSCB");
SCCB_Init(config->pin_sscb_sda, config->pin_sscb_scl); SCCB_Init(config->pin_sccb_sda, config->pin_sccb_scl, config->sccb_external);
if(config->pin_pwdn >= 0) { if(config->pin_pwdn >= 0) {
ESP_LOGD(TAG, "Resetting camera by power down line"); ESP_LOGD(TAG, "Resetting camera by power down line");
@ -968,7 +968,7 @@ esp_err_t camera_probe(const camera_config_t* config, camera_model_t* out_camera
conf.mode = GPIO_MODE_OUTPUT; conf.mode = GPIO_MODE_OUTPUT;
gpio_config(&conf); gpio_config(&conf);
// carefull, logic is inverted compared to reset pin // careful, logic is inverted compared to reset pin
gpio_set_level(config->pin_pwdn, 1); gpio_set_level(config->pin_pwdn, 1);
vTaskDelay(10 / portTICK_PERIOD_MS); vTaskDelay(10 / portTICK_PERIOD_MS);
gpio_set_level(config->pin_pwdn, 0); gpio_set_level(config->pin_pwdn, 0);

10
driver/include/esp_camera.h
View File

@ -18,8 +18,8 @@
.pin_pwdn = PIN_PWDN, .pin_pwdn = PIN_PWDN,
.pin_reset = PIN_RESET, .pin_reset = PIN_RESET,
.pin_xclk = PIN_XCLK, .pin_xclk = PIN_XCLK,
.pin_sscb_sda = PIN_SIOD, .pin_sccb_sda = PIN_SIOD,
.pin_sscb_scl = PIN_SIOC, .pin_sccb_scl = PIN_SIOC,
.pin_d7 = PIN_D7, .pin_d7 = PIN_D7,
.pin_d6 = PIN_D6, .pin_d6 = PIN_D6,
.pin_d5 = PIN_D5, .pin_d5 = PIN_D5,
@ -81,8 +81,8 @@ typedef struct {
int pin_pwdn; /*!< GPIO pin for camera power down line */ int pin_pwdn; /*!< GPIO pin for camera power down line */
int pin_reset; /*!< GPIO pin for camera reset line */ int pin_reset; /*!< GPIO pin for camera reset line */
int pin_xclk; /*!< GPIO pin for camera XCLK line */ int pin_xclk; /*!< GPIO pin for camera XCLK line */
int pin_sscb_sda; /*!< GPIO pin for camera SDA line */ int pin_sccb_sda; /*!< GPIO pin for camera SDA line */
int pin_sscb_scl; /*!< GPIO pin for camera SCL line */ int pin_sccb_scl; /*!< GPIO pin for camera SCL line */
int pin_d7; /*!< GPIO pin for camera D7 line */ int pin_d7; /*!< GPIO pin for camera D7 line */
int pin_d6; /*!< GPIO pin for camera D6 line */ int pin_d6; /*!< GPIO pin for camera D6 line */
int pin_d5; /*!< GPIO pin for camera D5 line */ int pin_d5; /*!< GPIO pin for camera D5 line */
@ -105,6 +105,8 @@ typedef struct {
int jpeg_quality; /*!< Quality of JPEG output. 0-63 lower means higher quality */ int jpeg_quality; /*!< Quality of JPEG output. 0-63 lower means higher quality */
size_t fb_count; /*!< Number of frame buffers to be allocated. If more than one, then each frame will be acquired (double speed) */ size_t fb_count; /*!< Number of frame buffers to be allocated. If more than one, then each frame will be acquired (double speed) */
int sccb_external; /*!< Hardware SCCB interface configured externally */
} camera_config_t; } camera_config_t;
/** /**

4
driver/private_include/sccb.h
View File

@ -9,8 +9,8 @@
#ifndef __SCCB_H__ #ifndef __SCCB_H__
#define __SCCB_H__ #define __SCCB_H__
#include <stdint.h> #include <stdint.h>
int SCCB_Init(int pin_sda, int pin_scl); int SCCB_Init(int pin_sda, int pin_scl, int external);
uint8_t SCCB_Probe(); uint8_t SCCB_Probe(void);
uint8_t SCCB_Read(uint8_t slv_addr, uint8_t reg); uint8_t SCCB_Read(uint8_t slv_addr, uint8_t reg);
uint8_t SCCB_Write(uint8_t slv_addr, uint8_t reg, uint8_t data); uint8_t SCCB_Write(uint8_t slv_addr, uint8_t reg, uint8_t data);
uint8_t SCCB_Read16(uint8_t slv_addr, uint16_t reg); uint8_t SCCB_Read16(uint8_t slv_addr, uint16_t reg);

29
driver/sccb.c
View File

@ -19,8 +19,6 @@
static const char* TAG = "sccb"; static const char* TAG = "sccb";
#endif #endif
//#undef CONFIG_SCCB_HARDWARE_I2C
#define LITTLETOBIG(x) ((x<<8)|(x>>8)) #define LITTLETOBIG(x) ((x<<8)|(x>>8))
#ifdef CONFIG_SCCB_HARDWARE_I2C #ifdef CONFIG_SCCB_HARDWARE_I2C
@ -43,28 +41,29 @@ static uint8_t ESP_SLAVE_ADDR = 0x3c;
#include "twi.h" #include "twi.h"
#endif #endif
int SCCB_Init(int pin_sda, int pin_scl) int SCCB_Init(int pin_sda, int pin_scl, int external)
{ {
ESP_LOGI(TAG, "pin_sda %d pin_scl %d\n", pin_sda, pin_scl); ESP_LOGI(TAG, "pin_sda %d pin_scl %d external %d \n", pin_sda, pin_scl, external);
#ifdef CONFIG_SCCB_HARDWARE_I2C #ifdef CONFIG_SCCB_HARDWARE_I2C
//log_i("SCCB_Init start"); if (external == 0) {
i2c_config_t conf; i2c_config_t conf;
conf.mode = I2C_MODE_MASTER; conf.mode = I2C_MODE_MASTER;
conf.sda_io_num = pin_sda; conf.sda_io_num = pin_sda;
conf.sda_pullup_en = GPIO_PULLUP_ENABLE; conf.sda_pullup_en = GPIO_PULLUP_ENABLE;
conf.scl_io_num = pin_scl; conf.scl_io_num = pin_scl;
conf.scl_pullup_en = GPIO_PULLUP_ENABLE; conf.scl_pullup_en = GPIO_PULLUP_ENABLE;
conf.master.clk_speed = SCCB_FREQ; conf.master.clk_speed = SCCB_FREQ;
i2c_param_config(SCCB_I2C_PORT, &conf); i2c_param_config(SCCB_I2C_PORT, &conf);
i2c_driver_install(SCCB_I2C_PORT, conf.mode, 0, 0, 0); i2c_driver_install(SCCB_I2C_PORT, conf.mode, 0, 0, 0);
}
#else #else
twi_init(pin_sda, pin_scl); twi_init(pin_sda, pin_scl);
#endif #endif
return 0; return 0;
} }
uint8_t SCCB_Probe() uint8_t SCCB_Probe(void)
{ {
#ifdef CONFIG_SCCB_HARDWARE_I2C #ifdef CONFIG_SCCB_HARDWARE_I2C
uint8_t slave_addr = 0x0; uint8_t slave_addr = 0x0;