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

fixed code

Browse Source
This commit is contained in:
apiesse
2020-05-14 13:26:37 +02:00
parent f69786ba75
commit 8d80a9c8dd
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
driver/camera.c
View File

@@ -1256,8 +1256,13 @@ esp_err_t camera_init(const camera_config_t* config)
vsync_intr_disable(); vsync_intr_disable();
err = gpio_install_isr_service(ESP_INTR_FLAG_LEVEL1 | ESP_INTR_FLAG_IRAM); err = gpio_install_isr_service(ESP_INTR_FLAG_LEVEL1 | ESP_INTR_FLAG_IRAM);
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_LOGE(TAG, "gpio_install_isr_service failed (%x)", err); if (err != ESP_ERR_INVALID_STATE) {
goto fail; ESP_LOGE(TAG, "gpio_install_isr_service failed (%x)", err);
goto fail;
}
else {
ESP_LOGW(TAG, "gpio_install_isr_service already installed");
}
} }
err = gpio_isr_handler_add(s_state->config.pin_vsync, &vsync_isr, NULL); err = gpio_isr_handler_add(s_state->config.pin_vsync, &vsync_isr, NULL);
if (err != ESP_OK) { if (err != ESP_OK) {

4
driver/sccb.c
View File

@@ -43,9 +43,9 @@ 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)
{ {
ESP_LOGI(TAG, "pin_sda %d pin_scl %d \n", pin_sda, pin_scl); ESP_LOGI(TAG, "pin_sda %d pin_scl %d\n", pin_sda, pin_scl);
#ifdef CONFIG_SCCB_HARDWARE_I2C #ifdef CONFIG_SCCB_HARDWARE_I2C
//log_i("SCCB_Init start"); //log_i("SCCB_Init start");
i2c_config_t conf; i2c_config_t conf;