payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast_emmc

Browse Source
This commit is contained in:
xiaojiazhu 2024-02-04 14:35:34 +08:00
commit 1e6efb93f2
42 changed files with 687 additions and 293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S10_SysInit2
View File

@ -17,6 +17,14 @@ function insmod_if_exist() {
fi fi
} }
#SF_BOOT_MODE=1
#SF_BOOT_MODE_POWF=
#SF_BOOT_MODE_UP=0
#kernel_cmdline=$(cat /proc/cmdline)
#SF_HUNTING_BOOT_MODE=`dmesg | grep -o 'Mode=[0-9]*' | cut -d'=' -f2`
HUNTING_BOOT_MODE_4G_ONLY=4G_ONLY HUNTING_BOOT_MODE_4G_ONLY=4G_ONLY
# System Driver Init # System Driver Init
@ -203,8 +211,8 @@ ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_videoout/fbdev/nvt_fb.ko
if [ -f /usr/bin/isp_demon ]; then if [ -f /usr/bin/isp_demon ]; then
/usr/bin/isp_demon /usr/bin/isp_demon
else #else
echo "isp_demon not found" # echo "isp_demon not found"
fi fi
if [ -f /usr/bin/cardv ]; then if [ -f /usr/bin/cardv ]; then

21
BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S25_Net
View File

@ -8,19 +8,20 @@ kernel_cmdline=$(cat /proc/cmdline)
SF_HUNTING_BOOT_MODE=`dmesg | grep -o 'Mode=[0-9]*' | cut -d'=' -f2` SF_HUNTING_BOOT_MODE=`dmesg | grep -o 'Mode=[0-9]*' | cut -d'=' -f2`
echo SF_HUNTING_BOOT_MODE=${SF_HUNTING_BOOT_MODE} #echo SF_HUNTING_BOOT_MODE=${SF_HUNTING_BOOT_MODE}
do_wifi_init() do_wifi_init()
{ {
if [ "$NVT_SDIO_WIFI" == "NVT_SDIO_WIFI_RTK" ]; then #if [ "$NVT_SDIO_WIFI" == "NVT_SDIO_WIFI_RTK" ]; then
#/etc/init.d/BS_Net_wifiap8189ftv # #/etc/init.d/BS_Net_wifiap8189ftv
if [ "${SF_BOOT_MODE}" = "${SF_HUNTING_BOOT_MODE}" ]; then # if [ "${SF_BOOT_MODE}" = "${SF_HUNTING_BOOT_MODE}" ]; then
echo "Configuring BS_Net_wifiap8189ftv sf start" # echo "Configuring BS_Net_wifiap8189ftv sf start"
#/etc/init.d/BS_Net_wifiap8189ftv # #/etc/init.d/BS_Net_wifiap8189ftv
else # else
echo "Configuring BS_Net_wifiap8189ftv sf stop" # echo "Configuring BS_Net_wifiap8189ftv sf stop"
fi # fi
elif [ "$NVT_SDIO_WIFI" == "NVT_SDIO_WIFI_BRCM" ]; then #el
if [ "$NVT_SDIO_WIFI" == "NVT_SDIO_WIFI_BRCM" ]; then
modprobe bcmdhd modprobe bcmdhd
# TBD # TBD
fi fi

2
code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h
View File

@ -924,7 +924,7 @@
#define HUNTING_MCU_UART ENABLE #define HUNTING_MCU_UART ENABLE
#define HUNTING_IR_LED_940 ENABLE #define HUNTING_IR_LED_940 ENABLE
#define SF_EXIF_MN_BUF_SIZE 256 #define SF_EXIF_MN_BUF_SIZE 256
#define SF_BASE_VERSION "7MR5RCwE10D" #define SF_BASE_VERSION "7MR5RCwE10E"
#define HW_S530 DISABLE #define HW_S530 DISABLE
#define DCF_DIR_NAME "MEDIA" /* 100MEDIA */ #define DCF_DIR_NAME "MEDIA" /* 100MEDIA */
#define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */ #define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */

20
code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c
View File

@ -61,7 +61,7 @@ void sf_dev_flag_init(void)
T_CFLG cflg; T_CFLG cflg;
if ((ret |= vos_flag_create(&sf_dev_flag_id, &cflg, "sf_dev_flag_id")) != E_OK) if ((ret |= vos_flag_create(&sf_dev_flag_id, &cflg, "sf_dev_flag_id")) != E_OK)
{ {
SYS_SLOGE("sf_dev_flag_id fail\r\n"); MLOGI("sf_dev_flag_id fail\r\n");
} }
vos_flag_clr(sf_dev_flag_id, (FLGPTN)-1); vos_flag_clr(sf_dev_flag_id, (FLGPTN)-1);
} }
@ -84,7 +84,7 @@ int sf_dev_flag_wait_done_timeout(DEV_FLAG_INIT boot_init, int timeout_ms)
ret = vos_flag_wait_timeout(&flgptn, sf_dev_flag_id, (FLGPTN)(1 << boot_init), TWF_ANDW, vos_util_msec_to_tick(timeout_ms)); ret = vos_flag_wait_timeout(&flgptn, sf_dev_flag_id, (FLGPTN)(1 << boot_init), TWF_ANDW, vos_util_msec_to_tick(timeout_ms));
if(unlikely(ret != E_OK)){ if(unlikely(ret != E_OK)){
printf("wait(%lu) init timeout(%ld ms)!\n", boot_init, timeout_ms); printf("wait(%d) init sf_dev_flag_wait_done_timeout(%ld ms)!\n", boot_init, timeout_ms);
} }
return ret; return ret;
@ -153,7 +153,7 @@ void SF_StrgUnInit(void)
int SF_GetMMCDevHandle(MMC_DEV_TYPE dev_type) int SF_GetMMCDevHandle(MMC_DEV_TYPE dev_type)
{ {
if(sf_mmc_dev != NULL) { if(sf_mmc_dev[dev_type] != NULL) {
return sf_mmc_dev[dev_type]->dcf_handle; return sf_mmc_dev[dev_type]->dcf_handle;
} }
return 0; return 0;
@ -240,7 +240,7 @@ static int SF_StrgNodeCheck(const char *devName)
void SF_StrgRegister(SF_MESSAGE_BUF_S *pMessageBuf) void SF_StrgRegister(SF_MESSAGE_BUF_S *pMessageBuf)
{ {
MLOGD("[dev_id:%d, evt:%d]\n",pMessageBuf->arg2, pMessageBuf->arg1); MLOGD("[dev_id:%d, evt:%d]\n",pMessageBuf->arg2, pMessageBuf->arg1);
UIMenuStoreInfo *puiPara = sf_ui_para_get(); // UIMenuStoreInfo *puiPara = sf_ui_para_get();
if(pMessageBuf->arg2 == MMC_DEV_SD) if(pMessageBuf->arg2 == MMC_DEV_SD)
{ {
@ -286,11 +286,11 @@ void SF_StrgRegister(SF_MESSAGE_BUF_S *pMessageBuf)
} }
} }
for(int i = 0; i < MMC_DEV_MAX_NUM; i++) // for(int i = 0; i < MMC_DEV_MAX_NUM; i++)
{ // {
MLOGD("node:%d, mount:%d, loop:%d\n", // MLOGD("node:%d, mount:%d, loop:%d\n",
sf_mmc_dev[i]->node, sf_mmc_dev[i]->moumted_state, puiPara->SdLoopSwitch); // sf_mmc_dev[i]->node, sf_mmc_dev[i]->moumted_state, puiPara->SdLoopSwitch);
} // }
} }
SF_ST_MMC_DEV *SF_StrgCheckWorkableDev(void) SF_ST_MMC_DEV *SF_StrgCheckWorkableDev(void)
@ -455,7 +455,7 @@ static void* mmc_monitoring_thread(void *arg)
int sf_mmc_dev_check_start(void) int sf_mmc_dev_check_start(void)
{ {
SF_StrgInit();// 初始化sf_mmc设备Obj //SF_StrgInit();// 初始化sf_mmc设备Obj
sf_dev_flag_init(); sf_dev_flag_init();
int ret = pthread_create(&MMCMonitorTskCfg.TskId, NULL, mmc_monitoring_thread, NULL); int ret = pthread_create(&MMCMonitorTskCfg.TskId, NULL, mmc_monitoring_thread, NULL);
if(ret != SF_SUCCESS) if(ret != SF_SUCCESS)

28
code/application/source/cardv/SrcCode/System/SysMain_Flow_Sleep.c
View File

@ -7,14 +7,14 @@
@brief Sleep Flow @brief Sleep Flow
@note @note
1.提供change sleep的介面 1.<EFBFBD><EFBFBD><EFBFBD><EFBFBD>change sleep<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
System_ChangeSleep() System_ChangeSleep()
(a)System_ChangeSleep()執行 (a)System_ChangeSleep()<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
各level不同的control condition <EFBFBD>Ulevel<EFBFBD><EFBFBD><EFBFBD>P<EFBFBD><EFBFBD>control condition
包含通知不同device sleep, wakeup <EFBFBD>]<EFBFBD>t<EFBFBD>q<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Pdevice sleep, wakeup
(b)System_ChangeSleep()執行 (b)System_ChangeSleep()<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
各level不同的control condition <EFBFBD>Ulevel<EFBFBD><EFBFBD><EFBFBD>P<EFBFBD><EFBFBD>control condition
包含通知不同mode sleep, wakeup: System_ModeSleepEnter(), System_ModeSleepLeave() <EFBFBD>]<EFBFBD>t<EFBFBD>q<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Pmode sleep, wakeup: System_ModeSleepEnter(), System_ModeSleepLeave()
@date 2012/1/1 @date 2012/1/1
*/ */
@ -29,7 +29,9 @@
#define __DBGLVL__ ((THIS_DBGLVL>=PRJ_DBG_LVL)?THIS_DBGLVL:PRJ_DBG_LVL) #define __DBGLVL__ ((THIS_DBGLVL>=PRJ_DBG_LVL)?THIS_DBGLVL:PRJ_DBG_LVL)
#define __DBGFLT__ "*" //*=All, [mark]=CustomClass #define __DBGFLT__ "*" //*=All, [mark]=CustomClass
#include <kwrap/debug.h> #include <kwrap/debug.h>
#if HUNTING_CAMERA_MCU == ENABLE
#include "sf_mcu.h"
#endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#if (LCD_ROTATE_FUNCTION == ENABLE) #if (LCD_ROTATE_FUNCTION == ENABLE)
@ -111,7 +113,12 @@ void System_ChangeSleep(UINT32 sleep_lv)
//enter DEEP level //enter DEEP level
DBG_MSG("enter level 3 - begin\r\n"); DBG_MSG("enter level 3 - begin\r\n");
#if (DISPLAY_FUNC == ENABLE) #if (DISPLAY_FUNC == ENABLE)
#if HUNTING_CAMERA_MCU == ENABLE
if(sf_get_mode_flag())
{
GxVideo_SetDeviceCtrl(DOUT1, DISPLAY_DEVCTRL_SLEEP, TRUE); GxVideo_SetDeviceCtrl(DOUT1, DISPLAY_DEVCTRL_SLEEP, TRUE);
}
#endif
#endif #endif
g_iSysSleepLevel = 3; g_iSysSleepLevel = 3;
DBG_MSG("enter level 3 - end\r\n"); DBG_MSG("enter level 3 - end\r\n");
@ -126,7 +133,12 @@ void System_ChangeSleep(UINT32 sleep_lv)
DBG_MSG("leave level 3 - begin\r\n"); DBG_MSG("leave level 3 - begin\r\n");
#if (DISPLAY_FUNC == ENABLE) #if (DISPLAY_FUNC == ENABLE)
#if HUNTING_CAMERA_MCU == ENABLE
if(sf_get_mode_flag())
{
GxVideo_SetDeviceCtrl(DOUT1, DISPLAY_DEVCTRL_SLEEP, FALSE); GxVideo_SetDeviceCtrl(DOUT1, DISPLAY_DEVCTRL_SLEEP, FALSE);
}
#endif
//GxVideo_SetDeviceCtrl(DOUT1, DISPLAY_DEVCTRL_BACKLIGHT, TRUE); //GxVideo_SetDeviceCtrl(DOUT1, DISPLAY_DEVCTRL_BACKLIGHT, TRUE);
#endif #endif
g_iSysSleepLevel = 2; g_iSysSleepLevel = 2;

2
code/application/source/cardv/SrcCode/System/SysStrg_CB.c
View File

@ -178,7 +178,7 @@ void Strg_CB(UINT32 event, UINT32 param1, UINT32 param2)
stMessageBuf.arg3 = param2; stMessageBuf.arg3 = param2;
stMessageBuf.cmdId = CMD_SD; stMessageBuf.cmdId = CMD_SD;
sf_com_message_send_to_app(&stMessageBuf); sf_com_message_send_to_app(&stMessageBuf);
printf("strg_cb send MOUNT! dev_id = %d\n", param1); // printf("strg_cb send MOUNT! dev_id = %d\n", param1);
#if USE_MMC_DEV_CHECK #if USE_MMC_DEV_CHECK
SF_StrgRegister(&stMessageBuf); SF_StrgRegister(&stMessageBuf);
#endif #endif

11
code/application/source/cardv/SrcCode/System/SysStrg_Exe.c
View File

@ -332,9 +332,9 @@ void sf_log_confgs(void)
{ {
#if (LOGFILE_FUNC==ENABLE) #if (LOGFILE_FUNC==ENABLE)
UIMenuStoreInfo *puiPara = sf_ui_para_get(); UIMenuStoreInfo *puiPara = sf_ui_para_get();
DBG_WRN("sf_log_confgs s\n");
if(((puiPara->DebugMode) || (puiPara->AutoLogSwitch)) && (!sf_is_usb_flag()) && (SxTimer_GetFuncActive(SX_TIMER_DET_SYSTEM_ERROR_ID) == 0)) if(((puiPara->DebugMode) || (puiPara->AutoLogSwitch)) && (!sf_is_usb_flag()) && (SxTimer_GetFuncActive(SX_TIMER_DET_SYSTEM_ERROR_ID) == 0))
{ {
DBG_WRN("sf_log_confgs s\n");
{ {
LOGFILE_OPEN logOpenParm = {0}; LOGFILE_OPEN logOpenParm = {0};
LOGFILE_CFG cfg = {0}; LOGFILE_CFG cfg = {0};
@ -637,6 +637,7 @@ static BOOL FileSys_DetBusy(void)
void Card_DetInsert(void) void Card_DetInsert(void)
{ {
// DBG_WRN("Card_DetInsert\r\n");
GxStrg_Det(0, 0); GxStrg_Det(0, 0);
#if 0 //FS_MULTI_STRG_FUNC #if 0 //FS_MULTI_STRG_FUNC
@ -1077,7 +1078,7 @@ INT32 System_OnStrgInsert(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
DCF_HANDLE handle = DCF_Open(&dcfParm); DCF_HANDLE handle = DCF_Open(&dcfParm);
DBG_WRN("DCF_Open(strg id = %lu, name = %s, handle = %lu, drive = %c)\n", strg_id, System_Get_Strg_Name(strg_id), handle, dcfParm.Drive); // DBG_DUMP("(strg id = %lu, name = %s, handle = %lu, drive = %c)\n", strg_id, System_Get_Strg_Name(strg_id), handle, dcfParm.Drive);
/***************************************************************** /*****************************************************************
* update strg mapping table * update strg mapping table
*****************************************************************/ *****************************************************************/
@ -1087,12 +1088,12 @@ INT32 System_OnStrgInsert(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
* init dcf act handle with sd card * init dcf act handle with sd card
*****************************************************************/ *****************************************************************/
if(strg_id == STRG_ID_SD){ if(strg_id == STRG_ID_SD){
DBG_WRN("sd act\n"); // DBG_WRN("sd act\n");
System_Set_Storage_Act_Drive(g_strg_mapping_table[strg_id].drive); System_Set_Storage_Act_Drive(g_strg_mapping_table[strg_id].drive);
//DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, SF_SD_DCF_FILE_NAME); //DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, SF_SD_DCF_FILE_NAME);
} }
else if(strg_id == STRG_ID_EMMC){ else if(strg_id == STRG_ID_EMMC){
DBG_WRN("emmc act\n"); // DBG_WRN("emmc act\n");
//DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, SF_EMMC_DCF_FILE_NAME); //DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, SF_EMMC_DCF_FILE_NAME);
System_Set_Storage_Act_Drive(g_strg_mapping_table[strg_id].drive); System_Set_Storage_Act_Drive(g_strg_mapping_table[strg_id].drive);
} }
@ -1116,7 +1117,7 @@ INT32 System_OnStrgInsert(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
************************************************/ ************************************************/
else if(strg_id == STRG_ID_EMMC){ else if(strg_id == STRG_ID_EMMC){
DCF_HANDLE handle = g_strg_mapping_table[strg_id].dcf_hdl; DCF_HANDLE handle = g_strg_mapping_table[strg_id].dcf_hdl;
DBG_WRN("DCF_ScanObjEx(strg id = %lu, name = %s, dcf handle = %d)\n", strg_id, System_Get_Strg_Name(strg_id), handle); // DBG_WRN("DCF_ScanObjEx(strg id = %lu, name = %s, dcf handle = %d)\n", strg_id, System_Get_Strg_Name(strg_id), handle);
DCF_ScanObjEx(handle); DCF_ScanObjEx(handle);
} }

59
code/application/source/cardv/SrcCode/System/SysUsb_Exe.c
View File

@ -32,6 +32,10 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
static char driver_path_prefix[64] = "/etc/lib/modules/4.19.91"; static char driver_path_prefix[64] = "/etc/lib/modules/4.19.91";
//GobiNet:rndis_host.ko,drv_gobi_net.ko
//ECM:usbnet.ko,rndis_host.ko,cdc_ether.ko
//ACM:
//QMI:qmi_wwan.ko,cdc-wdm.ko,rndis_host.ko,
static char* usb_host_drivers[] = { static char* usb_host_drivers[] = {
"kernel/drivers/usb/common/usb-common.ko", "kernel/drivers/usb/common/usb-common.ko",
"kernel/drivers/usb/core/usbcore.ko", "kernel/drivers/usb/core/usbcore.ko",
@ -126,6 +130,7 @@ static BOOL System_InsmodUsb(BOOL isHost)
char* driver_path = NULL; char* driver_path = NULL;
UINT8 cnt = 0; UINT8 cnt = 0;
char cmd[256] = {'\0'}; char cmd[256] = {'\0'};
vos_perf_list_mark(__func__, __LINE__, 0);
if(isHost){ if(isHost){
@ -136,6 +141,9 @@ static BOOL System_InsmodUsb(BOOL isHost)
is_usb_host_driver_inserted = TRUE; is_usb_host_driver_inserted = TRUE;
return TRUE; return TRUE;
} }
// #if HUNTING_CAMERA_MCU == ENABLE
// sf_usb_mux_s(1);
// #endif
usb_drivers = usb_host_drivers; usb_drivers = usb_host_drivers;
} }
else{ else{
@ -145,6 +153,9 @@ static BOOL System_InsmodUsb(BOOL isHost)
memset(driver_path_prefix, '\0', sizeof(driver_path_prefix)); memset(driver_path_prefix, '\0', sizeof(driver_path_prefix));
snprintf(driver_path_prefix, sizeof(driver_path_prefix), "/lib/modules/4.19.91"); snprintf(driver_path_prefix, sizeof(driver_path_prefix), "/lib/modules/4.19.91");
usb_drivers = usb_dev_drivers; usb_drivers = usb_dev_drivers;
#if HUNTING_CAMERA_MCU == ENABLE
sf_usb_mux_s(0);
#endif
} }
while(usb_drivers[cnt++]) while(usb_drivers[cnt++])
@ -161,25 +172,27 @@ static BOOL System_InsmodUsb(BOOL isHost)
memset(cmd, '\0', sizeof(cmd)); memset(cmd, '\0', sizeof(cmd));
snprintf(cmd, sizeof(cmd), "insmod %s/%s", driver_path_prefix, driver_path); snprintf(cmd, sizeof(cmd), "insmod %s/%s", driver_path_prefix, driver_path);
//DBG_DUMP("%s\n", cmd); //DBG_DUMP("%s\n", cmd);
printf("[%s:%d] %s\n", __FUNCTION__, __LINE__, cmd); // printf("[%s:%d] %s\n", __FUNCTION__, __LINE__, cmd);
system(cmd); system(cmd);
} }
} }
// system("mdev -s");
if(isHost == FALSE){ if(isHost == FALSE){
#if HUNTING_CAMERA_MCU == ENABLE // #if HUNTING_CAMERA_MCU == ENABLE
//sf_set_msdc_clk(); // //sf_set_msdc_clk();
sf_usb_mux_s(0); // sf_usb_mux_s(0);
vos_util_delay_ms(200); // vos_util_delay_ms(200);
#endif // #endif
vos_perf_list_mark(__func__, __LINE__, 0);
is_usb_dev_driver_inserted = TRUE; is_usb_dev_driver_inserted = TRUE;
return System_WaitUsbDev(); return System_WaitUsbDev();
} }
else{ else{
#if HUNTING_CAMERA_MCU == ENABLE // #if HUNTING_CAMERA_MCU == ENABLE
sf_usb_mux_s(1); // sf_usb_mux_s(1);
#endif // #endif
vos_perf_list_mark(__func__, __LINE__, 0);
is_usb_host_driver_inserted = TRUE; is_usb_host_driver_inserted = TRUE;
return TRUE; return TRUE;
@ -290,6 +303,9 @@ void System_OnUsbInit(void)
#endif #endif
} }
#if HUNTING_CAMERA_MCU == ENABLE
sf_usb_insmod_start();
#else
// force check USB connect type // force check USB connect type
if (GxUSB_GetIsUSBPlug()) { if (GxUSB_GetIsUSBPlug()) {
@ -304,6 +320,8 @@ void System_OnUsbInit(void)
else{ else{
// System_InsmodUsb(TRUE); /* insmod usb host ko */ // System_InsmodUsb(TRUE); /* insmod usb host ko */
} }
#endif
TM_BOOT_END("usb", "init"); TM_BOOT_END("usb", "init");
} }
@ -528,5 +546,26 @@ BOOL USB_GetIsMsdcNvt(void)
#endif #endif
//#NT#2016/06/03#Niven Cho -end //#NT#2016/06/03#Niven Cho -end
} }
#if HUNTING_CAMERA_MCU == ENABLE
void* sf_usb_insmod_thread(void *arg)
{
//force check USB connect type
if (GxUSB_GetIsUSBPlug()) {
#if (HW_S530 == ENABLE) && (HUNTING_CAMERA_MCU == ENABLE)
sf_sys_status_led_set(SF_LED_SYS_STATE_USB_IN);
#endif
System_InsmodUsb(FALSE); /* insmod usb dev ko */
GxUSB_UpdateConnectType();
GxUSB_SetChargerType(FALSE);
}
else{
System_InsmodUsb(TRUE); /* insmod usb host ko */
}
return NULL;
}
#endif
#endif #endif

12
code/application/source/cardv/SrcCode/System/app-main.c
View File

@ -27,16 +27,16 @@ static void insmod_system(void)
static void insmod_capture(void) static void insmod_capture(void)
{ {
vos_perf_list_mark(__func__, __LINE__, 0); // vos_perf_list_mark(__func__, __LINE__, 0);
vos_perf_list_mark(__func__, __LINE__, 1); // vos_perf_list_mark(__func__, __LINE__, 1);
} }
static void insmod_display(void) static void insmod_display(void)
{ {
vos_perf_list_mark(__func__, __LINE__, 0); // vos_perf_list_mark(__func__, __LINE__, 0);
vos_perf_list_mark(__func__, __LINE__, 1); // vos_perf_list_mark(__func__, __LINE__, 1);
} }
static void insmod_storage(void) static void insmod_storage(void)
@ -48,9 +48,9 @@ static void insmod_storage(void)
static void insmod_encoder(void) static void insmod_encoder(void)
{ {
vos_perf_list_mark(__func__, __LINE__, 0); // vos_perf_list_mark(__func__, __LINE__, 0);
vos_perf_list_mark(__func__, __LINE__, 1); // vos_perf_list_mark(__func__, __LINE__, 1);
} }
static void insmod_others(void) static void insmod_others(void)

74
code/application/source/cardv/SrcCode/System/main.c
View File

@ -339,7 +339,7 @@ UINT8 sf_cardv_check_power_on_mode(void)
UINT8 startup = 0; UINT8 startup = 0;
UINT8 UpFw = 0; UINT8 UpFw = 0;
UINT8 Upmcu = 0; UINT8 Upmcu = 0;
UINT8 sftmp = 0; unsigned long sftmp = 0;
system("cat /proc/cmdline > /tmp/Mode.txt"); system("cat /proc/cmdline > /tmp/Mode.txt");
fp = fopen("/tmp/Mode.txt","r"); fp = fopen("/tmp/Mode.txt","r");
@ -377,8 +377,10 @@ UINT8 sf_cardv_check_power_on_mode(void)
temp = strstr(pStrSrc, pStrSF); temp = strstr(pStrSrc, pStrSF);
if ( temp != NULL) { if ( temp != NULL) {
temp += strlen("sf="); temp += strlen("sf=");
sscanf(temp, "%hhd", &sftmp); // sscanf(temp, "%hhd", &sftmp);
sf_cardv_battery_level_set(sftmp); sftmp = strtoul(temp, NULL, 10);
sf_cardv_set_battery_level(sftmp);
// sf_cardv_battery_level_set(sftmp);
} }
SLOGI("StartMode=%d,UpFw=%d Upmcu=%d sftmp=%d\r\n", startup, UpFw, Upmcu, sftmp); SLOGI("StartMode=%d,UpFw=%d Upmcu=%d sftmp=%d\r\n", startup, UpFw, Upmcu, sftmp);
free(pStrSrc); free(pStrSrc);
@ -398,6 +400,7 @@ int NvtMain(void)
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
sf_cardv_check_power_on_mode(); sf_cardv_check_power_on_mode();
sf_cardv_load_menu_info_start(); sf_cardv_load_menu_info_start();
sf_cardv_init_start();
#endif #endif
System_InstallID(); System_InstallID();
#if (USB_MODE==ENABLE) #if (USB_MODE==ENABLE)
@ -434,7 +437,7 @@ int NvtMain(void)
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
sf_log_Level_set(SF_LOG_LEVEL_DEBUG); sf_log_Level_set(SF_LOG_LEVEL_DEBUG);
//sf_cardv_check_power_on_mode(); //sf_cardv_check_power_on_mode();
BOOL inUsb = GxUSB_GetIsUSBPlug(); // BOOL inUsb = GxUSB_GetIsUSBPlug();
// if(TRUE == inUsb)//(!sf_gpio_get_status(GPIO_INT_USBPLUGIN)) // if(TRUE == inUsb)//(!sf_gpio_get_status(GPIO_INT_USBPLUGIN))
// { // {
// sf_usb_mux_s(0); // sf_usb_mux_s(0);
@ -442,44 +445,43 @@ int NvtMain(void)
// } // }
#if HUNTING_CAMERA_4G == ENABLE #if HUNTING_CAMERA_4G == ENABLE
sf_share_mem_file_init(); // sf_share_mem_file_init();
/*if (cardv_message_queue_init()) // /*if (cardv_message_queue_init())
{ // {
printf("cardv initial message queue error!\n"); // printf("cardv initial message queue error!\n");
exit(1); // exit(1);
}*/ // }*/
if(SF_SUCCESS == sf_com_message_cardv_init()) // if(SF_SUCCESS == sf_com_message_cardv_init())
{ // {
printf("create message successs!!!!\n"); // printf("create message successs!!!!\n");
} // }
if(SF_SUCCESS == sf_com_message_app_init()) // if(SF_SUCCESS == sf_com_message_app_init())
{ // {
printf("create cardv message successs!!!!\n"); // printf("create cardv message successs!!!!\n");
} // }
sf_cardv_message_thread_init(); // sf_cardv_message_thread_init();
#if USE_MMC_DEV_CHECK // #if USE_MMC_DEV_CHECK
sf_mmc_dev_check_start(); // sf_mmc_dev_check_start();
#endif // #endif
SF_MESSAGE_BUF_S stMessageBuf = {0}; // SF_MESSAGE_BUF_S stMessageBuf = {0};
/*if(!sf_gpio_get_status(GPIO_KEY_TEST)){ /*if(!sf_gpio_get_status(GPIO_KEY_TEST)){
sf_set_fw_update(1);//update sf_set_fw_update(1);//update
}*/ }*/
if(TRUE != inUsb) // if(TRUE != inUsb)
{ // {
stMessageBuf.arg1 = SF_MCU_CMD_POWERON; // stMessageBuf.arg1 = SF_MCU_CMD_POWERON;
stMessageBuf.cmdId = CMD_MCU; // stMessageBuf.cmdId = CMD_MCU;
sf_com_message_send_to_app(&stMessageBuf);
// stMessageBuf.arg1 = SF_DEV_CMD_BAT;
// stMessageBuf.cmdId = CMD_DEV;
// sf_com_message_send_to_app(&stMessageBuf); // sf_com_message_send_to_app(&stMessageBuf);
stMessageBuf.arg1 = SF_DEV_CMD_TEMPER; // // stMessageBuf.arg1 = SF_DEV_CMD_BAT;
stMessageBuf.cmdId = CMD_DEV; // // stMessageBuf.cmdId = CMD_DEV;
sf_com_message_send_to_app(&stMessageBuf); // // sf_com_message_send_to_app(&stMessageBuf);
sf_dev_en();
} // stMessageBuf.arg1 = SF_DEV_CMD_TEMPER;
// stMessageBuf.cmdId = CMD_DEV;
// sf_com_message_send_to_app(&stMessageBuf);
// }
#else #else
sf_mcu_init(); sf_mcu_init();
sf_get_power_on_mode(); sf_get_power_on_mode();

8
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c
View File

@ -631,7 +631,7 @@ void message_box_confirm_msg_event_callback(lv_obj_t* obj, lv_event_t event)
/* this makes message box closing animation can be completed before closing screen */ /* this makes message box closing animation can be completed before closing screen */
case LV_EVENT_DELETE: case LV_EVENT_DELETE:
{ {
printf("[*x][%s]LV_EVENT_DELETE\n", __FUNCTION__); //printf("[%s]LV_EVENT_DELETE\n", __FUNCTION__);
/* reset pointer of msgbox */ /* reset pointer of msgbox */
msgbox = NULL; msgbox = NULL;
if (Confirm_label) if (Confirm_label)
@ -649,7 +649,7 @@ void message_box_confirm_msg_event_callback(lv_obj_t* obj, lv_event_t event)
// case LV_EVENT_KEY: // case LV_EVENT_KEY:
case LV_USER_EVENT_KEY_RELEASE: case LV_USER_EVENT_KEY_RELEASE:
{ {
printf("[*x][%s]LV_USER_EVENT_KEY_RELEASE\n", __FUNCTION__); //printf("[%s]LV_USER_EVENT_KEY_RELEASE\n", __FUNCTION__);
uint32_t* key = (uint32_t*)lv_event_get_data(); uint32_t* key = (uint32_t*)lv_event_get_data();
/* handle key event */ /* handle key event */
@ -669,10 +669,10 @@ void message_box_confirm_msg_event_callback(lv_obj_t* obj, lv_event_t event)
/* triggered by button release */ /* triggered by button release */
case LV_EVENT_VALUE_CHANGED: case LV_EVENT_VALUE_CHANGED:
printf("[*x][%s]LV_EVENT_VALUE_CHANGED\n", __FUNCTION__); //printf("[%s]LV_EVENT_VALUE_CHANGED\n", __FUNCTION__);
case LV_EVENT_CLICKED: case LV_EVENT_CLICKED:
{ {
printf("[*x][%s]LV_EVENT_CLICKED\n", __FUNCTION__); //printf("[%s]LV_EVENT_CLICKED\n", __FUNCTION__);
UIFlowMenuCommonConfirm_MessageBox_ValueChanged(obj, (uint32_t*)lv_event_get_data()); UIFlowMenuCommonConfirm_MessageBox_ValueChanged(obj, (uint32_t*)lv_event_get_data());
break; break;
} }

6
code/application/source/sf_app/code/include/sf_storeMng.h
View File

@ -107,7 +107,11 @@ SINT32 sf_sd_status_set(SF_SD_STATUS_E enStatus);
UINT32 sf_delete_send_flie_list(void); UINT32 sf_delete_send_flie_list(void);
int sf_app_sd_loop(void); int sf_app_sd_loop(void);
SINT32 sf_activity_is_full(void);
SINT32 sf_emmc_status_set(SF_SD_STATUS_E enStatus);
SF_SD_STATUS_E sf_emmc_status_get(void);
SINT32 sf_activity_status_set(SF_SD_STATUS_E enStatus);
SF_SD_STATUS_E sf_activity_status_get(void);
#ifdef __cplusplus #ifdef __cplusplus
#if __cplusplus #if __cplusplus
} }

1
code/application/source/sf_app/code/include/sf_wifi_svr.h
View File

@ -977,4 +977,5 @@ void appSvrResponseSocketSet(SINT32 socket);
SINT32 appSvrResponseSocketGet(void); SINT32 appSvrResponseSocketGet(void);
void sf_set_phone_shot_status(const PHONE_SHOT_E status); void sf_set_phone_shot_status(const PHONE_SHOT_E status);
const PHONE_SHOT_E sf_get_phone_shot_status(void); const PHONE_SHOT_E sf_get_phone_shot_status(void);
int sf_load_wifi_ko(void);
#endif /*__SF_WIFI_SERVER__*/ #endif /*__SF_WIFI_SERVER__*/

10
code/application/source/sf_app/code/source/4gMng/sf_eg91_gps.c
View File

@ -80,7 +80,7 @@ SINT32 eg91_gps_greendate_Get(SF_FN_PARAM_S *pfnParam,SF_PARA_TIME_S *pNowTime)
SF_CHAR dataStr[SF_TTYUSB_RECV_MAX] = { 0 }; SF_CHAR dataStr[SF_TTYUSB_RECV_MAX] = { 0 };
MODULE_SERVER_AUTHEN_E enATcmdType = MODULE_HTTP_AUTHEN_AT_QIACT_PRE; MODULE_SERVER_AUTHEN_E enATcmdType = MODULE_HTTP_AUTHEN_AT_QIACT_PRE;
while(sts) while(sts && sf_app_while_flag())
{ {
if(SF_TRUE == pfnParam->pfn_AT_instruction_exit(0)) if(SF_TRUE == pfnParam->pfn_AT_instruction_exit(0))
{ {
@ -333,7 +333,7 @@ SINT32 eg91_gps_Isupdate(SF_FN_PARAM_S *pfnParam,UINT8 *pIsupdate,SF_PARA_TIME_S
SIM_SEARCH_GPS_e enMmcLocation = SIM_SEARCH_GPS_FIRST; SIM_SEARCH_GPS_e enMmcLocation = SIM_SEARCH_GPS_FIRST;
while(sts) while(sts && sf_app_while_flag())
{ {
if(SF_TRUE == pfnParam->pfn_AT_instruction_exit(0)) if(SF_TRUE == pfnParam->pfn_AT_instruction_exit(0))
{ {
@ -464,7 +464,7 @@ SINT32 eg91_gps_search(SF_FN_PARAM_S *pfnParam,SF_PARA_TIME_S *pNowTime,UINT8 au
SIM_SEARCH_GPS_e enMmcLocation = SIM_SEARCH_GPS_FIRST; SIM_SEARCH_GPS_e enMmcLocation = SIM_SEARCH_GPS_FIRST;
while(sts) while(sts && sf_app_while_flag())
{ {
if(SF_TRUE == pfnParam->pfn_AT_instruction_exit(0)) if(SF_TRUE == pfnParam->pfn_AT_instruction_exit(0))
{ {
@ -760,7 +760,7 @@ SINT32 eg91_gps_preconfig(SF_FN_PARAM_S *pfnParam)
SIM_SEARCH_GPS_e enMmcLocation = SIM_SEARCH_GPS_FIRST; SIM_SEARCH_GPS_e enMmcLocation = SIM_SEARCH_GPS_FIRST;
while(sts) while(sts && sf_app_while_flag())
{ {
if(SF_TRUE == pfnParam->pfn_AT_instruction_exit(0)) if(SF_TRUE == pfnParam->pfn_AT_instruction_exit(0))
{ {
@ -910,7 +910,7 @@ SINT32 eg91_gps_search_result(SF_FN_PARAM_S *pfnParam)
SIM_SEARCH_GPS_e enMmcLocation = SIM_SEARCH_GPS_LOC; SIM_SEARCH_GPS_e enMmcLocation = SIM_SEARCH_GPS_LOC;
while(sts) while(sts && sf_app_while_flag())
{ {
if(SF_TRUE == pfnParam->pfn_AT_instruction_exit(0)) if(SF_TRUE == pfnParam->pfn_AT_instruction_exit(0))
{ {

12
code/application/source/sf_app/code/source/4gMng/sf_eg91_server.c
View File

@ -303,7 +303,7 @@ SINT32 eg91_http_config(SF_FN_PARAM_S *pfnParam, UINT8 sslOn, UINT8 autoReqHead)
SF_PDT_PARAM_STATISTICS_S *pstParamInfo = pfnParam->pstaticParam; SF_PDT_PARAM_STATISTICS_S *pstParamInfo = pfnParam->pstaticParam;
while(1) while(sf_app_while_flag())
{ {
if(SF_TRUE == pfnParam->pfn_AT_instruction_exit(0)) if(SF_TRUE == pfnParam->pfn_AT_instruction_exit(0))
{ {
@ -452,7 +452,7 @@ SINT32 eg91_http_config(SF_FN_PARAM_S *pfnParam, UINT8 sslOn, UINT8 autoReqHead)
SF_CHAR acmStr[40] = {0}; SF_CHAR acmStr[40] = {0};
MODULE_SERVER_AUTHEN_E enATcmdType = MODULE_HTTP_AUTHEN_AT_QIACT; MODULE_SERVER_AUTHEN_E enATcmdType = MODULE_HTTP_AUTHEN_AT_QIACT;
SF_PDT_PARAM_STATISTICS_S *pStaticParam = pfnParam->pstaticParam;/* Added by MaxLi 2022/03/02--15:5:56*/ SF_PDT_PARAM_STATISTICS_S *pStaticParam = pfnParam->pstaticParam;/* Added by MaxLi 2022/03/02--15:5:56*/
while(sts) while(sts && sf_app_while_flag())
{ {
if(SF_TRUE == pfnParam->pfn_AT_instruction_exit(0)) if(SF_TRUE == pfnParam->pfn_AT_instruction_exit(0))
{ {
@ -726,7 +726,7 @@ SINT32 eg91_http_config(SF_FN_PARAM_S *pfnParam, UINT8 sslOn, UINT8 autoReqHead)
MODULE_SERVER_SENDFILE_E enATcmdType = MODULE_SERVER_SENDFILE_AT_QHTTPCFG; MODULE_SERVER_SENDFILE_E enATcmdType = MODULE_SERVER_SENDFILE_AT_QHTTPCFG;
SF_PDT_PARAM_STATISTICS_S *pStaticParam = pfnParam->pstaticParam; SF_PDT_PARAM_STATISTICS_S *pStaticParam = pfnParam->pstaticParam;
while(1) while(sf_app_while_flag())
{ {
if(SF_TRUE == pfnParam->pfn_AT_instruction_exit(0)) if(SF_TRUE == pfnParam->pfn_AT_instruction_exit(0))
{ {
@ -962,7 +962,7 @@ SINT32 eg91_server_acm_open(SF_FN_PARAM_S *pfnParam)
SF_CHAR tempStr[32] = { 0 }; SF_CHAR tempStr[32] = { 0 };
MODULE_SERVER_ACM_OPEN_E enATcmdType = MODULE_SERVER_ACM_OPEN_AT_QISTATE; MODULE_SERVER_ACM_OPEN_E enATcmdType = MODULE_SERVER_ACM_OPEN_AT_QISTATE;
SF_PDT_PARAM_STATISTICS_S *pStaticParam = pfnParam->pstaticParam; SF_PDT_PARAM_STATISTICS_S *pStaticParam = pfnParam->pstaticParam;
while(sts) while(sts && sf_app_while_flag())
{ {
if(SF_TRUE == pfnParam->pfn_AT_instruction_exit(0)) if(SF_TRUE == pfnParam->pfn_AT_instruction_exit(0))
{ {
@ -1250,7 +1250,7 @@ SINT32 eg91_server_acm_open(SF_FN_PARAM_S *pfnParam)
UINT16 callTime = 0; UINT16 callTime = 0;
SF_CHAR ttyData[SF_TTYUSB_RECV_MAX] = { 0 }; SF_CHAR ttyData[SF_TTYUSB_RECV_MAX] = { 0 };
MODULE_SERVER_ACM_WRITE_E enATcmdType = MODULE_SERVER_ACM_WRITE_AT_QISEND; MODULE_SERVER_ACM_WRITE_E enATcmdType = MODULE_SERVER_ACM_WRITE_AT_QISEND;
while(sts) while(sts && sf_app_while_flag())
{ {
if(SF_TRUE == pfnParam->pfn_AT_instruction_exit(0)) if(SF_TRUE == pfnParam->pfn_AT_instruction_exit(0))
break; break;
@ -1384,7 +1384,7 @@ SINT32 eg91_server_acm_open(SF_FN_PARAM_S *pfnParam)
SF_CHAR ttyData[SF_TTYUSB_RECV_MAX] = { 0 }; SF_CHAR ttyData[SF_TTYUSB_RECV_MAX] = { 0 };
MODULE_SERVER_ACM_CLOSE_E enATcmdType = MODULE_SERVER_ACM_CLOSE_AT_QICLOSE; MODULE_SERVER_ACM_CLOSE_E enATcmdType = MODULE_SERVER_ACM_CLOSE_AT_QICLOSE;
while(sts) while(sts && sf_app_while_flag())
{ {
if(SF_TRUE == pfnParam->pfn_AT_instruction_exit(0)) if(SF_TRUE == pfnParam->pfn_AT_instruction_exit(0))
break; break;

32
code/application/source/sf_app/code/source/4gMng/sf_eg91_sim.c
View File

@ -5485,30 +5485,10 @@ UINT32 sf_sim_qsclk(UINT8 mode) //mode = 2, gprsmode = 1
switch(eSmsLocation) switch(eSmsLocation)
{ {
case SMS_SIM_INIT_DTRUP: case SMS_SIM_INIT_DTRUP:
if(strstr((const char *)gsmPara, "OK"))
{
strcpy((char *)gsmPara, "AT+QSCLK=1\r"); //sleep strcpy((char *)gsmPara, "AT+QSCLK=1\r"); //sleep
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara)); ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
SF_CHECK_RETURN(ttyRet, SF_SIM_ERROR_AT_TIMEOUT); SF_CHECK_RETURN(ttyRet, SF_SIM_ERROR_AT_TIMEOUT);
eSmsLocation = SMS_SIM_INIT_EXIT; eSmsLocation = SMS_SIM_INIT_EXIT;
}
// else if(strstr((const char *)gsmPara, "ERROR"))
// {
// goto SF_RETURN;
// }
else
{
strcpy((char *)gsmPara, "AT\r"); //sleep
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
SF_CHECK_RETURN(ttyRet, SF_SIM_ERROR_AT_TIMEOUT);
if(!puiPara->GprsMode)
{
sf_sleep_ms(800);
}
}
break; break;
case SMS_SIM_INIT_EXIT: case SMS_SIM_INIT_EXIT:
@ -5526,8 +5506,13 @@ UINT32 sf_sim_qsclk(UINT8 mode) //mode = 2, gprsmode = 1
else else
{ {
calltime++; calltime++;
if(calltime = 10)
if(calltime > 20) {
strcpy((char *)gsmPara, "AT+QSCLK=1\r"); //sleep
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
SF_CHECK_RETURN(ttyRet, SF_SIM_ERROR_AT_TIMEOUT);
}
else if(calltime > 20)
{ {
ret = SF_SIM_ERROR_AT_TIMEOUT; ret = SF_SIM_ERROR_AT_TIMEOUT;
sprintf((char *)logStr, "[%s:%d]ErrorCode=0x%08x,AT+QSCLK Timeout.", __FUNCTION__, __LINE__, ret); sprintf((char *)logStr, "[%s:%d]ErrorCode=0x%08x,AT+QSCLK Timeout.", __FUNCTION__, __LINE__, ret);
@ -5543,10 +5528,9 @@ UINT32 sf_sim_qsclk(UINT8 mode) //mode = 2, gprsmode = 1
} }
sf_gsm_para_buff_clear(); sf_gsm_para_buff_clear();
sf_hal_ttyusb2_read_buf(&ttyData); sf_hal_ttyusb2_read_buf(&ttyData);
printf("-----eSmsLocation:%d-----time:%d-----\n", eSmsLocation, time);
if(gsmPara[0] != '\0') if(gsmPara[0] != '\0')
{ {
printf("[%s:%d]gsmPara===>%s<================end\n", __FUNCTION__, __LINE__, gsmPara); SLOGI("[%s:%d] %s\n", __FUNCTION__, __LINE__, gsmPara);
} }
time++; time++;

44
code/application/source/sf_app/code/source/4gMng/sf_ftp.c
View File

@ -231,7 +231,7 @@ SINT32 sf_ftp_config(UINT8 ssl, UINT8 GprsMode, int timeout)
// printf("ftp_manager_init password = %s\n", config.password); // printf("ftp_manager_init password = %s\n", config.password);
ftp_manager_init(config); ftp_manager_init(config);
printf("[%s:%d]ret:[0x%08X]\n\n", __FUNCTION__, __LINE__, ret); // printf("[%s:%d]ret:[0x%08X]\n\n", __FUNCTION__, __LINE__, ret);
if(SF_SUCCESS != ret){ if(SF_SUCCESS != ret){
sf_sys_status_led_set(SF_LED_SYS_STATE_SEND_FAIL); sf_sys_status_led_set(SF_LED_SYS_STATE_SEND_FAIL);
} }
@ -940,7 +940,7 @@ SINT32 sf_pic_send_ftp(void)
// piccount = 1; // piccount = 1;
// } // }
// } // }
MLOGI("netGeneration:%dG,tempPicSize=%d,piccount=%d,filecnt=%d\n", sf_get_net_generation(), tempPicSize, piccount, pThumbFileCfg->filecnt); // MLOGI("netGeneration:%dG,tempPicSize=%d,piccount=%d,filecnt=%d\n", sf_get_net_generation(), tempPicSize, piccount, pThumbFileCfg->filecnt);
//printf("[%s:%d]piccount=%d\n", __FUNCTION__, __LINE__, piccount); //printf("[%s:%d]piccount=%d\n", __FUNCTION__, __LINE__, piccount);
@ -1017,7 +1017,7 @@ SINT32 sf_pic_send_ftp(void)
} }
else else
{ {
printf("%s:%d err up file ftpFileName:%s filePath:%s\n", __FUNCTION__, __LINE__, ftpFileName[pic], filePath[pic]); MLOGE("%s:%d ret:[0x%08X] err up file ftpFileName:%s filePath:%s\n", ret, __FUNCTION__, __LINE__, ftpFileName[pic], filePath[pic]);
} }
} }
// sendEndTime = clock(); // sendEndTime = clock();
@ -1029,7 +1029,7 @@ SINT32 sf_pic_send_ftp(void)
//pSifarPara->picSendTimeCount +=sendEndTime - sendStartTime; //pSifarPara->picSendTimeCount +=sendEndTime - sendStartTime;
//pSifarPara->sendThumbnailTimeCount += sendEndTime - sendStartTime; //pSifarPara->sendThumbnailTimeCount += sendEndTime - sendStartTime;
MLOGD(" end ret:[0x%08X] \n", ret); // MLOGD(" end ret:[0x%08X] \n", ret);
return ret; return ret;
} }
double sf_sys_ms_time_get(clock_t end_time) double sf_sys_ms_time_get(clock_t end_time)
@ -1086,7 +1086,7 @@ SINT32 sf_video_send_ftp(void)
snprintf(cameraID, sizeof(cameraID), "%s-%d-%d-%s-", pPara->ModuleImei, sf_app_get_battery(), csqlevel, CamNameStr); /* DCF 8.3 naming rule */ snprintf(cameraID, sizeof(cameraID), "%s-%d-%d-%s-", pPara->ModuleImei, sf_app_get_battery(), csqlevel, CamNameStr); /* DCF 8.3 naming rule */
printf("netGeneration:%dG,tempPicSize=%d,piccount=%d,pic=%d\n", sf_get_net_generation(), tempPicSize, piccount, pic); // printf("netGeneration:%dG,tempPicSize=%d,piccount=%d,pic=%d\n", sf_get_net_generation(), tempPicSize, piccount, pic);
/*sf_get_send_video_fname(videoDirKey, videoFname); /*sf_get_send_video_fname(videoDirKey, videoFname);
sprintf((char *)ftpFileName, "%s%s", cameraID, videoFname); sprintf((char *)ftpFileName, "%s%s", cameraID, videoFname);
@ -1098,16 +1098,16 @@ SINT32 sf_video_send_ftp(void)
sprintf((char *)ftpFileName, "%s%s", cameraID, pThumbFileCfg->stfileattr[fileIndex].thumbfileName); sprintf((char *)ftpFileName, "%s%s", cameraID, pThumbFileCfg->stfileattr[fileIndex].thumbfileName);
sprintf((char *)filePath, "%s", pThumbFileCfg->stfileattr[fileIndex].thumbfilePath); sprintf((char *)filePath, "%s", pThumbFileCfg->stfileattr[fileIndex].thumbfilePath);
printf("%s:%d ftpFileName:%s filePath:%s videoDir:%s\n", __FUNCTION__, __LINE__, ftpFileName, filePath, videoDir); // printf("%s:%d ftpFileName:%s filePath:%s videoDir:%s\n", __FUNCTION__, __LINE__, ftpFileName, filePath, videoDir);
//ret = sf_simcom_upload_file_to_module(videoDir,ftpFileName); //ret = sf_simcom_upload_file_to_module(videoDir,ftpFileName);
ret = SF_SUCCESS; // ret = SF_SUCCESS;
if(SF_SUCCESS != ret) // if(SF_SUCCESS != ret)
{ // {
printf("%s:%d upload err ret: [0x%08X] ftpFileName:%s filePath:%s\n", __FUNCTION__, __LINE__, ret, ftpFileName, filePath); // printf("%s:%d upload err ret: [0x%08X] ftpFileName:%s filePath:%s\n", __FUNCTION__, __LINE__, ret, ftpFileName, filePath);
} // }
else // else
{ {
SF_SEND_RE: SF_SEND_RE:
ret = sf_ftp_send(ftpFileName, filePath, timeout); ret = sf_ftp_send(ftpFileName, filePath, timeout);
@ -1126,8 +1126,6 @@ SINT32 sf_video_send_ftp(void)
sf_log_error_code(logStr); sf_log_error_code(logStr);
} }
} }
MLOGD(" end ret:[0x%08X]\n", ret);
return ret; return ret;
} }
@ -1348,7 +1346,6 @@ SINT32 sf_check_ftp_send(UINT8 mode)
SINT32 sf_send_file_to_ftp(UINT8 mode) SINT32 sf_send_file_to_ftp(UINT8 mode)
{ {
SINT32 ret1 = SF_SUCCESS; //0:success; else:fail; SINT32 ret1 = SF_SUCCESS; //0:success; else:fail;
SINT32 ret2 = SF_SUCCESS; //0:success; else:fail;
UINT8 ssl = 0; UINT8 ssl = 0;
UINT8 gprsMode = 0; UINT8 gprsMode = 0;
int timeout = 60000; int timeout = 60000;
@ -1359,7 +1356,7 @@ SINT32 sf_send_file_to_ftp(UINT8 mode)
ssl = ((2 == puiPara->FtpSwitch) ? 1 : 0); ssl = ((2 == puiPara->FtpSwitch) ? 1 : 0);
gprsMode = 0;//puiPara->GprsMode; gprsMode = 0;//puiPara->GprsMode;
printf("[%s:%d] ssl:%d,GprsMode:%d\n", __FUNCTION__, __LINE__, ssl, gprsMode); // printf("[%s:%d] ssl:%d,GprsMode:%d\n", __FUNCTION__, __LINE__, ssl, gprsMode);
if(mode == 1 ) //send Original+video if(mode == 1 ) //send Original+video
{ {
@ -1403,7 +1400,7 @@ SINT32 sf_send_file_to_ftp(UINT8 mode)
} }
} }
printf("[%s:%d]netGeneration=%d\n", __FUNCTION__, __LINE__, sf_get_net_generation()); // printf("[%s:%d]netGeneration=%d\n", __FUNCTION__, __LINE__, sf_get_net_generation());
if(((puiPara->CamMode == SF_CAM_MODE_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2)) && (puiPara->SendVideoSwitch == 1) && (sf_get_net_generation() == 4)) //video if(((puiPara->CamMode == SF_CAM_MODE_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2)) && (puiPara->SendVideoSwitch == 1) && (sf_get_net_generation() == 4)) //video
{ {
@ -1445,25 +1442,16 @@ SINT32 sf_send_file_to_ftp(UINT8 mode)
} }
} }
if(ret1 != SF_FTP_ERROR_TERM)
{
//ret2 = sf_ftp_stop(ssl, gprsMode);
}
#if SF_TEST_ERROR_CODE
sf_set_code_err_flag(0);
#endif
//printf("[%s:%d]ret1:[0x%08X],ret2:[0x%08X]\n\n", __FUNCTION__, __LINE__, ret1, ret2);
MLOGD(" end ret1:[0x%08X],ret2:[0x%08X]\n", ret1, ret2);
if(ret1 != SF_SUCCESS) if(ret1 != SF_SUCCESS)
{ {
MLOGD(" end ret1:[0x%08X]\n", ret1);
return ret1; return ret1;
} }
else else
{ {
FtpOpenOk = SUCCESS; FtpOpenOk = SUCCESS;
return ret2; return ret1;
} }
} }

26
code/application/source/sf_app/code/source/app/sf_app.c
View File

@ -160,23 +160,23 @@ int main(int argc, char *argv[])
if((!isUsb) && (SF_MCU_STARTUP_NORMAL != startup) && (SF_MCU_STARTUP_OFF != startup)/*&& (0 == isUpdate)*/) if((!isUsb) && (SF_MCU_STARTUP_NORMAL != startup) && (SF_MCU_STARTUP_OFF != startup)/*&& (0 == isUpdate)*/)
{ {
printf("[sf_app]battery thread start\n"); // printf("[sf_app]battery thread start\n");
sf_app_battery_start(); sf_app_battery_start();
#if SF_IQ_TEST != ENABLE #if SF_IQ_TEST != ENABLE
if(SF_MCU_STARTUP_ONKEY == startup) // if(SF_MCU_STARTUP_ONKEY == startup)
{ // {
if(puiPara->WifiSwitch) // if(puiPara->WifiSwitch)
{ // {
sf_set_wifi_en(1); // sf_set_wifi_en(1);
} // }
if(puiPara->BluSwitch) // if(puiPara->BluSwitch)
{ // {
sf_set_bt_en(1); // sf_set_bt_en(1);
} // }
} // }
if((0 == isMcuUpdate) && (0 == isUpdate) && (puiPara->GprsSwitch)) if((0 == isMcuUpdate) && (0 == isUpdate) && (puiPara->GprsSwitch))
{ {
sf_4G_usb_init(); // sf_4G_usb_init();
app_RegisterNet_start(); app_RegisterNet_start();
} }
#endif #endif

64
code/application/source/sf_app/code/source/app/sf_common.c
View File

@ -185,7 +185,7 @@ const SF_CHAR* app_process_message_getstatusstring(SF_MESSAGE_TYPE_E enType)
static void create_qrcode(void) static void create_qrcode(void)
{ {
if(sf_sd_status_get() == SF_SD_OK || sf_sd_status_get() == SF_SD_FULL) if(sf_activity_status_get() == SF_SD_OK || sf_activity_status_get() == SF_SD_FULL)
{ {
SF_CHAR version[12] = {0}; SF_CHAR version[12] = {0};
SF_CHAR iccidStr[22] = {0}; SF_CHAR iccidStr[22] = {0};
@ -219,7 +219,7 @@ static SINT32 process_cmd_shortclick(SF_MESSAGE_BUF_S *pMessageBuf)
if(!longClickhold) if(!longClickhold)
break; break;
create_qrcode(); create_qrcode();
// if(sf_sd_status_get() == SF_SD_OK || sf_sd_status_get() == SF_SD_FULL) // if(sf_activity_status_get() == SF_SD_OK || sf_activity_status_get() == SF_SD_FULL)
// { // {
// SF_CHAR version[12] = {0}; // SF_CHAR version[12] = {0};
// SF_CHAR iccidStr[22] = {0}; // SF_CHAR iccidStr[22] = {0};
@ -330,7 +330,7 @@ static SINT32 process_cmd_shortclick(SF_MESSAGE_BUF_S *pMessageBuf)
case SF_KEY_PIN_FORMAT: case SF_KEY_PIN_FORMAT:
if(!longClickhold) if(!longClickhold)
break; break;
if(sf_sd_status_get() == SF_SD_OK || sf_sd_status_get() == SF_SD_FULL) if(sf_activity_status_get() == SF_SD_OK || sf_activity_status_get() == SF_SD_FULL)
{ {
pCustomer->DebugMode = pCustomer->DebugMode?0:1; pCustomer->DebugMode = pCustomer->DebugMode?0:1;
sf_led_event_process((pCustomer->DebugMode?LED_STATUS_SLOWFLASH_ON:LED_STATUS_HOLD_ON),LED_GROUP_SD,LED_TYPE_GREEN); sf_led_event_process((pCustomer->DebugMode?LED_STATUS_SLOWFLASH_ON:LED_STATUS_HOLD_ON),LED_GROUP_SD,LED_TYPE_GREEN);
@ -485,7 +485,7 @@ static SINT32 process_cmd_longclick(SF_MESSAGE_BUF_S *pMessageBuf)
// } // }
break; break;
case SF_KEY_PIN_FORMAT: case SF_KEY_PIN_FORMAT:
if(sf_sd_status_get() == SF_SD_OUT) if(sf_activity_status_get() == SF_SD_OUT)
break; break;
if(sf_cap_status_get() != 0) if(sf_cap_status_get() != 0)
break; break;
@ -610,14 +610,19 @@ static SINT32 sfStrgDevOnActionMount(int dev_id, int result)
switch (status) switch (status)
{ {
case FST_STA_OK: case FST_STA_OK:
sf_set_card(1); // sf_set_card(1);
sf_sd_status_set(SF_SD_OK);
if(dev_id == MMC_DEV_EMMC) if(dev_id == MMC_DEV_EMMC)
{ {
printf("EMMC has Mounted!\r\n"); printf("EMMC has Mounted!\r\n");
sf_strg_dev_register(MMC_DEV_EMMC, MMC_DEV_MOUNT_STATE_MOUNTED); //sf_strg_dev_register(MMC_DEV_EMMC, MMC_DEV_MOUNT_STATE_MOUNTED);
sf_set_emmc_err(0); sf_set_emmc_err(0);
sf_emmc_status_set(SF_SD_OK);
} }
else if(dev_id == MMC_DEV_SD)
{
sf_sd_status_set(SF_SD_OK);
}
// if(SF_MCU_STARTUP_ONKEY == startup) // if(SF_MCU_STARTUP_ONKEY == startup)
// { // {
// SF_STORE_ATTR_S storeattrs = {0}; // SF_STORE_ATTR_S storeattrs = {0};
@ -669,13 +674,13 @@ static SINT32 sfStrgDevSdHandler(int cb_evt, int dev_id, int result)
switch(cb_evt) switch(cb_evt)
{ {
case CMD_SD_STRG_CB_UNKNOWN: case CMD_SD_STRG_CB_UNKNOWN:
sf_set_card_full(1); // sf_set_card_full(1);
break; break;
case CMD_SD_STRG_CB_INSERTED: case CMD_SD_STRG_CB_INSERTED:
sf_set_card(1); // sf_set_card(1);
break; break;
case CMD_SD_STRG_CB_REMOVED: case CMD_SD_STRG_CB_REMOVED:
sf_set_card(0); // sf_set_card(0);
sf_sd_status_set(SF_SD_OUT); sf_sd_status_set(SF_SD_OUT);
sf_sys_status_led_set(SF_LED_SYS_STATE_SD_ERROR); sf_sys_status_led_set(SF_LED_SYS_STATE_SD_ERROR);
break; break;
@ -683,11 +688,14 @@ static SINT32 sfStrgDevSdHandler(int cb_evt, int dev_id, int result)
sfStrgDevOnActionMount(dev_id, result); sfStrgDevOnActionMount(dev_id, result);
break; break;
case CMD_SD_STRG_CB_UNMOUNT_FINISH: case CMD_SD_STRG_CB_UNMOUNT_FINISH:
sf_set_card(0); // sf_set_card(0);
sf_sd_status_set(SF_SD_OUT); sf_sd_status_set(SF_SD_OUT);
sf_sys_status_led_set(SF_LED_SYS_STATE_SD_ERROR); sf_sys_status_led_set(SF_LED_SYS_STATE_SD_ERROR);
MLOGI("CMD_SD_STRG_CB_UNMOUNT_FINISH\r\n"); MLOGI("CMD_SD_STRG_CB_UNMOUNT_FINISH\r\n");
break; break;
default:
MLOGI("default\r\n");
break;
} }
return SF_SUCCESS; return SF_SUCCESS;
} }
@ -698,7 +706,7 @@ static SINT32 sfStrgDevEmmcHandler(int cb_evt, int dev_id, int result)
switch(cb_evt) switch(cb_evt)
{ {
case CMD_SD_STRG_CB_UNKNOWN: case CMD_SD_STRG_CB_UNKNOWN:
sf_set_card_full(1); // sf_set_card_full(1);
printf("eMMC is FULL!\r\n"); printf("eMMC is FULL!\r\n");
break; break;
@ -706,11 +714,15 @@ static SINT32 sfStrgDevEmmcHandler(int cb_evt, int dev_id, int result)
sfStrgDevOnActionMount(dev_id, result); sfStrgDevOnActionMount(dev_id, result);
break; break;
case CMD_SD_STRG_CB_UNMOUNT_FINISH: case CMD_SD_STRG_CB_UNMOUNT_FINISH:
sf_set_card(0); // sf_set_card(0);
sf_sd_status_set(SF_SD_OUT); sf_emmc_status_set(SF_SD_OUT);
sf_sys_status_led_set(SF_LED_SYS_STATE_SD_ERROR); sf_sys_status_led_set(SF_LED_SYS_STATE_SD_ERROR);
MLOGI("CMD_SD_STRG_CB_UNMOUNT_FINISH\r\n"); MLOGI("CMD_SD_STRG_CB_UNMOUNT_FINISH\r\n");
break; break;
default:
MLOGI("default\r\n");
break;
} }
return SF_SUCCESS; return SF_SUCCESS;
} }
@ -737,15 +749,37 @@ static SINT32 sf_app_process_cmd_SD(SF_MESSAGE_BUF_S *pMessageBuf)
case CMD_SD_FULL: case CMD_SD_FULL:
sf_sys_status_led_set(SF_LED_SYS_STATE_SD_ERROR); sf_sys_status_led_set(SF_LED_SYS_STATE_SD_ERROR);
MLOGI("CMD_SD_FULL\r\n"); MLOGI("CMD_SD_FULL\r\n");
if(pMessageBuf->arg2 == MMC_DEV_SD)
{
sf_set_card_full(1); sf_set_card_full(1);
sf_sd_status_set(SF_SD_FULL); sf_sd_status_set(SF_SD_FULL);
}
else if(pMessageBuf->arg2 == MMC_DEV_EMMC)
{
sf_emmc_status_set(SF_SD_FULL);
}
break; break;
case CMD_SD_FORMAT: case CMD_SD_FORMAT:
sf_set_card_statu(pMessageBuf->arg2); if(pMessageBuf->arg2 == MMC_DEV_SD)
{
sf_sd_status_set(pMessageBuf->arg2);
}
else if(pMessageBuf->arg2 == MMC_DEV_EMMC)
{
sf_emmc_status_set(pMessageBuf->arg2);
}
break; break;
case CMD_SD_STRG_WORKABLE_DEV: case CMD_SD_STRG_WORKABLE_DEV:
sf_strg_dev_register(pMessageBuf->arg2, pMessageBuf->arg3); sf_strg_dev_register(pMessageBuf->arg2, pMessageBuf->arg3);
if(pMessageBuf->arg2 == MMC_DEV_SD)
{
sf_activity_status_set(sf_sd_status_get());
}
else if(pMessageBuf->arg2 == MMC_DEV_EMMC)
{
sf_activity_status_set(sf_emmc_status_get());
}
break; break;
case CMD_SD_FILESYS_INIT_STATUS: case CMD_SD_FILESYS_INIT_STATUS:
if(SF_MCU_STARTUP_ONKEY == startup) if(SF_MCU_STARTUP_ONKEY == startup)

3
code/application/source/sf_app/code/source/app/sf_device.c
View File

@ -317,7 +317,7 @@ SINT32 app_led_sd_status_return(void)
stMessageBuf.cmdId = CMD_LED; stMessageBuf.cmdId = CMD_LED;
stMessageBuf.arg1 = LED_STATUS_HOLD_ON; stMessageBuf.arg1 = LED_STATUS_HOLD_ON;
switch(sf_sd_status_get()) { switch(sf_activity_status_get()) {
case SF_SD_UNPLUGED: case SF_SD_UNPLUGED:
case SF_SD_OUT: case SF_SD_OUT:
stMessageBuf.arg3 = LED_TYPE_RED; stMessageBuf.arg3 = LED_TYPE_RED;
@ -640,6 +640,7 @@ BOOL sf_load_ko(void)
} }
} }
} }
system("mdev -s");
//MLOGI("sf_load_ko finsihed.\n"); //MLOGI("sf_load_ko finsihed.\n");
//printf("[%s:%d] e\n", __FUNCTION__, __LINE__); //printf("[%s:%d] e\n", __FUNCTION__, __LINE__);
return ret2; return ret2;

62
code/application/source/sf_app/code/source/app/sf_service.c
View File

@ -87,21 +87,27 @@ SF_THREAD_S QlogTsk = {
SINT32 app_ttyusb_IsOpen(void) { SINT32 app_ttyusb_IsOpen(void) {
int retryTime = 0; int retryTime = 0;
int retryFlag = 0; int retryFlag = 0;
SINT32 s32ret = 0; static SINT32 s32ret = SF_SUCCESS;
static int flag = 0;
if(flag)
{
return s32ret;
}
MLOGD("ttyUSB has not been init, will init ttyUSB!\n"); MLOGD("ttyUSB has not been init, will init ttyUSB!\n");
UINT8 i = 0; UINT8 i = 0;
RETRY: RETRY:
for (i = 0; i < 150; i++) { for (i = 0; i < 150; i++) {
if (access("/dev/ttyUSB2", F_OK) == SF_SUCCESS) { if (access("/dev/ttyUSB2", F_OK) == SF_SUCCESS) {
printf("tty usb ko exist!\r\n"); // printf("tty usb ko exist!\r\n");
printf("4G Init OK\r\n"); printf("4G Init OK\r\n");
break; break;
} else { } else {
usleep(100 * 1000); usleep(100 * 1000);
if(149 == i) if(149 == i)
{ {
MLOGE("NO ttyUSB dev!!\n"); // MLOGE("NO ttyUSB dev!!\n");
printf("4G Init ERR\r\n"); printf("4G Init ERR\r\n");
} }
} }
@ -121,12 +127,13 @@ SINT32 app_ttyusb_IsOpen(void) {
} else if ((1 == retryFlag) && (retryTime >= 50) && } else if ((1 == retryFlag) && (retryTime >= 50) &&
(retryTime % 50 == 0)) // 200ms*25 = 5s (retryTime % 50 == 0)) // 200ms*25 = 5s
{ {
MLOGE("-------ttyUSB retry init fail!\n"); // MLOGE("-------ttyUSB retry init fail!\n");
s32ret = SF_TTY_ERROR_OPEN; s32ret = SF_TTY_ERROR_OPEN;
printf("4G Init Fail, retry\r\n"); printf("4G Init Fail, retry\r\n");
break; break;
} }
} }
flag = 1;
MLOGD("e\n"); MLOGD("e\n");
return s32ret; return s32ret;
} }
@ -197,7 +204,7 @@ static SINT16 app_Qlog_procress(void) {
while (sf_app_while_flag()) while (sf_app_while_flag())
{ {
sf_sleep_ms(200); sf_sleep_ms(200);
if (sf_sd_status_get() != SF_SD_OK) if (sf_activity_status_get() != SF_SD_OK)
{ {
break; break;
} }
@ -597,7 +604,7 @@ static SINT32 app_upgrade_ota_execute(void) {
SLOGE("Battery capacity is too low\n"); SLOGE("Battery capacity is too low\n");
goto _ERROR_; goto _ERROR_;
} }
if (!(sf_sd_status_get() == SF_SD_OK || sf_sd_status_get() == SF_SD_FULL)) { if (!(sf_activity_status_get() == SF_SD_OK || sf_activity_status_get() == SF_SD_FULL)) {
SLOGE("SD is not exsited ,please check it !!!"); SLOGE("SD is not exsited ,please check it !!!");
goto _ERROR_; goto _ERROR_;
} }
@ -765,7 +772,7 @@ SINT32 app_server_excute_cmd(SF_FN_PARAM_S *pfnParam) {
if (sf_get_login_reponse()->sdFormatCommand == 1) { if (sf_get_login_reponse()->sdFormatCommand == 1) {
if (sf_sd_status_get() != SF_SD_OUT) { if (sf_activity_status_get() != SF_SD_OUT) {
system("echo format > /tmp/cardv_fifo"); system("echo format > /tmp/cardv_fifo");
sleep(2); sleep(2);
} else { } else {
@ -1145,7 +1152,7 @@ static SINT32 app_file_transfer(SF_FN_PARAM_S *pfnParam) {
if (sf_usb_IsInsert()) if (sf_usb_IsInsert())
return SF_SUCCESS; return SF_SUCCESS;
SLOGD("STARTUP:[%d]\n", sf_poweron_type_get()); // SLOGD("STARTUP:[%d]\n", sf_poweron_type_get());
if (sf_get_cq_signal() == 0) { if (sf_get_cq_signal() == 0) {
SLOGD("no csq signal\n"); SLOGD("no csq signal\n");
return SF_SUCCESS; return SF_SUCCESS;
@ -1226,11 +1233,17 @@ static SINT32 app_file_transfer(SF_FN_PARAM_S *pfnParam) {
if((!PicUpDailyReportFlag) && (pCustomerParam->PicUpDailyReport)) if((!PicUpDailyReportFlag) && (pCustomerParam->PicUpDailyReport))
{ {
PicUpDailyReportFlag = 1; PicUpDailyReportFlag = 1;
if(0 == sf_activity_is_full())
{
sf_sms_set_pic(1); sf_sms_set_pic(1);
sf_sleep_ms(200); sf_sleep_ms(200);
SLOGD("GpsSendFlag:%d\n", pCustomerParam->GpsSendFlag); SLOGD("GpsSendFlag:%d\n", pCustomerParam->GpsSendFlag);
break; break;
} }
else {
SLOGE(" SDFree\n");
}
}
if (!DailyreportSendFlag) if (!DailyreportSendFlag)
{ {
@ -2072,8 +2085,20 @@ SINT32 sf_app_to_cardv_capture(void) {
SF_MESSAGE_BUF_S stMessageBuf = {0}; SF_MESSAGE_BUF_S stMessageBuf = {0};
stMessageBuf.arg1 = SF_WIFI_CMD_CAPTURE; stMessageBuf.arg1 = SF_WIFI_CMD_CAPTURE;
stMessageBuf.cmdId = CMD_WIFI; stMessageBuf.cmdId = CMD_WIFI;
if(SF_FAILURE == sf_check_sd())
{
sf_sms_set_pic(0);
return s32ret;
}
if(0 == sf_activity_is_full())
{
sf_com_message_send_to_cardv(&stMessageBuf); sf_com_message_send_to_cardv(&stMessageBuf);
}
else
{
sf_sms_set_pic(0);
SLOGE(" SDFree\n");
}
return s32ret; return s32ret;
} }
@ -2128,7 +2153,20 @@ SINT32 sf_app_to_cardv_hd_ture(void) {
return falg; return falg;
} }
falg = 1; falg = 1;
if(SF_FAILURE == sf_check_sd())
{
sf_set_send_hd(0);
return s32ret;
}
if(0 == sf_activity_is_full())
{
s32ret = sf_share_mem_hd_down(1); s32ret = sf_share_mem_hd_down(1);
}
else
{
sf_set_send_hd(0);
SLOGE(" SDFree\n");
}
MLOGI(" e ret:0x%08X\n",s32ret); MLOGI(" e ret:0x%08X\n",s32ret);
return s32ret; return s32ret;
} }
@ -2178,7 +2216,7 @@ int sf_check_eth0(void)
// Check if an IP address is assigned // Check if an IP address is assigned
if (strstr(output, "inet ") == NULL) { if (strstr(output, "inet ") == NULL) {
MLOGI("The network card exists, but no IP address has been assigned\n"); // MLOGI("The network card exists, but no IP address has been assigned\n");
pclose(fp); pclose(fp);
free(output); free(output);
return 1; return 1;
@ -2461,11 +2499,11 @@ int sf_check_sd(void)
ret = SF_FAILURE; ret = SF_FAILURE;
return ret; return ret;
} }
if (sf_sd_status_get() != SF_SD_OK) { if (sf_activity_status_get() != SF_SD_OK) {
ret = SF_FAILURE; ret = SF_FAILURE;
for (i = 0; i < 20; i++) for (i = 0; i < 20; i++)
{ {
if (SF_SD_OK == sf_sd_status_get()) if (SF_SD_OK == sf_activity_status_get())
{ {
ret = SF_SUCCESS; ret = SF_SUCCESS;
MLOGI("SD\r\n"); MLOGI("SD\r\n");

3
code/application/source/sf_app/code/source/app/sf_system.c
View File

@ -1082,7 +1082,6 @@ SINT32 sf_app_battery_start(void)
SLOGE("thread has already run !!!\n"); SLOGE("thread has already run !!!\n");
return SF_FAILURE; return SF_FAILURE;
} }
sf_adc_init();
printf("[sf_app_battery_start]thread start\n"); printf("[sf_app_battery_start]thread start\n");
ret = pthread_create(&BatteryTskCfg.TskId, NULL, sf_battery_check_thread, NULL); ret = pthread_create(&BatteryTskCfg.TskId, NULL, sf_battery_check_thread, NULL);
if(ret != SF_SUCCESS) if(ret != SF_SUCCESS)
@ -1373,7 +1372,7 @@ void* sf_app_load_ko_thread(void *arg)
SLOGI("thread run\n"); SLOGI("thread run\n");
UsbKoTskCfg.IsRun = 1; UsbKoTskCfg.IsRun = 1;
sf_load_ko(); // sf_load_ko();
if(PWR_ON_SETUP == sf_poweron_type_get()) if(PWR_ON_SETUP == sf_poweron_type_get())
{ {

22
code/application/source/sf_app/code/source/battery/sf_battery.c
View File

@ -49,6 +49,7 @@
#include "sf_ledmng.h" #include "sf_ledmng.h"
#include "sf_dev_usb.h" #include "sf_dev_usb.h"
#include "sf_commu_mcu_reg.h" #include "sf_commu_mcu_reg.h"
#include <math.h>
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
typedef signed int SINT32; typedef signed int SINT32;
@ -447,7 +448,7 @@ UINT32 sf_battery_adc_value_get_once(void)
if(_LiPolymerVoltageVal) if(_LiPolymerVoltageVal)
{ {
printf("[sf_battery_level_polling]is lith battery\n"); // printf("[sf_battery_level_polling]is lith battery\n");
if(SF_BATT_LI_PACK != puiPara->BatteryType) if(SF_BATT_LI_PACK != puiPara->BatteryType)
{ {
puiPara->LiBatteryType = puiPara->BatteryType; puiPara->LiBatteryType = puiPara->BatteryType;
@ -910,12 +911,12 @@ SINT32 sf_battery_adc_value_get(void)
void sf_battery_level_polling(void) void sf_battery_level_polling(void)
{ {
UINT16 readBatCnt = 0; UINT16 readBatCnt = 0;
UINT32 dcTemp = 0; double dcTemp = 0;
UINT32 batTemp = 0; double batTemp = 0;
UINT32 LibatTemp = 0; double LibatTemp = 0;
UINT8 LibatCnt = 0; UINT8 LibatCnt = 0;
UINT8 batCnt = 0; UINT8 batCnt = 0;
UINT32 temperValue = 0; double temperValue = 0;
UIMenuStoreInfo *puiPara = sf_app_ui_para_get(); UIMenuStoreInfo *puiPara = sf_app_ui_para_get();
static UINT32 prePowerDcStatus = 0; static UINT32 prePowerDcStatus = 0;
@ -958,13 +959,13 @@ void sf_battery_level_polling(void)
} }
if(readBatCnt >= 10) if(readBatCnt >= 10)
{ {
_DcVoltageVal = dcTemp / 10; _DcVoltageVal = (UINT32)round(dcTemp / 10);
_TemperAdc = temperValue/10; _TemperAdc = (UINT32)round(temperValue / 10);
if(LibatCnt) if(LibatCnt)
_LiPolymerVoltageVal = LibatTemp / LibatCnt; _LiPolymerVoltageVal = (UINT32)round(LibatTemp / LibatCnt);
if(batCnt) if(batCnt)
_BatVoltageVal = batTemp / batCnt; _BatVoltageVal = (UINT32)round(batTemp / batCnt);
if((_DcVoltageVal > _LiPolymerVoltageVal) && (_DcVoltageVal >= _BatVoltageVal) && (_DcVoltageVal >= SF_DC_IN_VOLATAGE)) if((_DcVoltageVal > _LiPolymerVoltageVal) && (_DcVoltageVal >= _BatVoltageVal) && (_DcVoltageVal >= SF_DC_IN_VOLATAGE))
{ {
@ -1010,7 +1011,7 @@ void sf_battery_level_polling(void)
sf_temper_update(); sf_temper_update();
if(LiPolymerVoltageVal) if(LiPolymerVoltageVal)
{ {
printf("[sf_battery_level_polling]is lith battery\n"); // printf("[sf_battery_level_polling]is lith battery\n");
if(SF_BATT_LI_PACK != puiPara->BatteryType) if(SF_BATT_LI_PACK != puiPara->BatteryType)
{ {
puiPara->LiBatteryType = puiPara->BatteryType; puiPara->LiBatteryType = puiPara->BatteryType;
@ -1093,6 +1094,7 @@ void* sf_battery_check_thread(void *arg)
{ {
//THREAD_ENTRY(); //THREAD_ENTRY();
printf("[%s:%d] s\n", __FUNCTION__, __LINE__); printf("[%s:%d] s\n", __FUNCTION__, __LINE__);
sf_adc_init();
if(sf_is_battery_low(1, 0) == TRUE) if(sf_is_battery_low(1, 0) == TRUE)
{ {

20
code/application/source/sf_app/code/source/commMng/sf_message_queue.c
View File

@ -99,12 +99,22 @@ SINT32 sf_com_message_app_init(void)
} }
SINT32 sf_com_message_recv_from_app(SF_MESSAGE_BUF_S *pMessageBuf) SINT32 sf_com_message_recv_from_app(SF_MESSAGE_BUF_S *pMessageBuf)
{ {
if(sf_msgQueueId == -1)
{
perror("no init sf_msgQueueId");
return 0;
}
return message_queue_recv(sf_msgQueueId,pMessageBuf); return message_queue_recv(sf_msgQueueId,pMessageBuf);
} }
SINT32 sf_com_message_send_to_app(SF_MESSAGE_BUF_S *pMessageBuf) SINT32 sf_com_message_send_to_app(SF_MESSAGE_BUF_S *pMessageBuf)
{ {
pMessageBuf->mtype = 1; pMessageBuf->mtype = 1;
if(sf_msgQueueId == -1)
{
perror("send no init sf_msgQueueId");
return -1;
}
return message_queue_send(sf_msgQueueId,pMessageBuf); return message_queue_send(sf_msgQueueId,pMessageBuf);
} }
@ -114,6 +124,11 @@ SINT32 sf_com_message_cardv_init(void)
} }
SINT32 sf_com_message_recv_from_cardv(SF_MESSAGE_BUF_S *pMessageBuf) SINT32 sf_com_message_recv_from_cardv(SF_MESSAGE_BUF_S *pMessageBuf)
{ {
if(cardv_msgQueueId == -1)
{
perror("no init cardv_msgQueueId");
return -1;
}
return message_queue_recv(cardv_msgQueueId,pMessageBuf); return message_queue_recv(cardv_msgQueueId,pMessageBuf);
} }
@ -122,6 +137,11 @@ SINT32 sf_com_message_send_to_cardv(SF_MESSAGE_BUF_S *pMessageBuf)
pMessageBuf->mtype = 1; pMessageBuf->mtype = 1;
//printf("[%s:%d] cmdId = %#x\n", __FUNCTION__, __LINE__,pMessageBuf->cmdId); //printf("[%s:%d] cmdId = %#x\n", __FUNCTION__, __LINE__,pMessageBuf->cmdId);
//sf_system_cardv_wait_done(); //sf_system_cardv_wait_done();
if(cardv_msgQueueId == -1)
{
perror("send no init cardv_msgQueueId");
return -1;
}
return message_queue_send(cardv_msgQueueId,pMessageBuf); return message_queue_send(cardv_msgQueueId,pMessageBuf);
} }

2
code/application/source/sf_app/code/source/fileMng/sf_file.c
View File

@ -1750,7 +1750,7 @@ BOOL sf_check_auto_thumb_file(VOID)
UINT8 SDSendFalg = 0; UINT8 SDSendFalg = 0;
UINT8 EmmcSendFalg = 0; UINT8 EmmcSendFalg = 0;
printf("%s:%d s\n", __FUNCTION__, __LINE__); // printf("%s:%d s\n", __FUNCTION__, __LINE__);
UIMenuStoreInfo *puiPara = sf_app_ui_para_get(); UIMenuStoreInfo *puiPara = sf_app_ui_para_get();
SF_SRCFILE_ATTR_S* fileCfg = sf_file_thumb_cfg_get(); SF_SRCFILE_ATTR_S* fileCfg = sf_file_thumb_cfg_get();
SendFileTotal = 0; SendFileTotal = 0;

13
code/application/source/sf_app/code/source/paramMng/sf_param_common.c
View File

@ -123,7 +123,7 @@ BOOL sf_check_ota(void)
return ret; return ret;
} }
int sf_UIInfo_GetStrgPartitionInfo(unsigned long long *pPartOfs, unsigned long long *pPartSize, const char* fdt_path) int sf_ui_info_get_strgpartition_info(unsigned long long *pPartOfs, unsigned long long *pPartSize, const char* fdt_path)
{ {
unsigned char *p_fdt = (unsigned char *)fdt_get_base(); unsigned char *p_fdt = (unsigned char *)fdt_get_base();
@ -141,9 +141,10 @@ int sf_UIInfo_GetStrgPartitionInfo(unsigned long long *pPartOfs, unsigned long l
if (nodeoffset < 0) { if (nodeoffset < 0) {
MLOGE("failed to offset for %s = %d \n", fdt_path, nodeoffset); MLOGE("failed to offset for %s = %d \n", fdt_path, nodeoffset);
return -1; return -1;
} else {
MLOGI("offset for %s = %d \n", fdt_path, nodeoffset);
} }
// else {
// MLOGI("offset for %s = %d \n", fdt_path, nodeoffset);
// }
nodep = fdt_getprop(p_fdt, nodeoffset, "reg", &len); nodep = fdt_getprop(p_fdt, nodeoffset, "reg", &len);
if (len == 0 || nodep == NULL) { if (len == 0 || nodep == NULL) {
MLOGE("failed to access reg.\n"); MLOGE("failed to access reg.\n");
@ -374,7 +375,7 @@ int sf_customer_param_load(void)
sectorCnt = (sizeof(UIMenuStoreInfo) / _EMBMEM_BLK_SIZE_) + (sizeof(UIMenuStoreInfo) % _EMBMEM_BLK_SIZE_)? 1 : 0; sectorCnt = (sizeof(UIMenuStoreInfo) / _EMBMEM_BLK_SIZE_) + (sizeof(UIMenuStoreInfo) % _EMBMEM_BLK_SIZE_)? 1 : 0;
ret = sf_UIInfo_GetStrgPartitionInfo(&partition_ofs, &partition_size, PARTITION_PATH_SYS); ret = sf_ui_info_get_strgpartition_info(&partition_ofs, &partition_size, PARTITION_PATH_SYS);
if ((ret == 0) && (sizeof(UIMenuStoreInfo) < partition_size)) { if ((ret == 0) && (sizeof(UIMenuStoreInfo) < partition_size)) {
char sys_mtd_dev_path[128] = {'\0'}; char sys_mtd_dev_path[128] = {'\0'};
@ -903,7 +904,7 @@ void sf_Save_MenuInfo(void)
sectorCnt = (sizeof(UIMenuStoreInfo) / _EMBMEM_BLK_SIZE_) + ((sizeof(UIMenuStoreInfo) % _EMBMEM_BLK_SIZE_)? 1 : 0); sectorCnt = (sizeof(UIMenuStoreInfo) / _EMBMEM_BLK_SIZE_) + ((sizeof(UIMenuStoreInfo) % _EMBMEM_BLK_SIZE_)? 1 : 0);
ret = sf_UIInfo_GetStrgPartitionInfo(&partition_ofs, &partition_size, PARTITION_PATH_SYS); ret = sf_ui_info_get_strgpartition_info(&partition_ofs, &partition_size, PARTITION_PATH_SYS);
if ((ret == 0) && (sizeof(UIMenuStoreInfo) < partition_size)) { if ((ret == 0) && (sizeof(UIMenuStoreInfo) < partition_size)) {
char sys_mtd_dev_path[128] = {'\0'}; char sys_mtd_dev_path[128] = {'\0'};
ret = find_sys_mtd_device(sys_mtd_dev_path, sizeof(sys_mtd_dev_path)); ret = find_sys_mtd_device(sys_mtd_dev_path, sizeof(sys_mtd_dev_path));
@ -1116,7 +1117,7 @@ SINT32 sf_customer_param_save(SF_PDT_PARAM_CFG_S *pSfCustomerPara)
sectorCnt = (sizeof(currentInfo) / _EMBMEM_BLK_SIZE_) + ((sizeof(currentInfo) % _EMBMEM_BLK_SIZE_)? 1 : 0); sectorCnt = (sizeof(currentInfo) / _EMBMEM_BLK_SIZE_) + ((sizeof(currentInfo) % _EMBMEM_BLK_SIZE_)? 1 : 0);
ret = sf_UIInfo_GetStrgPartitionInfo(&partition_ofs, &partition_size, PARTITION_PATH_SYS); ret = sf_ui_info_get_strgpartition_info(&partition_ofs, &partition_size, PARTITION_PATH_SYS);
if ((ret == 0) && (sizeof(currentInfo) < partition_size)) { if ((ret == 0) && (sizeof(currentInfo) < partition_size)) {
char sys_mtd_dev_path[128] = {'\0'}; char sys_mtd_dev_path[128] = {'\0'};
ret = find_sys_mtd_device(sys_mtd_dev_path, sizeof(sys_mtd_dev_path)); ret = find_sys_mtd_device(sys_mtd_dev_path, sizeof(sys_mtd_dev_path));

2
code/application/source/sf_app/code/source/qrcodeMng/sf_qrcode.c
View File

@ -89,7 +89,7 @@ SINT16 sf_qrcode_create(SF_CHAR *pIMEI,SF_CHAR *pSimID ,SF_CHAR* pVersion)
{ {
SINT16 ret = SF_SUCCESS; SINT16 ret = SF_SUCCESS;
SF_CHAR qrsrc_Str[160] = { 0 }; SF_CHAR qrsrc_Str[160] = { 0 };
SF_CHAR qrdst_Str[160] = { 0 }; // SF_CHAR qrdst_Str[160] = { 0 };
char *file_path = sf_root_path_strcat(QR_CODE_NAME); char *file_path = sf_root_path_strcat(QR_CODE_NAME);
if(file_path == NULL) if(file_path == NULL)

52
code/application/source/sf_app/code/source/storeMng/sf_storeMng.c
View File

@ -36,6 +36,9 @@ UINT32 gnFileIdx = 0;
UINT32 gnDirIdx = 0; UINT32 gnDirIdx = 0;
static SF_SD_STATUS_E SdStatus = SF_SD_BUTT; static SF_SD_STATUS_E SdStatus = SF_SD_BUTT;
static SF_SD_STATUS_E EmmcStatus = SF_SD_BUTT;
static SF_SD_STATUS_E ActivityStatus = SF_SD_BUTT;
SF_STRG_DEV *sf_strg_dev = NULL; SF_STRG_DEV *sf_strg_dev = NULL;
void sf_strg_dev_init(void) void sf_strg_dev_init(void)
@ -54,7 +57,7 @@ void sf_strg_dev_uninit(void)
void sf_strg_dev_register(SINT32 dev_id, SINT32 mounted) void sf_strg_dev_register(SINT32 dev_id, SINT32 mounted)
{ {
MLOGD("dev_id:%d mounted:%d\n",dev_id, mounted); // MLOGD("dev_id:%d mounted:%d\n",dev_id, mounted);
if(sf_strg_dev != NULL) if(sf_strg_dev != NULL)
{ {
sf_strg_dev->dev_type = dev_id; sf_strg_dev->dev_type = dev_id;
@ -211,6 +214,17 @@ SINT32 sf_activity_info_get(SF_STORE_ATTR_S *pstoreattrs)
MLOGD("ActiveStorage:Status = %d,Free = %d MB,TotalSize = %d MB\n", pstoreattrs->SDStatus, pstoreattrs->SDFree,pstoreattrs->SDTotalSize); MLOGD("ActiveStorage:Status = %d,Free = %d MB,TotalSize = %d MB\n", pstoreattrs->SDStatus, pstoreattrs->SDFree,pstoreattrs->SDTotalSize);
return SF_SUCCESS; return SF_SUCCESS;
} }
SINT32 sf_activity_is_full(void)
{
SF_STORE_ATTR_S storeattrs = {0};
sf_activity_info_get(&storeattrs);
if(storeattrs.SDStatus != 0)
return storeattrs.SDStatus;
return (storeattrs.SDFree <= SD_WARNING_SPACE)?1:0;
}
SINT32 sf_sd_info_get(SF_STORE_ATTR_S *pstoreattrs) SINT32 sf_sd_info_get(SF_STORE_ATTR_S *pstoreattrs)
{ {
SF_COMM_CHECK_POINTER(pstoreattrs,SF_FAILURE); SF_COMM_CHECK_POINTER(pstoreattrs,SF_FAILURE);
@ -568,8 +582,44 @@ SINT32 sf_sd_status_set(SF_SD_STATUS_E enStatus)
MLOGI("SdStatus:%d\n", SdStatus); MLOGI("SdStatus:%d\n", SdStatus);
return SF_SUCCESS; return SF_SUCCESS;
} }
SF_SD_STATUS_E sf_emmc_status_get(void)
{
//MLOGI("SdStatus:%d\n", SdStatus);
return EmmcStatus;
}
SINT32 sf_emmc_status_set(SF_SD_STATUS_E enStatus)
{
SF_STORE_CHECK_RANGE(enStatus ,SF_SD_OUT, SF_SD_BUTT);
EmmcStatus = enStatus;
MLOGI("EmmcStatus:%d\n", EmmcStatus);
return SF_SUCCESS;
}
SF_SD_STATUS_E sf_activity_status_get(void)
{
//MLOGI("SdStatus:%d\n", SdStatus);
MMC_DEV_TYPE mmc_dev = sf_get_strg_dev();
if(MMC_DEV_EMMC == mmc_dev)
{
return sf_emmc_status_get();
}
else if(MMC_DEV_SD == mmc_dev)
{
return sf_sd_status_get();
}
return ActivityStatus;
}
SINT32 sf_activity_status_set(SF_SD_STATUS_E enStatus)
{
SF_STORE_CHECK_RANGE(enStatus ,SF_SD_OUT, SF_SD_BUTT);
ActivityStatus = enStatus;
MLOGI("ActivityStatus:%d\n", ActivityStatus);
return SF_SUCCESS;
}
// sf_activity
/************************************************* /*************************************************
Function: sf_delete_send_flie_list Function: sf_delete_send_flie_list
Description:del send file list Description:del send file list

69
code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c
View File

@ -2857,18 +2857,18 @@ void sf_wifi_hw_init(void)
{ {
ret = system("modprobe 8189fs"); ret = system("modprobe 8189fs");
} }
else // else
{ // {
ret = system("modprobe 8723du"); // ret = system("modprobe 8723du");
if(ret == 0) // if(ret == 0)
{ // {
printf("Wifi modprobe OK\r\n"); // printf("Wifi modprobe OK\r\n");
} // }
else // else
{ // {
printf("Wifi modprobe ERR\r\n"); // printf("Wifi modprobe ERR\r\n");
} // }
} // }
//sleep(2); //sleep(2);
ret = system("ifconfig lo 127.0.0.1"); ret = system("ifconfig lo 127.0.0.1");
if(ret == 0) if(ret == 0)
@ -3055,3 +3055,48 @@ void sf_wifi_app_start(void)
pthread_create(&tid,NULL,(void*)sf_wifi_sevrer_init,(void *)NULL); pthread_create(&tid,NULL,(void*)sf_wifi_sevrer_init,(void *)NULL);
} }
BOOL sf_system_check_wifi_ko(void)
{
char command[30] = "lsmod | grep 8723du";
FILE *fp = popen(command, "r");
char result[256];
fgets(result, sizeof(result), fp);
pclose(fp);
if (result[0] == '\0') {
MLOGI("rtk_btusb module is not loaded.\n");
return FALSE;
} else {
MLOGI("rtk_btusb module is loaded.\n");
return TRUE;
}
}
int sf_load_wifi_ko(void)
{
int ret = 0;
MLOGI("start.\n");
if (sf_system_check_wifi_ko() == TRUE)
{
return TRUE;
}
ret = system("insmod /lib/custom/lib/modules/4.19.91/kernel/net/wireless/cfg80211.ko");
if(ret == 0)
{
printf("Wifi cfg80211 OK\r\n");
}
else
{
printf("Wifi cfg80211 ERR\r\n");
}
ret = system("insmod /lib/custom/lib/modules/4.19.91/extra/net/rtl8723du/8723du.ko");
if(ret == 0)
{
printf("Wifi rtl8723du OK\r\n");
}
else
{
printf("Wifi rtl8723du ERR\r\n");
}
return ret;
}

5
code/lib/source/sifar/code/include/sf_common.h
View File

@ -159,7 +159,7 @@ UINT32 sf_cardv_para_check_start(void);
UINT32 sf_cardv_para_check_stop(void); UINT32 sf_cardv_para_check_stop(void);
UINT8 sf_get_night_led_flag(void); UINT8 sf_get_night_led_flag(void);
void sf_set_night_led_flag(UINT8 flag); void sf_set_night_led_flag(UINT8 flag);
void sf_cardv_battery_level_update(UINT8 batteryVal); void sf_cardv_battery_level_update(UINT16 batteryVal);
UINT32 sf_cardv_battery_level_get(void); UINT32 sf_cardv_battery_level_get(void);
UINT8 sf_cardv_battery_value_get(void); UINT8 sf_cardv_battery_value_get(void);
UINT8 sf_cardv_battery_type_get(void); UINT8 sf_cardv_battery_type_get(void);
@ -216,4 +216,7 @@ void sf_set_wifi_en(UINT32 cnt);
void sf_set_bt_en(UINT32 cnt); void sf_set_bt_en(UINT32 cnt);
void sf_dev_en(void); void sf_dev_en(void);
BOOL sf_cmd_lpa_test(unsigned char argc, char **argv); BOOL sf_cmd_lpa_test(unsigned char argc, char **argv);
unsigned long sf_usb_insmod_start(void);
int sf_cardv_init_start(void);
void sf_cardv_set_battery_level(unsigned long Val);
#endif #endif

1
code/lib/source/sifar/code/include/sf_mcu.h
View File

@ -413,5 +413,6 @@ void sf_set_ae_night_mode(UINT8 isNightMode);
UINT32 sf_get_send_pic_sieze(void); UINT32 sf_get_send_pic_sieze(void);
void sf_mcu_version_get(UINT8 *mcuVer); void sf_mcu_version_get(UINT8 *mcuVer);
BOOL sf_is_night_mode(BOOL isRefresh); BOOL sf_is_night_mode(BOOL isRefresh);
extern void* sf_usb_insmod_thread(void *arg);
#endif #endif

120
code/lib/source/sifar/code/source/common/sf_common.c
View File

@ -65,8 +65,8 @@
#include "sf_4g_lpa.h" #include "sf_4g_lpa.h"
#include <sf_wifi_svr.h> #include <sf_wifi_svr.h>
#include <sf_log.h> #include <sf_log.h>
#include <sf_storeMng.h> // #include <sf_storeMng.h>
#include "SF_SysStrgMng.h"
BOOL isGoing2PowerOff = FALSE; BOOL isGoing2PowerOff = FALSE;
UINT16 AutoOfftime = 0; UINT16 AutoOfftime = 0;
@ -89,9 +89,9 @@ static UINT8 ModuleUpdating = 0;
static UINT8 FwUpdate = 0; static UINT8 FwUpdate = 0;
static UINT8 IsNightLedOn = 0; static UINT8 IsNightLedOn = 0;
static SF_BatteryLevel_e sf_LatestBattLevel = SF_BATT_LEVEL_0; static SF_BatteryLevel_e sf_LatestBattLevel = SF_BATT_LEVEL_0;
static UINT8 batteryVal = 0; static UINT16 batteryVal = 0;
static UINT16 powerVal = 0; static UINT16 powerVal = 0;
static UINT8 batteryType = 0; static UINT16 batteryType = 0;
static SINT16 fTemper = 0; static SINT16 fTemper = 0;
static SINT16 cTemper = 0; static SINT16 cTemper = 0;
static pthread_cond_t condition; static pthread_cond_t condition;
@ -142,6 +142,18 @@ static SF_THREAD_S LoadParaTskCfg =
.IsRun = 0, .IsRun = 0,
.TskId = -1, .TskId = -1,
}; };
static SF_THREAD_S UsbmodTskCfg =
{
.IsRun = 0,
.TskId = -1,
};
static SF_THREAD_S ShareMemTskCfg =
{
.IsRun = 0,
.TskId = -1,
};
int sf_pir_statu_read(void) int sf_pir_statu_read(void)
{ {
static UINT8 state = 0; static UINT8 state = 0;
@ -1405,6 +1417,7 @@ BOOL sf_cmd_fw_upgrade(unsigned char argc, char **argv)
printf("[%s:%d] s\n", __FUNCTION__, __LINE__); printf("[%s:%d] s\n", __FUNCTION__, __LINE__);
BKG_PostEvent(NVTEVT_BKW_CAMERA_FW_UPGRADE); BKG_PostEvent(NVTEVT_BKW_CAMERA_FW_UPGRADE);
printf("[%s:%d] e\n", __FUNCTION__, __LINE__); printf("[%s:%d] e\n", __FUNCTION__, __LINE__);
return TRUE;
} }
BOOL sf_cmd_switch_esim(unsigned char argc, char **argv) BOOL sf_cmd_switch_esim(unsigned char argc, char **argv)
{ {
@ -2506,7 +2519,7 @@ void sf_set_night_led_flag(UINT8 flag)
Return: N/A Return: N/A
Others: N/A Others: N/A
*************************************************/ *************************************************/
void sf_cardv_battery_level_update(UINT8 batteryVal) void sf_cardv_battery_level_update(UINT16 batteryVal)
{ {
UINT8 batteryLevel = SF_BATT_LEVEL_0; UINT8 batteryLevel = SF_BATT_LEVEL_0;
@ -2790,6 +2803,7 @@ void sf_save_camera_info(void)
void* sf_cardv_wifi_thread(void *arg) void* sf_cardv_wifi_thread(void *arg)
{ {
/*wifi init*/ /*wifi init*/
sf_load_wifi_ko();
UINet_AppIpc_Init(); UINet_AppIpc_Init();
sf_net_wifi_init(NET_AP_MODE, NET_AUTH_WPA2); sf_net_wifi_init(NET_AP_MODE, NET_AUTH_WPA2);
WifiTskCfg.IsRun = 0; WifiTskCfg.IsRun = 0;
@ -3528,14 +3542,15 @@ void sf_set_net_generation(UINT8 value)
void* sf_cardv_load_menu_info_thread(void *arg) void* sf_cardv_load_menu_info_thread(void *arg)
{ {
vos_perf_list_mark(__func__, __LINE__, 0); // vos_perf_list_mark(__func__, __LINE__, 0);
SLOGI("thread run\n"); SLOGI("thread run\n");
LoadParaTskCfg.IsRun = 1; LoadParaTskCfg.IsRun = 1;
Load_MenuInfo(); Load_MenuInfo();
sf_dev_en();
SLOGI("thread end\n"); SLOGI("thread end\n");
LoadParaTskCfg.IsRun = 0; LoadParaTskCfg.IsRun = 0;
vos_perf_list_mark(__func__, __LINE__, 0); // vos_perf_list_mark(__func__, __LINE__, 0);
return NULL; return NULL;
} }
UINT32 sf_cardv_load_menu_info_start(void) UINT32 sf_cardv_load_menu_info_start(void)
@ -3646,6 +3661,8 @@ void sf_dev_en(void)
{ {
UIMenuStoreInfo *puiPara = sf_ui_para_get(); UIMenuStoreInfo *puiPara = sf_ui_para_get();
UINT8 startup = sf_cardv_convert_power_on_mode(); UINT8 startup = sf_cardv_convert_power_on_mode();
BOOL inUsb = GxUSB_GetIsUSBPlug();
printf("[%s:%d] s\n", __FUNCTION__, __LINE__); printf("[%s:%d] s\n", __FUNCTION__, __LINE__);
if(SF_MCU_STARTUP_ONKEY == startup) if(SF_MCU_STARTUP_ONKEY == startup)
@ -3660,7 +3677,7 @@ void sf_dev_en(void)
} }
} }
if((SF_MCU_STARTUP_NORMAL != startup) && (SF_MCU_STARTUP_OFF != startup)) if((TRUE != inUsb) && (SF_MCU_STARTUP_NORMAL != startup) && (SF_MCU_STARTUP_OFF != startup))
{ {
if(puiPara->GprsSwitch) if(puiPara->GprsSwitch)
{ {
@ -3680,3 +3697,90 @@ BOOL sf_cmd_lpa_test(unsigned char argc, char **argv)
return TRUE; return TRUE;
} }
unsigned long sf_usb_insmod_start(void)
{
unsigned long ret = SF_FAILURE;
if(UsbmodTskCfg.IsRun)
{
SLOGE("thread has already run !!!\n");
return SF_FAILURE;
}
UsbmodTskCfg.IsRun = 1;
SLOGI("thread run\n");
ret = pthread_create(&UsbmodTskCfg.TskId, NULL, sf_usb_insmod_thread, NULL);
if(ret != SF_SUCCESS)
{
MLOGD("thread creat fail!\n");
return ret;
}
return SF_SUCCESS;
}
void* sf_cardv_init_thread(void *arg)
{
SLOGI("thread run\n");
ShareMemTskCfg.IsRun = 1;
sf_share_mem_file_init();
if(SF_SUCCESS == sf_com_message_cardv_init())
{
printf("create message successs!!!!\n");
}
if(SF_SUCCESS == sf_com_message_app_init())
{
printf("create cardv message successs!!!!\n");
}
sf_cardv_message_thread_init();
SF_StrgInit();
SLOGI("thread s1\n");
#if USE_MMC_DEV_CHECK
sf_mmc_dev_check_start();
#endif
BOOL inUsb = GxUSB_GetIsUSBPlug();
SF_MESSAGE_BUF_S stMessageBuf = {0};
if(TRUE != inUsb)
{
stMessageBuf.arg1 = SF_MCU_CMD_POWERON;
stMessageBuf.cmdId = CMD_MCU;
sf_com_message_send_to_app(&stMessageBuf);
stMessageBuf.arg1 = SF_DEV_CMD_TEMPER;
stMessageBuf.cmdId = CMD_DEV;
sf_com_message_send_to_app(&stMessageBuf);
}
ShareMemTskCfg.IsRun = 0;
SLOGI("thread end\n");
return NULL;
}
int sf_cardv_init_start(void)
{
int ret = 1;
if(ShareMemTskCfg.IsRun)
{
SLOGE("thread has already run !!!\n");
return 1;
}
ret = pthread_create(&ShareMemTskCfg.TskId, NULL, sf_cardv_init_thread, NULL);
if(ret != SF_SUCCESS)
{
MLOGD("thread creat fail!\n");
return ret;
}
return SF_SUCCESS;
}
void sf_cardv_set_battery_level(unsigned long Val)
{
batteryVal = (Val>>18) & 0x7F;//0~100
batteryType = (Val>>16) & 0x03;
powerVal = Val & 0xFF;
sf_cardv_battery_level_update(batteryVal);
// MLOGI("batteryVal:%d batteryType:%d powerVal:%d p:%d\n",batteryVal, batteryType, powerVal,Val);
}

23
configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S550/make_post.sh
View File

@ -129,6 +129,29 @@ do
fi fi
done done
SF_MV_KO_LIST=(\
/lib/modules/$KERVER/extra/net/rtl8723du/8723du.ko \
/lib/modules/$KERVER/kernel/net/wireless/cfg80211.ko \
)
if [ -d ${ROOTFS_DIR}/rootfs/lib/custom ]; then
echo "remove old rootfs etc/lib/custom"
rm -r ${ROOTFS_DIR}/rootfs/etc/lib/custom
fi
for n in "${SF_MV_KO_LIST[@]}"
do
if [ -f ${ROOTFS_DIR}/rootfs/${n} ]; then
path=$(dirname "${ROOTFS_DIR}/rootfs/lib/custom${n}")
if [ ! -d ${path} ]; then
mkdir -p ${path}
fi
echo "mv ${ROOTFS_DIR}/rootfs/${n} to ${path}/"
mv ${ROOTFS_DIR}/rootfs/${n} ${path}/
${STRIP} -g --strip-unneeded ${ROOTFS_DIR}/rootfs/lib/custom/${n}
fi
done
# static device node # static device node
MAJOR=253 MAJOR=253

2
rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h
View File

@ -945,7 +945,7 @@
#define HUNTING_MCU_UART ENABLE #define HUNTING_MCU_UART ENABLE
#define HUNTING_IR_LED_940 ENABLE #define HUNTING_IR_LED_940 ENABLE
#define SF_EXIF_MN_BUF_SIZE 256 #define SF_EXIF_MN_BUF_SIZE 256
#define SF_BASE_VERSION "7MR5RCwE10D" #define SF_BASE_VERSION "7MR5RCwE10E"
#define DCF_DIR_NAME "MEDIA" /* 100MEDIA */ #define DCF_DIR_NAME "MEDIA" /* 100MEDIA */
#define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */ #define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */
#define SF_EMMC_DCF_FILE_NAME "SYBX" /* SYBX0001.JPG */ #define SF_EMMC_DCF_FILE_NAME "SYBX" /* SYBX0001.JPG */

2
rtos/code/application/source/cardv/SrcCode/System/sys_linuxboot.c
View File

@ -855,7 +855,7 @@ static int make_bootargs(LINUXTMP_PARTITION *p_linuxtmp, unsigned int bootts_beg
// } // }
// } // }
snprintf(PowerOnModeStr, sizeof(PowerOnModeStr), "Mode=%d UpFw=%d mcu=%d sf=%d",sf_get_power_on_mode(), sf_in_update() , sf_in_mcu_update(), sf_battery_level_get()); snprintf(PowerOnModeStr, sizeof(PowerOnModeStr), "Mode=%d UpFw=%d mcu=%d sf=%d",sf_get_power_on_mode(), sf_in_update() , sf_in_mcu_update(), sf_get_battery_level());
linuxboot_set_extra_bootarg(PowerOnModeStr); linuxboot_set_extra_bootarg(PowerOnModeStr);
#endif #endif
p_linuxtmp->bootargs_addr = p_linuxtmp->tmp_curr; p_linuxtmp->bootargs_addr = p_linuxtmp->tmp_curr;

7
rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c
View File

@ -323,7 +323,8 @@ static void MovieFast_ShutDown(void)
#if POWERON_BOOT_REPORT == ENABLE #if POWERON_BOOT_REPORT == ENABLE
DBG_DUMP("PhotoMovie mode = %u\n", mode); DBG_DUMP("PhotoMovie mode = %u\n", mode);
if((TRUE != sf_is_card_full()) || (TRUE != sf_is_emmc_full()))
{
if(mode == DX_HUNTING_MODE_PHOTO_MOVIE){ if(mode == DX_HUNTING_MODE_PHOTO_MOVIE){
MovieFast_PV_Info_Dump(); MovieFast_PV_Info_Dump();
} }
@ -336,6 +337,7 @@ static void MovieFast_ShutDown(void)
} }
vos_perf_list_dump(); vos_perf_list_dump();
}
#endif #endif
@ -1256,6 +1258,7 @@ static void MovieFast_UserEventCb(UINT32 id, MOVIE_USER_CB_EVENT event_id, UINT3
} }
} }
break; break;
/*
case MOVIE_USER_CB_ERROR_CARD_SLOW: case MOVIE_USER_CB_ERROR_CARD_SLOW:
{ {
sf_fastboot_msg_en(ENABLE); sf_fastboot_msg_en(ENABLE);
@ -1278,7 +1281,7 @@ static void MovieFast_UserEventCb(UINT32 id, MOVIE_USER_CB_EVENT event_id, UINT3
sf_fastboot_msg_en(ENABLE); sf_fastboot_msg_en(ENABLE);
DBG_ERR("EVENT %d: card full!\r\n", event_id); DBG_ERR("EVENT %d: card full!\r\n", event_id);
MovieFast_Set_Shutdown_flag(); MovieFast_Set_Shutdown_flag();
} }*/
break; break;
#if 0 #if 0
case MOVIE_USER_CB_EVENT_REC_ONE_SECOND: { case MOVIE_USER_CB_EVENT_REC_ONE_SECOND: {

3
rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c
View File

@ -2318,8 +2318,11 @@ static void PhotoFast_ShutDown(void)
#if HUNTING_CAMERA_BOOT_LINUX /* Boot Linux */ #if HUNTING_CAMERA_BOOT_LINUX /* Boot Linux */
#if POWERON_BOOT_REPORT == ENABLE #if POWERON_BOOT_REPORT == ENABLE
if((TRUE != sf_is_card_full()) || (TRUE != sf_is_emmc_full()))
{
vos_perf_list_dump(); vos_perf_list_dump();
PhotoFast_TriggerFrm_Dump(); PhotoFast_TriggerFrm_Dump();
}
#endif #endif
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
#if SF_TRIGGER_TIME_TEST != ENABLE #if SF_TRIGGER_TIME_TEST != ENABLE

10
rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastSliceEncode.c
View File

@ -2356,11 +2356,11 @@ INT32 PhotoFast_SliceEncode_CB3(void* user_data)
continue; continue;
} }
if(DrvGPIO_GetPhotoMovieModeFromMonitor() == DX_HUNTING_MODE_MOVIE2) // if(DrvGPIO_GetPhotoMovieModeFromMonitor() == DX_HUNTING_MODE_MOVIE2)
{ // {
sf_fastboot_msg_en(ENABLE); // sf_fastboot_msg_en(ENABLE);
DBG_WRN("sf_fastboot_msg_en test\n"); // DBG_WRN("sf_fastboot_msg_en test\n");
} // }
if(queue_ele_in->comm.terminate){ if(queue_ele_in->comm.terminate){
DBG_ERR("abort CB3\n"); DBG_ERR("abort CB3\n");

2
rtos/code/driver/na51089/include/sf_battery.h
View File

@ -28,7 +28,7 @@ UINT32 sf_battery_level_get(void);
void sf_view_osd_battery_draw(UINT8 bShow); void sf_view_osd_battery_draw(UINT8 bShow);
UINT8 sf_battery_value_get(UINT8 nightMode); UINT8 sf_battery_value_get(UINT8 nightMode);
UINT8 sf_battery_type_get(void); UINT8 sf_battery_type_get(void);
UINT32 sf_get_battery_level(void);
BOOL sf_battery_check_init(void); BOOL sf_battery_check_init(void);
void sf_set_need_check_first(void); void sf_set_need_check_first(void);
BOOL sf_is_enough_power_to_update(void); BOOL sf_is_enough_power_to_update(void);

27
rtos/code/driver/na51089/source/mcu/sf_battery.c
View File

@ -977,6 +977,33 @@ void sf_set_night_led_flag(UINT8 flag)
IsNightLedOn = flag; IsNightLedOn = flag;
} }
/*************************************************
Function: sf_battery_type_get
Description: Get battery type.
Input: N/A
Output: N/A
Return: value: battery type, 0:normal 1:LiPolymer
Others: N/A
*************************************************/
UINT16 sf_battery_val_get(void)
{
if(IsPowerDcIn)
return (UINT16)DcVoltageVal;
else if(LiPolymerVoltageVal)
return (UINT16)LiPolymerVoltageVal;
else if(BatVoltageVal)
return (UINT16)BatVoltageVal;
else
return 0;
}
UINT32 sf_get_battery_level(void)
{
UINT32 tmp = ((UINT32) (sf_battery_value_get(sf_get_night_led_flag()) << 18) | (((sf_battery_type_get()) << 16) | (sf_battery_val_get())));
// printf("[%s:%d] tmp:%ld\n", __FUNCTION__, __LINE__, tmp);
return tmp;
}
/************************************************* /*************************************************
Function: sf_battery_level_get Function: sf_battery_level_get
Description: get battery level Description: get battery level

4
rtos/code/driver/na51089/source/mcu/sf_mcu.c
View File

@ -2315,7 +2315,7 @@ void sf_file_thumb_cfg_sava(void)
if(/*fd*/fs) if(/*fd*/fs)
{ {
FileSys_StatFile(fs, &FileStat); FileSys_StatFile(fs, &FileStat);
printf("%s:%d qFileStat:%llu\n", __FUNCTION__, __LINE__, FileStat.uiFileSize); // printf("%s:%d qFileStat:%llu\n", __FUNCTION__, __LINE__, FileStat.uiFileSize);
ret_fs = FileSys_SeekFile(fs, 0, FST_SEEK_END); ret_fs = FileSys_SeekFile(fs, 0, FST_SEEK_END);
@ -2447,7 +2447,7 @@ void sf_add_file_name_to_send_list(char *sendfname, FST_FILE fd)
} }
FileSys_StatFile(fd, &FileStat); FileSys_StatFile(fd, &FileStat);
printf("%s:%d FileStat:%llu\n", __FUNCTION__, __LINE__, FileStat.uiFileSize); // printf("%s:%d FileStat:%llu\n", __FUNCTION__, __LINE__, FileStat.uiFileSize);
//write(fd, buff, SF_SEND_LIST_ITEM_LENGTH); //write(fd, buff, SF_SEND_LIST_ITEM_LENGTH);

4
rtos/code/driver/na51089/source/mcu/sf_sd_common.c
View File

@ -320,11 +320,11 @@ SF_RTOS_ST_MMC_DEV *SF_RtosStrgCheckWorkableDev(void)
} }
DBG_WRN("dev_id = %d!!!\n", workable_dev); // DBG_WRN("dev_id = %d!!!\n", workable_dev);
for(int i = 0; i < 2; i++) for(int i = 0; i < 2; i++)
{ {
sf_rtos_mmc_dev[i]->dev_type = workable_dev; sf_rtos_mmc_dev[i]->dev_type = workable_dev;
DBG_WRN("mount:%d\n", sf_rtos_mmc_dev[i]->moumted_state); // DBG_WRN("mount:%d\n", sf_rtos_mmc_dev[i]->moumted_state);
} }
if(workable_dev == MMC_DEV_NO) if(workable_dev == MMC_DEV_NO)
{ {