diff --git a/application.bin b/application.bin new file mode 100644 index 000000000..e10ffbe4a Binary files /dev/null and b/application.bin differ diff --git a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto.h b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto.h index a5a19a88d..58f900b36 100755 --- a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto.h +++ b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto.h @@ -43,14 +43,15 @@ #if PHOTO_PREVIEW_SLICE_ENC_FUNC #define UIAPP_PHOTO_SIZE_40M 0 -#define UIAPP_PHOTO_SIZE_12M 1 -#define UIAPP_PHOTO_SIZE_10M 2 -#define UIAPP_PHOTO_SIZE_8M 3 -#define UIAPP_PHOTO_SIZE_5M 4 -#define UIAPP_PHOTO_SIZE_3M 5 -#define UIAPP_PHOTO_SIZE_VGA 6 -#define UIAPP_PHOTO_SIZE_1_3M 7 -#define UIAPP_PHOTO_SIZE_2M 8 +#define UIAPP_PHOTO_SIZE_16M 1 +#define UIAPP_PHOTO_SIZE_12M 2 +#define UIAPP_PHOTO_SIZE_10M 3 +#define UIAPP_PHOTO_SIZE_8M 4 +#define UIAPP_PHOTO_SIZE_5M 5 +#define UIAPP_PHOTO_SIZE_3M 6 +#define UIAPP_PHOTO_SIZE_VGA 7 +#define UIAPP_PHOTO_SIZE_1_3M 8 +#define UIAPP_PHOTO_SIZE_2M 9 #else #define UIAPP_PHOTO_SIZE_12M 0 @@ -65,7 +66,6 @@ #endif - #if (SENSOR_CAPS_COUNT >= 2) #define PHOTO_MAX_CAP_SIZE UIAPP_PHOTO_SIZE_10M #else diff --git a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Param.c b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Param.c index fc8ba17ff..016bd3dc3 100755 --- a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Param.c +++ b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Param.c @@ -11,7 +11,7 @@ #if (SENSOR_CAPS_COUNT == 1) static UIAPP_PHOTO_SENSOR_INFO g_UIAppPhotoSensorInfo[UIAPP_PHOTO_SENSOR_ID_MAX] = { //sensor ID, IPL fps, IPL size , IPL ratio, flip type, IME 3DNR , video format[ime_out], video compress, crop enable[ime_out] - {UIAPP_PHOTO_SENSOR_ID_1, 30, {2592, 1944}, {16, 9}, FLIP_NONE, FALSE, {PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_Y, PHOTO_FMT_422}, FALSE, {FALSE,FALSE,FALSE,FALSE,FALSE}}, + {UIAPP_PHOTO_SENSOR_ID_1, 30, {2560, 1920/*2592, 1944*/}, {4, 3}, FLIP_NONE, FALSE, {PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_Y, PHOTO_FMT_422}, FALSE, {FALSE,FALSE,FALSE,FALSE,FALSE}}, }; static PHOTO_DISP_INFO g_UIAppPhotoDispConfig[UIAPP_PHOTO_DISP_ID_MAX] = { diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h index 72e0f1d5e..71adf2f6f 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h @@ -5,7 +5,7 @@ // Photo #define DEFAULT_PHOTO_CAPTURE SELFTIMER_OFF -#define DEFAULT_PHOTO_SIZE UIAPP_PHOTO_SIZE_5M//PHOTO_MAX_CAP_SIZE +#define DEFAULT_PHOTO_SIZE PHOTO_SIZE_5M//PHOTO_MAX_CAP_SIZE #define DEFAULT_PHOTO_QUALITY QUALITY_FINE #define DEFAULT_PHOTO_COLOR COLOR_EFFECT_STANDARD #define DEFAULT_SCENE SCENE_AUTO diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h index cb03287a3..b4224d473 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h @@ -662,7 +662,7 @@ enum _PHOTO_SIZE { #if PHOTO_PREVIEW_SLICE_ENC_FUNC PHOTO_SIZE_40M, #endif - + PHOTO_SIZE_16M, PHOTO_SIZE_12M, PHOTO_SIZE_10M, PHOTO_SIZE_8M, diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c index 4e69c4f12..9069f45c8 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c @@ -117,9 +117,9 @@ static MOVIE_SIZE_ITEM g_MovieSizeTable[] = { }, [MOVIE_SIZE_2560x1440P30] = { - {2560, 1440, 30, 1750 * 1024, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9}, + {2560, 1440, 30, 800 * 1024, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9}, {1, 3, 36, 8, -8, 0}, - {1, 4, 30, 1750 * 1024, 15, 26, 15, 45, 26, 15, 45, 0, 1, 8, 4}, + {1, 4, 30, 800 * 1024, 15, 26, 15, 45, 26, 15, 45, 0, 1, 8, 4}, }, [MOVIE_SIZE_2304x1296P30] = { diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIPhotoMapping.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIPhotoMapping.c index 0b2727eeb..587c63934 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIPhotoMapping.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIPhotoMapping.c @@ -30,13 +30,14 @@ static PHOTO_SIZE_PARAM g_PhotoCapSizeTable[PHOTO_SIZE_ID_MAX + 2] = { #if PHOTO_PREVIEW_SLICE_ENC_FUNC || POWERON_FAST_SLICE_ENC {7552, 4248, IMAGERATIO_4_3, "40M"}, /* 40M */ #endif + {4608, 3456, IMAGERATIO_4_3, "16M"}, //16M {4032, 3024, IMAGERATIO_4_3, "12M"}, //12M {3648, 2736, IMAGERATIO_4_3, "10M"}, //10M {3264, 2448, IMAGERATIO_4_3, "8M"}, // 8M #if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_) {2960, 1666, IMAGERATIO_16_9, "5M"}, // 5M #elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) - {2592, 1944, IMAGERATIO_16_9, "5M"}, // 5M + {2592, 1944, IMAGERATIO_4_3, "5M"}, // 5M #endif {2048, 1536, IMAGERATIO_4_3, "3M"}, // 3M {640, 480, IMAGERATIO_4_3, "VGA"}, // VGA diff --git a/code/hdal/vendor/output/libvendor_ai2_pub.a b/code/hdal/vendor/output/libvendor_ai2_pub.a index da9200d0a..8c3e631ff 100644 Binary files a/code/hdal/vendor/output/libvendor_ai2_pub.a and b/code/hdal/vendor/output/libvendor_ai2_pub.a differ diff --git a/code/hdal/vendor/output/libvendor_ai2_pub2.a b/code/hdal/vendor/output/libvendor_ai2_pub2.a index f550a2981..421052a71 100644 Binary files a/code/hdal/vendor/output/libvendor_ai2_pub2.a and b/code/hdal/vendor/output/libvendor_ai2_pub2.a differ diff --git a/code/lib/source/sifar/code/source/mcu/sf_mcu_client.c b/code/lib/source/sifar/code/source/mcu/sf_mcu_client.c index 789c0f24d..21e4542e9 100755 --- a/code/lib/source/sifar/code/source/mcu/sf_mcu_client.c +++ b/code/lib/source/sifar/code/source/mcu/sf_mcu_client.c @@ -437,7 +437,7 @@ UINT8 sf_mcu_power_on_para_get(MCUParam_t attrId) return startMode; } - mcuReg[i] = MCU_SUB_VER; + mcuReg[i++] = MCU_SUB_VER; mcuReg[i++] = MCU_VER_L; mcuReg[i++] = MCU_VER_H; mcuReg[i++] = MCU_PRODUCT_INFO; @@ -446,7 +446,7 @@ UINT8 sf_mcu_power_on_para_get(MCUParam_t attrId) mcuReg[i++] = LUMINANCE_H; sf_mcu_read_multi(mcuReg, mcuData, i); i = 0; - McuSubVersion = mcuData[i]; + McuSubVersion = mcuData[i++]; McuVersion = mcuData[i++]; McuVersion = (UINT16)mcuData[i++] << 8 | McuVersion; diff --git a/rtos-main.bin b/rtos-main.bin new file mode 100755 index 000000000..b132b0a52 Binary files /dev/null and b/rtos-main.bin differ diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto.h b/rtos/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto.h index dee3fc4d3..1c29cbf32 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto.h +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto.h @@ -43,14 +43,15 @@ #if PHOTO_PREVIEW_SLICE_ENC_FUNC || POWERON_FAST_SLICE_ENC #define UIAPP_PHOTO_SIZE_40M 0 -#define UIAPP_PHOTO_SIZE_12M 1 -#define UIAPP_PHOTO_SIZE_10M 2 -#define UIAPP_PHOTO_SIZE_8M 3 -#define UIAPP_PHOTO_SIZE_5M 4 -#define UIAPP_PHOTO_SIZE_3M 5 -#define UIAPP_PHOTO_SIZE_VGA 6 -#define UIAPP_PHOTO_SIZE_1_3M 7 -#define UIAPP_PHOTO_SIZE_2M 8 +#define UIAPP_PHOTO_SIZE_16M 1 +#define UIAPP_PHOTO_SIZE_12M 2 +#define UIAPP_PHOTO_SIZE_10M 3 +#define UIAPP_PHOTO_SIZE_8M 4 +#define UIAPP_PHOTO_SIZE_5M 5 +#define UIAPP_PHOTO_SIZE_3M 6 +#define UIAPP_PHOTO_SIZE_VGA 7 +#define UIAPP_PHOTO_SIZE_1_3M 8 +#define UIAPP_PHOTO_SIZE_2M 9 #else #define UIAPP_PHOTO_SIZE_12M 0 @@ -64,8 +65,6 @@ #endif - - #if (SENSOR_CAPS_COUNT >= 2) #define PHOTO_MAX_CAP_SIZE UIAPP_PHOTO_SIZE_10M #else diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Param.c b/rtos/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Param.c index a8065b998..0d9dd9dcb 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Param.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Param.c @@ -14,7 +14,7 @@ static UIAPP_PHOTO_SENSOR_INFO g_UIAppPhotoSensorInfo[UIAPP_PHOTO_SENSOR_ID_MAX] #if defined (_sen_gc5603_) {UIAPP_PHOTO_SENSOR_ID_1, 30, {2960, 1664}, {16, 9}, FLIP_NONE, FALSE, {PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_Y, PHOTO_FMT_422}, FALSE, {FALSE,FALSE,FALSE,FALSE,FALSE}}, #elif defined (_sen_os05b10_) - {UIAPP_PHOTO_SENSOR_ID_1, 30, {2592, 1944}, {16, 9}, FLIP_NONE, FALSE, {PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_Y, PHOTO_FMT_422}, FALSE, {FALSE,FALSE,FALSE,FALSE,FALSE}}, + {UIAPP_PHOTO_SENSOR_ID_1, 30, {2592, 1944}, {4, 3}, FLIP_NONE, FALSE, {PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_Y, PHOTO_FMT_422}, FALSE, {FALSE,FALSE,FALSE,FALSE,FALSE}}, #else {UIAPP_PHOTO_SENSOR_ID_1, 30, {2592, 1664}, {16, 9}, FLIP_NONE, FALSE, {PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_420, PHOTO_FMT_Y, PHOTO_FMT_422}, FALSE, {FALSE,FALSE,FALSE,FALSE,FALSE}}, #endif diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h index 5de2dc9ff..a7c98002b 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h @@ -5,7 +5,7 @@ // Photo #define DEFAULT_PHOTO_CAPTURE SELFTIMER_OFF -#define DEFAULT_PHOTO_SIZE UIAPP_PHOTO_SIZE_5M//PHOTO_MAX_CAP_SIZE +#define DEFAULT_PHOTO_SIZE PHOTO_SIZE_5M//PHOTO_MAX_CAP_SIZE #define DEFAULT_PHOTO_QUALITY QUALITY_FINE #define DEFAULT_PHOTO_COLOR COLOR_EFFECT_STANDARD #define DEFAULT_SCENE SCENE_AUTO @@ -118,7 +118,7 @@ #define DEFAULT_MOVIE_URGENT_PROTECT_MANUAL MOVIE_URGENT_PROTECT_MANUAL_OFF #define DEFAULT_MOVIE_DDD MOVIE_DDD_OFF #define DEFAULT_MOVIE_ADAS_CAL MOVIE_ADAS_CAL_OFF -#define DEFAULT_MOVIE_CODEC MOVIE_CODEC_H264 +#define DEFAULT_MOVIE_CODEC MOVIE_CODEC_H265 // Playback #define DEFAULT_PROTECT PROTECT_ONE #define DEFAULT_MOVIE_PLAY_VOLUME (MOVIE_AUDIO_VOL_SETTING_MAX-1) diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h index 8bfc6e295..9f20338b5 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h @@ -662,7 +662,7 @@ enum _PHOTO_SIZE { #if PHOTO_PREVIEW_SLICE_ENC_FUNC || POWERON_FAST_SLICE_ENC PHOTO_SIZE_40M, #endif - + PHOTO_SIZE_16M, PHOTO_SIZE_12M, PHOTO_SIZE_10M, PHOTO_SIZE_8M, diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c index 20b880f04..9f282796d 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c @@ -118,13 +118,13 @@ static MOVIE_SIZE_ITEM g_MovieSizeTable[] = { [MOVIE_SIZE_2560x1440P30] = { #if (defined(_NVT_ETHREARCAM_TX_)) - {2560, 1440, 30, 1750 * 1024, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9}, + {2560, 1440, 30, 800 * 1024, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9}, {1, 3, 36, 8, -8, 0}, - {1, 4, 30, 1750 * 1024, 30, 26, 10, 50, 26, 10, 50, -40, 1, 8, 4}, + {1, 4, 30, 800 * 1024, 30, 26, 10, 50, 26, 10, 50, -40, 1, 8, 4}, #else - {2560, 1440, 30, 1750 * 1024, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9}, + {2560, 1440, 30, 800 * 1024, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9}, {1, 3, 36, 8, -8, 0}, - {1, 4, 30, 1750 * 1024, 15, 26, 10, 40, 26, 10, 40, 0, 1, 8, 4}, + {1, 4, 30, 800 * 1024, 15, 26, 10, 40, 26, 10, 40, 0, 1, 8, 4}, #endif }, diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIPhotoMapping.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIPhotoMapping.c index 7d911c5c2..8879e445a 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIPhotoMapping.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIPhotoMapping.c @@ -30,6 +30,7 @@ static PHOTO_SIZE_PARAM g_PhotoCapSizeTable[PHOTO_SIZE_ID_MAX + 2] = { #if PHOTO_PREVIEW_SLICE_ENC_FUNC || POWERON_FAST_SLICE_ENC {7552, 4248, IMAGERATIO_4_3, "40M"}, /* 40M */ #endif + {4608, 3456, IMAGERATIO_4_3, "16M"}, //16M {4032, 3024, IMAGERATIO_4_3, "12M"}, //12M {3648, 2736, IMAGERATIO_4_3, "10M"}, //10M {3264, 2448, IMAGERATIO_4_3, "8M"}, // 8M @@ -37,7 +38,7 @@ static PHOTO_SIZE_PARAM g_PhotoCapSizeTable[PHOTO_SIZE_ID_MAX + 2] = { #if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_) {2960, 1666, IMAGERATIO_16_9, "5M"}, // 5M #elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) - {2592, 1944, IMAGERATIO_16_9, "5M"}, // 5M + {2592, 1944, IMAGERATIO_4_3, "5M"}, // 5M #endif {2048, 1536, IMAGERATIO_4_3, "3M"}, // 3M {640, 480, IMAGERATIO_4_3, "VGA"}, // VGA diff --git a/rtos/code/driver/na51089/source/mcu/sf_commu_mcu.c b/rtos/code/driver/na51089/source/mcu/sf_commu_mcu.c index aabcc389e..cae737943 100755 --- a/rtos/code/driver/na51089/source/mcu/sf_commu_mcu.c +++ b/rtos/code/driver/na51089/source/mcu/sf_commu_mcu.c @@ -856,7 +856,7 @@ int sf_commu_mcu_task_start(void) printf("%s:%d %d\r\n", __FUNCTION__, __LINE__,rt); } - sfCommuMcuThread = vos_task_create(sf_commu_mcu_task, NULL, "sf_mcu_task", 25, 2048); + sfCommuMcuThread = vos_task_create(sf_commu_mcu_task, NULL, "sf_commu_mcu_task", 10, 2048); if(!sfCommuMcuThread) { DBG_ERR("[ERROR] sf_commu_mcu_task thread creat failed!\r\n"); diff --git a/rtos/code/driver/na51089/source/mcu/sf_mcu_dev.c b/rtos/code/driver/na51089/source/mcu/sf_mcu_dev.c index c4c195083..27ab44646 100755 --- a/rtos/code/driver/na51089/source/mcu/sf_mcu_dev.c +++ b/rtos/code/driver/na51089/source/mcu/sf_mcu_dev.c @@ -385,16 +385,17 @@ UINT8 sf_mcu_power_on_para_get(MCUParam_t attrId) return startMode; } - mcuReg[i] = MCU_SUB_VER; + mcuReg[i++] = MCU_SUB_VER; mcuReg[i++] = MCU_VER_L; mcuReg[i++] = MCU_VER_H; mcuReg[i++] = MCU_PRODUCT_INFO; mcuReg[i++] = START_MODE; mcuReg[i++] = LUMINANCE_L; mcuReg[i++] = LUMINANCE_H; + sf_mcu_read_multi(mcuReg, mcuData, i); i = 0; - McuSubVersion = mcuData[i]; + McuSubVersion = mcuData[i++]; McuVersion = mcuData[i++]; McuVersion = (UINT16)mcuData[i++] << 8 | McuVersion;