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

Merge pull request #177 from LumiGuide/gpio-before-reset

Browse Source 
Set up GPIO before initializing camera sensor
This commit is contained in:
Me No Dev
2020-10-14 01:52:47 +03:00
committed by GitHub
parent 30cb4e873e 5ddded4a4c
commit 2f27323c3e
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
driver/camera.c
View File

@ -373,12 +373,10 @@ static inline void IRAM_ATTR i2s_conf_reset()
}
}
static void i2s_init()
static void i2s_gpio_init(const camera_config_t* config)
{
camera_config_t* config = &s_state->config;
// Configure input GPIOs
gpio_num_t pins[] = {
const gpio_num_t pins[] = {
config->pin_d7,
config->pin_d6,
config->pin_d5,
@ -395,15 +393,21 @@ static void i2s_init()
.mode = GPIO_MODE_INPUT,
.pull_up_en = GPIO_PULLUP_ENABLE,
.pull_down_en = GPIO_PULLDOWN_DISABLE,
.intr_type = GPIO_INTR_DISABLE
.intr_type = GPIO_INTR_DISABLE,
.pin_bit_mask = 0LL
};
for (int i = 0; i < sizeof(pins) / sizeof(gpio_num_t); ++i) {
if (rtc_gpio_is_valid_gpio(pins[i])) {
rtc_gpio_deinit(pins[i]);
}
conf.pin_bit_mask = 1LL << pins[i];
gpio_config(&conf);
conf.pin_bit_mask |= 1LL << pins[i];
}
gpio_config(&conf);
}
static void i2s_init()
{
camera_config_t* config = &s_state->config;
// Route input GPIOs to I2S peripheral using GPIO matrix
gpio_matrix_in(config->pin_d0, I2S0I_DATA_IN0_IDX, false);
@ -1333,6 +1337,7 @@ fail:
esp_err_t esp_camera_init(const camera_config_t* config)
{
camera_model_t camera_model = CAMERA_NONE;
i2s_gpio_init(config);
esp_err_t err = camera_probe(config, &camera_model);
if (err != ESP_OK) {
ESP_LOGE(TAG, "Camera probe failed with error 0x%x", err);