From: p15692025051 <846603105@qq.com> Date: Thu, 13 Jul 2023 02:59:02 +0000 (+0800) Subject: 1.gc032a摄像头调整 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=11ad10950c52195cca2ee823326bb41fb58fc7ab;p=mirrors%2FASR3603_Z5.git 1.gc032a摄像头调整 2.音频调整 3.tp选择调整 --- diff --git a/2.sdk/project/Z5_K6/make_option.mk b/2.sdk/project/Z5_K6/make_option.mk index b3bd810c..0995065d 100644 --- a/2.sdk/project/Z5_K6/make_option.mk +++ b/2.sdk/project/Z5_K6/make_option.mk @@ -1,7 +1,7 @@ # # PS_MODE = { LTEONLY, LTEGSM, LWG } # c use LTEGSM; s use LWG # -PS_MODE := LWG +PS_MODE := LTEGSM # diff --git a/2.sdk/sdk/gui/lv_drivers/indev/bl6xx3_fw_update.h b/2.sdk/sdk/gui/lv_drivers/indev/bl6xx3_fw_update.h index 64a31128..568bf815 100644 --- a/2.sdk/sdk/gui/lv_drivers/indev/bl6xx3_fw_update.h +++ b/2.sdk/sdk/gui/lv_drivers/indev/bl6xx3_fw_update.h @@ -4,25 +4,25 @@ //gc9307 240*284 = 1 //st7789v2 240*320 = 2 //st7789v2 240*320 JL = 3 - +#include "lv_conf.h" #ifdef DRV_PROJECT_Z5_K6 -#define H81_TP 1 +#define H81_TP 2 #elif DRV_PROJECT_Z5_K7 #define H81_TP 4 #else -#define H81_TP 1 +#define H81_TP 2 #endif //#define H81_TP 4 #if 1 //#include "bl6xx3_fw_a90_mw_gvs_update.h" //#include "bl6xx3_fw_h90_y05_update.h" -#if H81_TP == 1//gc9307 240*284 -#include "bl6xx3_fw_h81_update.h" -#elif H81_TP == 2//st7789v2 240*320 +// #if H81_TP == 1//gc9307 240*284 +// #include "bl6xx3_fw_h81_update.h" +#if H81_TP == 2//K6 st7789v2 240*320 #include "bl6xx3_fw_h81_st_update.h" -#elif H81_TP == 3 -#include "bl6xx3_fw_h81_st_JL_update.h" +// #elif H81_TP == 3 +// #include "bl6xx3_fw_h81_st_JL_update.h" #elif H81_TP == 4 //st7789v3 240*284 #include "bl6xx3_fw_h81_st_K7_update.h" #endif diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/camera/camera.c b/2.sdk/sdk/gui/lv_watch/lv_apps/camera/camera.c index 58440de5..dd18df9e 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/camera/camera.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/camera/camera.c @@ -115,7 +115,7 @@ lv_obj_t * camera_create(lv_obj_t * activity_obj) cam_params.sensor_id = 0; Hal_Camera_Start_Preview(&cam_params); - preview_task = lv_task_create(camera_preview_task, 500, LV_TASK_PRIO_HIGH, NULL); + preview_task = lv_task_create(camera_preview_task, 150, LV_TASK_PRIO_HIGH, NULL); return obj; } diff --git a/2.sdk/sdk/product/craneg_modem/framework/hal/device/camera/cam_sensor_spi_gc032a.c b/2.sdk/sdk/product/craneg_modem/framework/hal/device/camera/cam_sensor_spi_gc032a.c index 258082ae..52f37846 100644 --- a/2.sdk/sdk/product/craneg_modem/framework/hal/device/camera/cam_sensor_spi_gc032a.c +++ b/2.sdk/sdk/product/craneg_modem/framework/hal/device/camera/cam_sensor_spi_gc032a.c @@ -25,7 +25,7 @@ static const struct regval_tab GC032a_init_raw8_spi2lan_crc_sdr[] = { {0x0e, 0xe8}, {0x0f, 0x02}, {0x10, 0x88}, - {0x17, 0x54}, + {0x17, 0x55}, {0x19, 0x04}, {0x1a, 0x0a}, {0x1f, 0x40}, @@ -145,7 +145,7 @@ static const struct regval_tab GC032a_init_raw8_spi2lan_nocrc_ddr[] = { {0x0e, 0xe8}, {0x0f, 0x02}, {0x10, 0x88}, - {0x17, 0x54}, + {0x17, 0x55}, {0x19, 0x04}, {0x1a, 0x0a}, {0x1f, 0x40}, @@ -241,7 +241,7 @@ static const struct regval_tab gc032a_init_yuv422_spi2lan_nocrc_sdr[] = { {0x0e, 0xe8}, {0x0f, 0x02}, {0x10, 0x88}, - {0x17, 0x54}, + {0x17, 0x55}, {0x19, 0x04}, {0x1a, 0x0a}, {0x1f, 0x40}, @@ -534,7 +534,7 @@ static const struct regval_tab gc032a_init_yuv422_640x480_spi2lan_nocrc_ddr[] = {0x0e, 0xe8}, {0x0f, 0x02}, {0x10, 0x88}, - {0x17, 0x54}, + {0x17, 0x55}, {0x19, 0x04}, {0x1a, 0x0a}, {0x1f, 0x40}, @@ -1034,7 +1034,7 @@ static const struct regval_tab CraneM_GC032a_init_raw8_spi2lan_crc_sdr[] = { {0x0e, 0xe8}, {0x0f, 0x02}, {0x10, 0x88}, - {0x17, 0x54}, + {0x17, 0x55}, {0x19, 0x04}, {0x1a, 0x0a}, {0x1f, 0x40}, diff --git a/2.sdk/sdk/product/craneg_modem/framework/scripts/boards/crane_evb/crane_evb_z2_bld_rel.conf b/2.sdk/sdk/product/craneg_modem/framework/scripts/boards/crane_evb/crane_evb_z2_bld_rel.conf index 2e7cd149..469cf465 100644 --- a/2.sdk/sdk/product/craneg_modem/framework/scripts/boards/crane_evb/crane_evb_z2_bld_rel.conf +++ b/2.sdk/sdk/product/craneg_modem/framework/scripts/boards/crane_evb/crane_evb_z2_bld_rel.conf @@ -13,10 +13,10 @@ CONFIG_WATCH_UI=y CONFIG_BUILD_CAMERA_TARGET=y CONFIG_BUILD_GC030A=n CONFIG_GC030A_AS_BACK_CAMERA=n -CONFIG_BUILD_GC032A=y +CONFIG_BUILD_GC032A=n CONFIG_GC032A_AS_BACK_CAMERA=n CONFIG_BUILD_GC2145=n -CONFIG_BUILD_BF30A2=n +CONFIG_BUILD_BF30A2=y CONFIG_ENABLE_CAM_FULLSIZE_STREAM=n CONFIG_ENABLE_CAM_ONLINE_JPEG=n diff --git a/2.sdk/sdk/releasepack/config/template/CRANE_EVB.json b/2.sdk/sdk/releasepack/config/template/CRANE_EVB.json index b9064cae..31846dd1 100644 --- a/2.sdk/sdk/releasepack/config/template/CRANE_EVB.json +++ b/2.sdk/sdk/releasepack/config/template/CRANE_EVB.json @@ -301,6 +301,10 @@ { "id": "CDF", "image": "TTPCom_NRAM2_CUSTOMIZATION_DATA_2.gki" + }, + { + "id": "CDF", + "image": "audio_gain.nvm" } ] }, @@ -346,6 +350,10 @@ { "id": "CDF", "image": "TTPCom_NRAM2_CUSTOMIZATION_DATA_2.gki" + }, + { + "id": "CDF", + "image": "audio_gain.nvm" } ] }, @@ -391,6 +399,10 @@ { "id": "CDF", "image": "TTPCom_NRAM2_CUSTOMIZATION_DATA_2.gki" + }, + { + "id": "CDF", + "image": "audio_gain.nvm" } ] }, @@ -440,6 +452,10 @@ { "id": "CDF", "image": "Dcxo_TempCompensation_Customer.nvm" + }, + { + "id": "CDF", + "image": "audio_gain.nvm" } ] }, @@ -489,6 +505,10 @@ { "id": "CDF", "image": "Dcxo_TempCompensation_Customer.nvm" + }, + { + "id": "CDF", + "image": "audio_gain.nvm" } ] }, @@ -538,6 +558,10 @@ { "id": "CDF", "image": "Dcxo_TempCompensation_Customer.nvm" + }, + { + "id": "CDF", + "image": "audio_gain.nvm" } ] }, diff --git a/2.sdk/sdk/releasepack/reliabledata/crane_a0_evb/audio_gain.nvm b/2.sdk/sdk/releasepack/reliabledata/crane_a0_evb/audio_gain.nvm new file mode 100644 index 00000000..59dbb3d8 Binary files /dev/null and b/2.sdk/sdk/releasepack/reliabledata/crane_a0_evb/audio_gain.nvm differ diff --git a/2.sdk/sdk/releasepack/reliabledata/crane_a0_evb_debug/audio_gain.nvm b/2.sdk/sdk/releasepack/reliabledata/crane_a0_evb_debug/audio_gain.nvm new file mode 100644 index 00000000..59dbb3d8 Binary files /dev/null and b/2.sdk/sdk/releasepack/reliabledata/crane_a0_evb_debug/audio_gain.nvm differ diff --git a/2.sdk/sdk/releasepack/reliabledata/crane_a0_evb_dump/audio_gain.nvm b/2.sdk/sdk/releasepack/reliabledata/crane_a0_evb_dump/audio_gain.nvm new file mode 100644 index 00000000..59dbb3d8 Binary files /dev/null and b/2.sdk/sdk/releasepack/reliabledata/crane_a0_evb_dump/audio_gain.nvm differ diff --git a/2.sdk/sdk/releasepack/reliabledata/craneg_a0_evb/audio_gain.nvm b/2.sdk/sdk/releasepack/reliabledata/craneg_a0_evb/audio_gain.nvm new file mode 100644 index 00000000..59dbb3d8 Binary files /dev/null and b/2.sdk/sdk/releasepack/reliabledata/craneg_a0_evb/audio_gain.nvm differ diff --git a/2.sdk/sdk/releasepack/reliabledata/craneg_a0_evb_debug/audio_gain.nvm b/2.sdk/sdk/releasepack/reliabledata/craneg_a0_evb_debug/audio_gain.nvm new file mode 100644 index 00000000..59dbb3d8 Binary files /dev/null and b/2.sdk/sdk/releasepack/reliabledata/craneg_a0_evb_debug/audio_gain.nvm differ diff --git a/2.sdk/sdk/releasepack/reliabledata/craneg_a0_evb_dump/audio_gain.nvm b/2.sdk/sdk/releasepack/reliabledata/craneg_a0_evb_dump/audio_gain.nvm new file mode 100644 index 00000000..59dbb3d8 Binary files /dev/null and b/2.sdk/sdk/releasepack/reliabledata/craneg_a0_evb_dump/audio_gain.nvm differ diff --git a/2.sdk/sdk/releasepack/reliabledata/default/board_h81/audio_gain.nvm b/2.sdk/sdk/releasepack/reliabledata/default/board_h81/audio_gain.nvm new file mode 100644 index 00000000..59dbb3d8 Binary files /dev/null and b/2.sdk/sdk/releasepack/reliabledata/default/board_h81/audio_gain.nvm differ