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

Add support for IDF 4.X

Browse Source
This commit is contained in:
me-no-dev
2020-01-25 02:37:50 +02:00
parent 0caace6533
commit 4cda87fb96
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
driver/camera.c
View File

@@ -29,6 +29,7 @@
#include "driver/rtc_io.h" #include "driver/rtc_io.h"
#include "driver/periph_ctrl.h" #include "driver/periph_ctrl.h"
#include "esp_intr_alloc.h" #include "esp_intr_alloc.h"
#include "esp_system.h"
#include "nvs_flash.h" #include "nvs_flash.h"
#include "nvs.h" #include "nvs.h"
#include "sensor.h" #include "sensor.h"
@@ -1374,8 +1375,11 @@ sensor_t * esp_camera_sensor_get()
esp_err_t esp_camera_save_to_nvs(const char *key) esp_err_t esp_camera_save_to_nvs(const char *key)
{ {
#ifdef ESP_IDF_VERSION_MAJOR
nvs_handle_t handle;
#else
nvs_handle handle; nvs_handle handle;
#endif
esp_err_t ret = nvs_open(key,NVS_READWRITE,&handle); esp_err_t ret = nvs_open(key,NVS_READWRITE,&handle);
if (ret == ESP_OK) { if (ret == ESP_OK) {
@@ -1399,7 +1403,11 @@ esp_err_t esp_camera_save_to_nvs(const char *key)
esp_err_t esp_camera_load_from_nvs(const char *key) esp_err_t esp_camera_load_from_nvs(const char *key)
{ {
nvs_handle handle; #ifdef ESP_IDF_VERSION_MAJOR
nvs_handle_t handle;
#else
nvs_handle handle;
#endif
uint8_t pf; uint8_t pf;
esp_err_t ret = nvs_open(key,NVS_READWRITE,&handle); esp_err_t ret = nvs_open(key,NVS_READWRITE,&handle);

5
driver/xclk.c
View File

@@ -2,6 +2,7 @@
#include "driver/ledc.h" #include "driver/ledc.h"
#include "esp_err.h" #include "esp_err.h"
#include "esp_log.h" #include "esp_log.h"
#include "esp_system.h"
#include "xclk.h" #include "xclk.h"
#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) #if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG)
@@ -20,7 +21,9 @@ esp_err_t camera_enable_out_clock(camera_config_t* config)
timer_conf.freq_hz = config->xclk_freq_hz; timer_conf.freq_hz = config->xclk_freq_hz;
timer_conf.speed_mode = LEDC_HIGH_SPEED_MODE; timer_conf.speed_mode = LEDC_HIGH_SPEED_MODE;
timer_conf.timer_num = config->ledc_timer; timer_conf.timer_num = config->ledc_timer;
//timer_conf.clk_cfg = LEDC_AUTO_CLK; //todo: IDF 4.X support #ifdef ESP_IDF_VERSION_MAJOR
timer_conf.clk_cfg = LEDC_AUTO_CLK;
#endif
esp_err_t err = ledc_timer_config(&timer_conf); esp_err_t err = ledc_timer_config(&timer_conf);
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_LOGE(TAG, "ledc_timer_config failed, rc=%x", err); ESP_LOGE(TAG, "ledc_timer_config failed, rc=%x", err);