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

adjust for non Arduino

Browse Source
This commit is contained in:
XiaochaoGONG
2019-03-29 12:06:57 +08:00
parent 54814d065f
commit f7fed18718
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -5,6 +5,7 @@ set(COMPONENT_SRCS
driver/twi.c driver/twi.c
driver/xclk.c driver/xclk.c
sensors/ov2640.c sensors/ov2640.c
sensors/ov3660.c
sensors/ov7725.c sensors/ov7725.c
conversions/yuv.c conversions/yuv.c
conversions/to_jpg.cpp conversions/to_jpg.cpp

2
driver/camera.c
View File

@@ -1176,7 +1176,7 @@ esp_err_t camera_init(const camera_config_t* config)
} }
//ToDo: core affinity? //ToDo: core affinity?
if (!xTaskCreatePinnedToCore(&dma_filter_task, "dma_filter", 4096, NULL, 10, &s_state->dma_filter_task, 1)) { if (!xTaskCreatePinnedToCore(&dma_filter_task, "dma_filter", 4096, NULL, 10, &s_state->dma_filter_task, 0)) {
ESP_LOGE(TAG, "Failed to create DMA filter task"); ESP_LOGE(TAG, "Failed to create DMA filter task");
err = ESP_ERR_NO_MEM; err = ESP_ERR_NO_MEM;
goto fail; goto fail;

2
driver/sccb.c
View File

@@ -41,7 +41,7 @@ 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;
conf.mode = I2C_MODE_MASTER; conf.mode = I2C_MODE_MASTER;
conf.sda_io_num = pin_sda; conf.sda_io_num = pin_sda;

3
sensors/ov3660.c
View File

@@ -6,7 +6,6 @@
* OV3660 driver. * OV3660 driver.
* *
*/ */
#include "Arduino.h"
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@@ -18,9 +17,11 @@
#include "freertos/task.h" #include "freertos/task.h"
#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) #if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG)
#include "Arduino.h"
#include "esp32-hal-log.h" #include "esp32-hal-log.h"
#else #else
#include "esp_log.h" #include "esp_log.h"
#define delay(x)
static const char *TAG = "ov3660"; static const char *TAG = "ov3660";
#endif #endif