zhangzhaopeng/sdk-hwV1.3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync(system): sync system changes.

Browse Source
This commit is contained in:
kangjun
2024-07-18 14:32:02 +08:00
parent db0777c83d
commit cb4e8e6605
116 changed files with 31484 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lichee/melis-v3.0/source/projects/v851-e907-sl100_back-board/configs/defconfig
View File

@@ -218,9 +218,8 @@ CONFIG_ISP_NUMBER=1
#
# CONFIG_SENSOR_GC1054_MIPI is not set
# CONFIG_SENSOR_GC1084_MIPI is not set
CONFIG_SENSOR_GC2053_MIPI=y
# CONFIG_SENSOR_GC2053_8BIT_MIPI is not set
# CONFIG_SENSOR_GC2083_MIPI is not set
# CONFIG_SENSOR_GC2053_MIPI is not set
CONFIG_SENSOR_GC2083_MIPI=y
# CONFIG_SENSOR_GC4663_MIPI is not set
# CONFIG_SENSOR_SC2355_MIPI is not set
# CONFIG_SENSOR_SC2336_MIPI is not set

10
lichee/melis-v3.0/source/projects/v851-e907-sl100_back-board/configs/sys_config.fex
View File

@@ -11,8 +11,8 @@
;twi0_sda = port:PA17<4><1><default><default>
[twi1]
twi1_scl = port:PE02<8><1><default><default>
twi1_sda = port:PE03<8><1><default><default>
twi1_scl = port:PA06<4><1><default><default>
twi1_sda = port:PA07<4><1><default><default>
;[twi2]
;twi2_scl = port:PH05<4><1><default><default>
@@ -47,7 +47,7 @@ uart_rx = port:PE01<7><1><default><default>
[sensor0]
used0 = 1
reset0 = port:PA10<1><1><default><default>
pwdn0 = port:PA11<1><1><default><default>
mclk0 = port:PE12<5><1><default><default>
reset0 = port:PA11<1><1><default><default>
pwdn0 = port:PA09<1><1><default><default>
mclk0 = port:PA10<4><1><default><default>

37
lichee/rtos-hal/hal/source/vin/modules/sensor/gc2083_mipi.c
View File

@@ -27,7 +27,8 @@
#define SENSOR_NAME "gc2083_mipi"
#define SENSOR_NAME_2 "gc2083_mipi_2"
#define GC2083_1920X1080_15FPS
#define GC2083_1920X1088_15FPS
//#define GC2083_1920X1088_20FPS
#define SENSOR_FRAME_RATE 15
static int sensor_power_count[2];
@@ -44,7 +45,7 @@ static struct regval_list sensor_default_regs[] = {
};
#if defined CONFIG_ISP_READ_THRESHOLD || defined CONFIG_ISP_ONLY_HARD_LIGHTADC
#ifdef GC2083_1920X1080_20FPS
#ifdef GC2083_1920X1088_20FPS
static struct regval_list sensor_1080p20_regs[] = {
//version 1.0
//mclk 27Mhz
@@ -119,7 +120,7 @@ static struct regval_list sensor_1080p20_regs[] = {
{0x008d, 0xff},
/*gain*/
{0x007a, 0x78}, //global gain
{0x007a, 0x50}, //global gain
{0x00d0, 0x00},
{0x0dc1, 0x00},
@@ -191,7 +192,7 @@ static struct regval_list sensor_1080p20_regs[] = {
{0x0192, 0x00},
{0x0194, 0x00},
{0x0195, 0x04},
{0x0196, 0x38},
{0x0196, 0x40},
{0x0197, 0x07},
{0x0198, 0x80},
@@ -205,11 +206,11 @@ static struct regval_list sensor_1080p20_regs[] = {
{0x0215, 0x10},
{0x0229, 0x05},
{0x0237, 0x03},
// {0x023e, 0x99}
{0x023e, 0x99}
};
#endif
#ifdef GC2083_1920X1080_15FPS
#ifdef GC2083_1920X1088_15FPS
static struct regval_list sensor_1080p15_regs[] = {
{0x03fe, 0xf0},
{0x03fe, 0xf0},
@@ -252,7 +253,7 @@ static struct regval_list sensor_1080p15_regs[] = {
{0x0076, 0x00},
{0x0d76, 0x00},
{0x0d41, 0x05},
{0x0d42, 0x8b},
{0x0d42, 0x46},
{0x0d7a, 0x10},
{0x0d19, 0x31},
@@ -272,11 +273,11 @@ static struct regval_list sensor_1080p15_regs[] = {
{0x0db6, 0x3d},
{0x00d2, 0xbc},
{0x0d66, 0x42},
{0x008c, 0x06}, // dynamic range 0x05 -> 0x06
{0x008c, 0x05},
{0x008d, 0xff},
/*gain*/
{0x007a, 0x98}, //global gain, orign = 0x50
{0x007a, 0x50}, //global gain
{0x00d0, 0x00},
{0x0dc1, 0x00},
@@ -345,10 +346,10 @@ static struct regval_list sensor_1080p15_regs[] = {
{0x04e0, 0x18},
/*window*/
{0x0192, 0x04},
{0x0192, 0x00},
{0x0194, 0x04},
{0x0195, 0x04},
{0x0196, 0x38},
{0x0196, 0x40},
{0x0197, 0x07},
{0x0198, 0x80},
@@ -362,7 +363,7 @@ static struct regval_list sensor_1080p15_regs[] = {
{0x0215, 0x10},
{0x0229, 0x05},
{0x0237, 0x03},
// {0x023e, 0x99}
{0x023e, 0x99}
};
#endif
@@ -754,7 +755,7 @@ static struct sensor_format_struct sensor_formats[] = {
{
.mbus_code = MEDIA_BUS_FMT_SRGGB10_1X10, /*.mbus_code = MEDIA_BUS_FMT_SBGGR10_1X10, */
.width = 1920,
.height = 1080,
.height = 1088,
.hoffset = 0,
.voffset = 0,
.hts = 2932,
@@ -774,21 +775,21 @@ static struct sensor_format_struct sensor_formats[] = {
},
#endif
#ifdef GC2083_1920X1080_15FPS
#ifdef GC2083_1920X1088_15FPS
{
.mbus_code = MEDIA_BUS_FMT_SRGGB10_1X10, /*.mbus_code = MEDIA_BUS_FMT_SBGGR10_1X10, */
.width = 1920,
.height = 1080,
.height = 1088,
.hoffset = 0,
.voffset = 0,
.hts = 3140,
.vts = 1419,
.vts = 1350,
.pclk = 63600000,
.mipi_bps = 318 * 1000 * 1000,
.fps_fixed = 15,
.bin_factor = 1,
.intg_min = 1 << 4,
.intg_max = (1419 - 16) << 4,
.intg_max = (1350 - 16) << 4,
.gain_min = 1 << 4,
.gain_max = 110 << 4,
.offs_h = 0,
@@ -882,7 +883,7 @@ static struct sensor_format_struct switch_sensor_formats[] = {
{
.mbus_code = MEDIA_BUS_FMT_SRGGB10_1X10,
.width = 1920,
.height = 1080,
.height = 1088,
.hoffset = 0,
.voffset = 0,
.hts = 2932,

3
lichee/rtos-hal/hal/source/vin/modules/sensor/sensor_register.c
View File

@@ -62,6 +62,9 @@ struct sensor_cfg_array sensor_array[] = {
{"ov02b10_mipi", &ov02b10_core},
{"ov02b1b_mipi", &ov02b10_core},
#endif
#ifdef CONFIG_SENSOR_GC2083_MIPI
{"gc2083_mipi", &gc2083_core},
#endif
};
struct sensor_fuc_core *find_sensor_func(char *sensor_name)

33
lichee/rtos-hal/hal/source/vin/platform/vin_config_sun8iw21p1.c
View File

@@ -89,13 +89,13 @@ struct vin_mipi_gpio_info vin_mipi_gpio[VIN_MAX_MIPI] = {
struct sensor_list global_sensors_list[2][MAX_DETECT_SENSOR] = {
[0]= {
[0] = {
.sensor_name = "gc2053_mipi",
.sensor_name = "gc2083_mipi",
.sensor_twi_addr = 0x6e,
.sensor_twi_id = 1,
.mclk_id = 0,
.use_isp = 1,
.id = 0,
.addr_width = 8,
.addr_width = 16,
.data_width = 8,
.reset_gpio = GPIOA(11),
.pwdn_gpio = GPIOA(9),
@@ -121,13 +121,13 @@ struct sensor_list global_sensors_list[2][MAX_DETECT_SENSOR] = {
},
[1]= {
[0] = {
.sensor_name = "gc2053_mipi",
.sensor_name = "gc2083_mipi",
.sensor_twi_addr = 0x6e,
.sensor_twi_id = 0,
.mclk_id = 1,
.use_isp = 1,
.id = 0,
.addr_width = 8,
.addr_width = 16,
.data_width = 8,
.reset_gpio = GPIOE(8),
.pwdn_gpio = GPIOE(9),
@@ -211,9 +211,24 @@ struct sensor_list global_sensors[VIN_MAX_CSI] = {
.ir_cut_gpio[0] = GPIOD(18), /*-cut*/
.ir_cut_gpio[1] = GPIOD(8), /*+cut*/
.ir_led_gpio = 0xffff, //GPIOE(10)
#elif defined(CONFIG_SENSOR_GC2083_MIPI)
.used = 1,
.sensor_name = "gc2083_mipi",
.sensor_twi_addr = 0x6e,
.sensor_twi_id = 1,
.mclk_id = 0,
.use_isp = 1,
.id = 0,
.addr_width = 16,
.data_width = 8,
.reset_gpio = GPIOA(11),
.pwdn_gpio = GPIOA(9),
.ir_cut_gpio[0] = GPIOD(18), /*-cut*/
.ir_cut_gpio[1] = GPIOD(8), /*+cut*/
.ir_led_gpio = 0xffff, //GPIOE(10)
#else //CONFIG_SENSOR_GC2053_MIPI
.used = 1,
.sensor_name = "gc2053_mipi",
.sensor_name = "gc2083_mipi",
.sensor_twi_addr = 0x6e,
.sensor_twi_id = 1,
.mclk_id = 0,
@@ -450,7 +465,7 @@ struct sensor_list global_sensors[VIN_MAX_CSI] = {
.ir_led_gpio = GPIOF(3),
#else
.used = 1,
.sensor_name = "gc2053_mipi",
.sensor_name = "gc2083_mipi",
.sensor_twi_addr = 0x6e,
.sensor_twi_id = 1,
.mclk_id = 0,
@@ -458,8 +473,8 @@ struct sensor_list global_sensors[VIN_MAX_CSI] = {
.id = 0,
.addr_width = 8,
.data_width = 8,
.reset_gpio = GPIOE(6),
.pwdn_gpio = GPIOE(7),
.reset_gpio = GPIOA(11),
.pwdn_gpio = GPIOA(9),
.ir_cut_gpio[0] = 0xffff,/*-cut*/
.ir_cut_gpio[1] = 0xffff,/*+cut*/
.ir_led_gpio = 0xffff,
@@ -499,7 +514,7 @@ struct sensor_list global_sensors[VIN_MAX_CSI] = {
.ir_led_gpio = 0xffff,
#else
.used = 1,
.sensor_name = "gc2053_mipi",
.sensor_name = "gc2083_mipi",
.sensor_twi_addr = 0x6e,
.sensor_twi_id = 0,
.mclk_id = 1,

8601
lichee/rtos-hal/hal/source/vin/vin_isp/isp_server/isp_cfg/SENSOR_H/gc2083_mipi_2_isp600_20230913_015805_gj_ir.h Executable file
View File

File diff suppressed because it is too large Load Diff

8601
lichee/rtos-hal/hal/source/vin/vin_isp/isp_server/isp_cfg/SENSOR_H/gc2083_mipi_2_isp600_20231212_103735_gj_rgb.h Executable file
View File

File diff suppressed because it is too large Load Diff

8600
lichee/rtos-hal/hal/source/vin/vin_isp/isp_server/isp_cfg/SENSOR_H/ov02a10_mipi_isp600_20240619_ir.h Executable file
View File

File diff suppressed because it is too large Load Diff

21
lichee/rtos-hal/hal/source/vin/vin_isp/isp_server/isp_cfg/isp_ini_parse.c
View File

@@ -37,7 +37,7 @@
#if (ISP_VERSION >= 600)
#if defined CONFIG_SENSOR_GC2053_MIPI || defined CONFIG_SENSOR_GC4663_MIPI || defined CONFIG_SENSOR_SC5336_MIPI || \
defined CONFIG_SENSOR_GC1084_MIPI || CONFIG_SENSOR_BF2257CS_MIPI || CONFIG_SENSOR_SC2355_MIPI || CONFIG_SENSOR_F37P_MIPI || \
defined CONFIG_SENSOR_F355P_MIPI || CONFIG_SENSOR_OV02B10_MIPI
defined CONFIG_SENSOR_F355P_MIPI || CONFIG_SENSOR_OV02B10_MIPI || CONFIG_SENSOR_GC2083_MIPI
#ifdef CONFIG_SENSOR_GC4663_MIPI
#include "SENSOR_H/gc4663_mipi_default_ini_v853.h"
#include "SENSOR_H/gc4663_120fps_mipi_default_ini_v853.h"
@@ -105,9 +105,15 @@
//#include "SENSOR_H/ov02b10_mipi_isp600_20240423_135454_rgb.h"
//#include "SENSOR_H/ov02b10_mipi_isp600_20240423_133842_ir.h"
#include "SENSOR_H/ov02b1b_mipi_isp600_20240613_color.h"
#include "SENSOR_H/ov02b10_mipi_isp600_20240613_ir.h"
// #include "SENSOR_H/ov02b10_mipi_isp600_20240613_ir.h"
#include "SENSOR_H/ov02a10_mipi_isp600_20240619_ir.h"
#endif // CONFIG_SENSOR_OV02B10_MIPI
#ifdef CONFIG_SENSOR_GC2083_MIPI
#include "SENSOR_H/gc2083_mipi_2_isp600_20231212_103735_gj_rgb.h"
#include "SENSOR_H/gc2083_mipi_2_isp600_20230913_015805_gj_ir.h"
#endif
#else
#include "SENSOR_H/gc2053_mipi_default_ini_v853.h"
#endif
@@ -122,7 +128,7 @@ struct isp_cfg_array cfg_arr[] = {
#if (ISP_VERSION >= 600)
#if defined CONFIG_SENSOR_GC2053_MIPI || defined CONFIG_SENSOR_GC4663_MIPI || defined CONFIG_SENSOR_SC5336_MIPI || \
defined CONFIG_SENSOR_GC1084_MIPI || CONFIG_SENSOR_BF2257CS_MIPI || CONFIG_SENSOR_SC2355_MIPI || CONFIG_SENSOR_F37P_MIPI || \
defined CONFIG_SENSOR_F355P_MIPI || CONFIG_SENSOR_OV02B10_MIPI
defined CONFIG_SENSOR_F355P_MIPI || CONFIG_SENSOR_OV02B10_MIPI || CONFIG_SENSOR_GC2083_MIPI
#ifdef CONFIG_SENSOR_GC2053_MIPI
{"gc2053_mipi", "gc2053_mipi_isp600_20231212_111630_day", 1920, 1088, 20, 0, 0, &gc2053_mipi_v853_isp_cfg},
@@ -180,10 +186,15 @@ struct isp_cfg_array cfg_arr[] = {
//{"ov02b10_mipi", "ov02b10_mipi_isp600_20240423_133842_ir", 1600, 1200, 30, 1, 0, &ov02b10_mipi_isp_ir_cfg},
{"ov02b1b_mipi", "ov02b1b_mipi_isp600_20240613_color", 1600, 1200, 30, 0, 0, &ov02b1b_mipi_isp_cfg},
{"ov02b1b_mipi", "ov02b1b_mipi_isp600_20240613_color", 1600, 1200, 30, 1, 0, &ov02b1b_mipi_isp_cfg},
{"ov02b10_mipi", "ov02b10_mipi_isp600_20240613_ir", 1600, 1200, 30, 0, 0, &ov02b10_mipi_isp_cfg},
{"ov02b10_mipi", "ov02b10_mipi_isp600_20240613_ir", 1600, 1200, 30, 1, 0, &ov02b10_mipi_isp_cfg},
{"ov02b10_mipi", "ov02a10_mipi_isp600_20240619_ir", 1600, 1200, 30, 0, 0, &ov02a10_mipi_isp_cfg},
{"ov02b10_mipi", "ov02a10_mipi_isp600_20240619_ir", 1600, 1200, 30, 1, 0, &ov02a10_mipi_isp_cfg},
#endif // CONFIG_SENSOR_OV02B10_MIPI
#ifdef CONFIG_SENSOR_GC2083_MIPI
{"gc2083_mipi", "gc2083_mipi_2_isp600_20231212_103735_gj_rgb", 1920, 1088, 15, 0, 0, &gc2083_mipi_rgb_isp_cfg},
{"gc2083_mipi", "gc2083_mipi_2_isp600_20230913_015805_gj_ir", 1920, 1088, 15, 0, 1, &gc2083_mipi_ir_isp_cfg},
#endif
#ifdef CONFIG_SENSOR_GC1084_MIPI
{"gc1084_mipi", "gc1084_mipi_v853_20230410_164555_day", 1280, 720, 15, 0, 0, &gc1084_mipi_v853_isp_cfg},
#ifdef CONFIG_ENABLE_AIISP