From fdb8aee4ae289358ec238aa08ee86cc5536572fc Mon Sep 17 00:00:00 2001 From: Bartlomiej Cieszkowski Date: Sun, 29 Dec 2019 16:38:47 +0100 Subject: [PATCH 1/3] slave_addr was not used with SCCB_HARDWARE_I2C Signed-off-by: Bartlomiej Cieszkowski --- driver/sccb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/driver/sccb.c b/driver/sccb.c index 892eb5b..48e53fc 100755 --- a/driver/sccb.c +++ b/driver/sccb.c @@ -102,7 +102,7 @@ uint8_t SCCB_Read(uint8_t slv_addr, uint8_t reg) esp_err_t ret = ESP_FAIL; i2c_cmd_handle_t cmd = i2c_cmd_link_create(); i2c_master_start(cmd); - i2c_master_write_byte(cmd, ( ESP_SLAVE_ADDR << 1 ) | WRITE_BIT, ACK_CHECK_EN); + i2c_master_write_byte(cmd, ( slv_addr << 1 ) | WRITE_BIT, ACK_CHECK_EN); i2c_master_write_byte(cmd, reg, ACK_CHECK_EN); i2c_master_stop(cmd); ret = i2c_master_cmd_begin(SCCB_I2C_PORT, cmd, 1000 / portTICK_RATE_MS); @@ -110,13 +110,13 @@ uint8_t SCCB_Read(uint8_t slv_addr, uint8_t reg) if(ret != ESP_OK) return -1; cmd = i2c_cmd_link_create(); i2c_master_start(cmd); - i2c_master_write_byte(cmd, ( ESP_SLAVE_ADDR << 1 ) | READ_BIT, ACK_CHECK_EN); + i2c_master_write_byte(cmd, ( slv_addr << 1 ) | READ_BIT, ACK_CHECK_EN); i2c_master_read_byte(cmd, &data, NACK_VAL); i2c_master_stop(cmd); ret = i2c_master_cmd_begin(SCCB_I2C_PORT, cmd, 1000 / portTICK_RATE_MS); i2c_cmd_link_delete(cmd); if(ret != ESP_OK) { - ESP_LOGE(TAG, "SCCB_Read Failed addr:0x%02x, reg:0x%02x, data:0x%02x, ret:%d", ESP_SLAVE_ADDR, reg, data, ret); + ESP_LOGE(TAG, "SCCB_Read Failed addr:0x%02x, reg:0x%02x, data:0x%02x, ret:%d", slv_addr, reg, data, ret); } return data; #else @@ -144,14 +144,14 @@ uint8_t SCCB_Write(uint8_t slv_addr, uint8_t reg, uint8_t data) esp_err_t ret = ESP_FAIL; i2c_cmd_handle_t cmd = i2c_cmd_link_create(); i2c_master_start(cmd); - i2c_master_write_byte(cmd, ( ESP_SLAVE_ADDR << 1 ) | WRITE_BIT, ACK_CHECK_EN); + i2c_master_write_byte(cmd, ( slv_addr << 1 ) | WRITE_BIT, ACK_CHECK_EN); i2c_master_write_byte(cmd, reg, ACK_CHECK_EN); i2c_master_write_byte(cmd, data, ACK_CHECK_EN); i2c_master_stop(cmd); ret = i2c_master_cmd_begin(SCCB_I2C_PORT, cmd, 1000 / portTICK_RATE_MS); i2c_cmd_link_delete(cmd); if(ret != ESP_OK) { - ESP_LOGE(TAG, "SCCB_Write Failed addr:0x%02x, reg:0x%02x, data:0x%02x, ret:%d", ESP_SLAVE_ADDR, reg, data, ret); + ESP_LOGE(TAG, "SCCB_Write Failed addr:0x%02x, reg:0x%02x, data:0x%02x, ret:%d", slv_addr, reg, data, ret); } return ret == ESP_OK ? 0 : -1; #else @@ -177,7 +177,7 @@ uint8_t SCCB_Read16(uint8_t slv_addr, uint16_t reg) uint8_t *reg_u8 = (uint8_t *)®_htons; i2c_cmd_handle_t cmd = i2c_cmd_link_create(); i2c_master_start(cmd); - i2c_master_write_byte(cmd, ( ESP_SLAVE_ADDR << 1 ) | WRITE_BIT, ACK_CHECK_EN); + i2c_master_write_byte(cmd, ( slv_addr << 1 ) | WRITE_BIT, ACK_CHECK_EN); i2c_master_write_byte(cmd, reg_u8[0], ACK_CHECK_EN); i2c_master_write_byte(cmd, reg_u8[1], ACK_CHECK_EN); i2c_master_stop(cmd); @@ -186,7 +186,7 @@ uint8_t SCCB_Read16(uint8_t slv_addr, uint16_t reg) if(ret != ESP_OK) return -1; cmd = i2c_cmd_link_create(); i2c_master_start(cmd); - i2c_master_write_byte(cmd, ( ESP_SLAVE_ADDR << 1 ) | READ_BIT, ACK_CHECK_EN); + i2c_master_write_byte(cmd, ( slv_addr << 1 ) | READ_BIT, ACK_CHECK_EN); i2c_master_read_byte(cmd, &data, NACK_VAL); i2c_master_stop(cmd); ret = i2c_master_cmd_begin(SCCB_I2C_PORT, cmd, 1000 / portTICK_RATE_MS); @@ -226,7 +226,7 @@ uint8_t SCCB_Write16(uint8_t slv_addr, uint16_t reg, uint8_t data) uint8_t *reg_u8 = (uint8_t *)®_htons; i2c_cmd_handle_t cmd = i2c_cmd_link_create(); i2c_master_start(cmd); - i2c_master_write_byte(cmd, ( ESP_SLAVE_ADDR << 1 ) | WRITE_BIT, ACK_CHECK_EN); + i2c_master_write_byte(cmd, ( slv_addr << 1 ) | WRITE_BIT, ACK_CHECK_EN); i2c_master_write_byte(cmd, reg_u8[0], ACK_CHECK_EN); i2c_master_write_byte(cmd, reg_u8[1], ACK_CHECK_EN); i2c_master_write_byte(cmd, data, ACK_CHECK_EN); From 86c184cd636e71d2fcc65d00fe06c44eba8bb033 Mon Sep 17 00:00:00 2001 From: Bartlomiej Cieszkowski Date: Sun, 29 Dec 2019 16:41:47 +0100 Subject: [PATCH 2/3] bugfix - with disabled OV3360_SUPPORT reset for OV2640 would not happen Signed-off-by: Bartlomiej Cieszkowski --- driver/camera.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/driver/camera.c b/driver/camera.c index ee77597..072e07f 100755 --- a/driver/camera.c +++ b/driver/camera.c @@ -992,8 +992,8 @@ esp_err_t camera_probe(const camera_config_t* config, camera_model_t* out_camera ESP_LOGD(TAG, "Detected camera at address=0x%02x", s_state->sensor.slv_addr); sensor_id_t* id = &s_state->sensor.id; -#if (CONFIG_OV2640_SUPPORT && CONFIG_OV3660_SUPPORT) - if (slv_addr == 0x30) { +#if (CONFIG_OV2640_SUPPORT) + if (s_state->sensor.slv_addr == 0x30) { ESP_LOGD(TAG, "Resetting OV2640"); //camera might be OV2640. try to reset it SCCB_Write(0x30, 0xFF, 0x01);//bank sensor From ec274179ebc16fd85f6f785f6aa7d8a794766b4b Mon Sep 17 00:00:00 2001 From: Bartlomiej Cieszkowski Date: Sun, 29 Dec 2019 18:20:41 +0100 Subject: [PATCH 3/3] check return value from gpio_install_isr_service Signed-off-by: Bartlomiej Cieszkowski --- driver/camera.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/driver/camera.c b/driver/camera.c index 072e07f..04a730b 100755 --- a/driver/camera.c +++ b/driver/camera.c @@ -1201,7 +1201,11 @@ esp_err_t camera_init(const camera_config_t* config) } vsync_intr_disable(); - 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) { + ESP_LOGE(TAG, "gpio_install_isr_service failed (%x)", err); + goto fail; + } err = gpio_isr_handler_add(s_state->config.pin_vsync, &vsync_isr, NULL); if (err != ESP_OK) { ESP_LOGE(TAG, "vsync_isr_handler_add failed (%x)", err);