Rolling v10.6.1

This commit is contained in:
jomjol
2022-07-24 18:53:25 +02:00
parent 189093d548
commit 0e7c600cf7
209 changed files with 1791 additions and 12917 deletions

View File

@@ -21,15 +21,10 @@
#include "xclk.h"
#include "cam_hal.h"
#if (ESP_IDF_VERSION_MAJOR >= 4) && (ESP_IDF_VERSION_MINOR >= 3)
#include "esp_rom_gpio.h"
#endif
#if (ESP_IDF_VERSION_MAJOR >= 5)
#define GPIO_PIN_INTR_POSEDGE GPIO_INTR_POSEDGE
#define GPIO_PIN_INTR_NEGEDGE GPIO_INTR_NEGEDGE
#define gpio_matrix_in(a,b,c) esp_rom_gpio_connect_in_signal(a,b,c)
#define ets_delay_us(a) esp_rom_delay_us(a)
#define gpio_matrix_in(a,b,c) gpio_iomux_in(a,b)
#endif
static const char *TAG = "s2 ll_cam";
@@ -75,7 +70,7 @@ static void IRAM_ATTR ll_cam_dma_isr(void *arg)
}
}
bool IRAM_ATTR ll_cam_stop(cam_obj_t *cam)
bool ll_cam_stop(cam_obj_t *cam)
{
I2S0.conf.rx_start = 0;