Rolling v10.6.1

2026-01-28 21:30:44 +03:00 · 2022-07-24 18:53:25 +02:00
parent 189093d548
commit 0e7c600cf7
209 changed files with 1791 additions and 12917 deletions
--- a/code/components/esp32-camera-master/driver/cam_hal.c
+++ b/code/components/esp32-camera-master/driver/cam_hal.c
@@ -18,21 +18,8 @@
 #include "ll_cam.h"
 #include "cam_hal.h"

-#if (ESP_IDF_VERSION_MAJOR == 3) && (ESP_IDF_VERSION_MINOR == 3)
-#include "rom/ets_sys.h"
-#else
-#include "esp_timer.h"
-#if CONFIG_IDF_TARGET_ESP32
-#include "esp32/rom/ets_sys.h"  // will be removed in idf v5.0
-#elif CONFIG_IDF_TARGET_ESP32S2
-#include "esp32s2/rom/ets_sys.h"
-#elif CONFIG_IDF_TARGET_ESP32S3
-#include "esp32s3/rom/ets_sys.h"
-#endif
-#endif // ESP_IDF_VERSION_MAJOR
-#define ESP_CAMERA_ETS_PRINTF ets_printf
-
 static const char *TAG = "cam_hal";
+
 static cam_obj_t *cam_obj = NULL;

 static const uint32_t JPEG_SOI_MARKER = 0xFFD8FF;  // written in little-endian for esp32
@@ -106,7 +93,7 @@ void IRAM_ATTR ll_cam_send_event(cam_obj_t *cam, cam_event_t cam_event, BaseType
    if (xQueueSendFromISR(cam->event_queue, (void *)&cam_event, HPTaskAwoken) != pdTRUE) {
        ll_cam_stop(cam);
        cam->state = CAM_STATE_IDLE;
-        ESP_CAMERA_ETS_PRINTF(DRAM_STR("cam_hal: EV-%s-OVF\r\n"), cam_event==CAM_IN_SUC_EOF_EVENT ? DRAM_STR("EOF") : DRAM_STR("VSYNC"));
+        ESP_EARLY_LOGE(TAG, "EV-%s-OVF", cam_event==CAM_IN_SUC_EOF_EVENT ? "EOF" : "VSYNC");
    }
 }

--- a/code/components/esp32-camera-master/driver/esp_camera.c
+++ b/code/components/esp32-camera-master/driver/esp_camera.c
@@ -57,15 +57,6 @@
 #if CONFIG_BF3005_SUPPORT
 #include "bf3005.h"
 #endif
-#if CONFIG_BF20A6_SUPPORT
-#include "bf20a6.h"
-#endif
-#if CONFIG_SC101IOT_SUPPORT
-#include "sc101iot.h"
-#endif
-#if CONFIG_SC030IOT_SUPPORT
-#include "sc030iot.h"
-#endif

 #if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG)
 #include "esp32-hal-log.h"
@@ -128,15 +119,6 @@ static const sensor_func_t g_sensors[] = {
 #if CONFIG_BF3005_SUPPORT
    {bf3005_detect, bf3005_init},
 #endif
-#if CONFIG_BF20A6_SUPPORT
-    {bf20a6_detect, bf20a6_init},
-#endif
-#if CONFIG_SC101IOT_SUPPORT
-    {sc101iot_detect, sc101iot_init},
-#endif
-#if CONFIG_SC030IOT_SUPPORT
-    {sc030iot_detect, sc030iot_init},
-#endif
 };

 static esp_err_t camera_probe(const camera_config_t *config, camera_model_t *out_camera_model)
@@ -236,23 +218,6 @@ static esp_err_t camera_probe(const camera_config_t *config, camera_model_t *out
    return ESP_OK;
 }

-#if CONFIG_CAMERA_CONVERTER_ENABLED
-static pixformat_t get_output_data_format(camera_conv_mode_t conv_mode)
-{
-    pixformat_t format = PIXFORMAT_RGB565;
-    switch (conv_mode) {
-    case YUV422_TO_YUV420:
-        format = PIXFORMAT_YUV420;
-        break;
-    case YUV422_TO_RGB565: // default format is RGB565
-    default:
-        break;
-    }
-    ESP_LOGD(TAG, "Convert to %d format enabled", format);
-    return format;
-}
-#endif
-
 esp_err_t esp_camera_init(const camera_config_t *config)
 {
    esp_err_t err;
@@ -291,7 +256,6 @@ esp_err_t esp_camera_init(const camera_config_t *config)

    s_state->sensor.status.framesize = frame_size;
    s_state->sensor.pixformat = pix_format;
-
    ESP_LOGD(TAG, "Setting frame size to %dx%d", resolution[frame_size].width, resolution[frame_size].height);
    if (s_state->sensor.set_framesize(&s_state->sensor, frame_size) != 0) {
        ESP_LOGE(TAG, "Failed to set frame size");
@@ -299,11 +263,6 @@ esp_err_t esp_camera_init(const camera_config_t *config)
        goto fail;
    }
    s_state->sensor.set_pixformat(&s_state->sensor, pix_format);
-#if CONFIG_CAMERA_CONVERTER_ENABLED
-    if(config->conv_mode) {
-        s_state->sensor.pixformat = get_output_data_format(config->conv_mode); // If conversion enabled, change the out data format by conversion mode
-    }
-#endif

    if (s_state->sensor.id.PID == OV2640_PID) {
        s_state->sensor.set_gainceiling(&s_state->sensor, GAINCEILING_2X);
--- a/code/components/esp32-camera-master/driver/include/esp_camera.h
+++ b/code/components/esp32-camera-master/driver/include/esp_camera.h
@@ -70,7 +70,6 @@
 #include "driver/ledc.h"
 #include "sensor.h"
 #include "sys/time.h"
-#include "sdkconfig.h"

 #ifdef __cplusplus
 extern "C" {
@@ -92,19 +91,6 @@ typedef enum {
    CAMERA_FB_IN_DRAM           /*!< Frame buffer is placed in internal DRAM */
 } camera_fb_location_t;

-#if CONFIG_CAMERA_CONVERTER_ENABLED
-/**
- * @brief Camera RGB\YUV conversion mode
- */
-typedef enum {
-    CONV_DISABLE,
-    RGB565_TO_YUV422,
-        
-    YUV422_TO_RGB565,
-    YUV422_TO_YUV420
-} camera_conv_mode_t;
-#endif
-
 /**
 * @brief Configuration structure for camera initialization
 */
@@ -138,9 +124,6 @@ typedef struct {
    size_t fb_count;                /*!< Number of frame buffers to be allocated. If more than one, then each frame will be acquired (double speed)  */
    camera_fb_location_t fb_location; /*!< The location where the frame buffer will be allocated */
    camera_grab_mode_t grab_mode;   /*!< When buffers should be filled */
-#if CONFIG_CAMERA_CONVERTER_ENABLED
-    camera_conv_mode_t conv_mode;   /*!< RGB<->YUV Conversion mode */
-#endif
 } camera_config_t;

 /**
--- a/code/components/esp32-camera-master/driver/include/sensor.h
+++ b/code/components/esp32-camera-master/driver/include/sensor.h
@@ -27,9 +27,6 @@ typedef enum {
    GC032A_PID = 0x232a,
    GC0308_PID = 0x9b,
    BF3005_PID = 0x30,
-    BF20A6_PID = 0x20a6,
-    SC101IOT_PID = 0xda4a,
-    SC030IOT_PID = 0x9a46,
 } camera_pid_t;

 typedef enum {
@@ -43,9 +40,6 @@ typedef enum {
    CAMERA_GC032A,
    CAMERA_GC0308,
    CAMERA_BF3005,
-    CAMERA_BF20A6,
-    CAMERA_SC101IOT,
-    CAMERA_SC030IOT,
    CAMERA_MODEL_MAX,
    CAMERA_NONE,
 } camera_model_t;
@@ -61,15 +55,11 @@ typedef enum {
    GC032A_SCCB_ADDR   = 0x21,// 0x42 >> 1
    GC0308_SCCB_ADDR   = 0x21,// 0x42 >> 1
    BF3005_SCCB_ADDR   = 0x6E,
-    BF20A6_SCCB_ADDR   = 0x6E,
-    SC101IOT_SCCB_ADDR = 0x68,// 0xd0 >> 1
-    SC030IOT_SCCB_ADDR = 0x68,// 0xd0 >> 1
 } camera_sccb_addr_t;

 typedef enum {
    PIXFORMAT_RGB565,    // 2BPP/RGB565
    PIXFORMAT_YUV422,    // 2BPP/YUV422
-    PIXFORMAT_YUV420,    // 1.5BPP/YUV420
    PIXFORMAT_GRAYSCALE, // 1BPP/GRAYSCALE
    PIXFORMAT_JPEG,      // JPEG/COMPRESSED
    PIXFORMAT_RGB888,    // 3BPP/RGB888
--- a/code/components/esp32-camera-master/driver/sccb.c
+++ b/code/components/esp32-camera-master/driver/sccb.c
@@ -25,11 +25,6 @@ static const char* TAG = "sccb";

 #include "driver/i2c.h"

-// support IDF 5.x
-#ifndef portTICK_RATE_MS
-#define portTICK_RATE_MS portTICK_PERIOD_MS
-#endif
-
 #define SCCB_FREQ               CONFIG_SCCB_CLK_FREQ  /*!< I2C master frequency*/
 #define WRITE_BIT               I2C_MASTER_WRITE      /*!< I2C master write */
 #define READ_BIT                I2C_MASTER_READ       /*!< I2C master read */
--- a/code/components/esp32-camera-master/driver/sensor.c
+++ b/code/components/esp32-camera-master/driver/sensor.c
@@ -13,9 +13,6 @@ const camera_sensor_info_t camera_sensor[CAMERA_MODEL_MAX] = {
    {CAMERA_GC032A, "GC032A", GC032A_SCCB_ADDR, GC032A_PID, FRAMESIZE_VGA, false},
    {CAMERA_GC0308, "GC0308", GC0308_SCCB_ADDR, GC0308_PID, FRAMESIZE_VGA, false},
    {CAMERA_BF3005, "BF3005", BF3005_SCCB_ADDR, BF3005_PID, FRAMESIZE_VGA, false},
-    {CAMERA_BF20A6, "BF20A6", BF20A6_SCCB_ADDR, BF20A6_PID, FRAMESIZE_VGA, false},
-    {CAMERA_SC101IOT, "SC101IOT", SC101IOT_SCCB_ADDR, SC101IOT_PID, FRAMESIZE_HD, false},
-    {CAMERA_SC030IOT, "SC030IOT", SC030IOT_SCCB_ADDR, SC030IOT_PID, FRAMESIZE_VGA, false},
 };

 const resolution_info_t resolution[FRAMESIZE_INVALID] = {