diff --git a/code/application/source/cardv/SrcCode/System/main.c b/code/application/source/cardv/SrcCode/System/main.c index 247b6b35f..4bb0cd825 100755 --- a/code/application/source/cardv/SrcCode/System/main.c +++ b/code/application/source/cardv/SrcCode/System/main.c @@ -339,7 +339,7 @@ UINT8 sf_cardv_check_power_on_mode(void) UINT8 startup = 0; UINT8 UpFw = 0; UINT8 Upmcu = 0; - UINT8 sftmp = 0; + unsigned long sftmp = 0; system("cat /proc/cmdline > /tmp/Mode.txt"); fp = fopen("/tmp/Mode.txt","r"); @@ -377,8 +377,10 @@ UINT8 sf_cardv_check_power_on_mode(void) temp = strstr(pStrSrc, pStrSF); if ( temp != NULL) { temp += strlen("sf="); - sscanf(temp, "%hhd", &sftmp); - sf_cardv_battery_level_set(sftmp); + // sscanf(temp, "%hhd", &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); free(pStrSrc); @@ -398,6 +400,7 @@ int NvtMain(void) #if HUNTING_CAMERA_MCU == ENABLE sf_cardv_check_power_on_mode(); sf_cardv_load_menu_info_start(); + sf_cardv_init_start(); #endif System_InstallID(); #if (USB_MODE==ENABLE) @@ -434,7 +437,7 @@ int NvtMain(void) #if HUNTING_CAMERA_MCU == ENABLE sf_log_Level_set(SF_LOG_LEVEL_DEBUG); //sf_cardv_check_power_on_mode(); - BOOL inUsb = GxUSB_GetIsUSBPlug(); + // BOOL inUsb = GxUSB_GetIsUSBPlug(); // if(TRUE == inUsb)//(!sf_gpio_get_status(GPIO_INT_USBPLUGIN)) // { // sf_usb_mux_s(0); @@ -442,44 +445,43 @@ int NvtMain(void) // } #if HUNTING_CAMERA_4G == ENABLE - sf_share_mem_file_init(); - /*if (cardv_message_queue_init()) - { - printf("cardv initial message queue error!\n"); - exit(1); - }*/ - 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(); -#if USE_MMC_DEV_CHECK - sf_mmc_dev_check_start(); -#endif - SF_MESSAGE_BUF_S stMessageBuf = {0}; + // sf_share_mem_file_init(); + // /*if (cardv_message_queue_init()) + // { + // printf("cardv initial message queue error!\n"); + // exit(1); + // }*/ + // 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(); +// #if USE_MMC_DEV_CHECK +// sf_mmc_dev_check_start(); +// #endif + // SF_MESSAGE_BUF_S stMessageBuf = {0}; /*if(!sf_gpio_get_status(GPIO_KEY_TEST)){ sf_set_fw_update(1);//update }*/ - if(TRUE != inUsb) - { - stMessageBuf.arg1 = SF_MCU_CMD_POWERON; - stMessageBuf.cmdId = CMD_MCU; - sf_com_message_send_to_app(&stMessageBuf); + // 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_BAT; - // stMessageBuf.cmdId = CMD_DEV; - // sf_com_message_send_to_app(&stMessageBuf); + // // stMessageBuf.arg1 = SF_DEV_CMD_BAT; + // // stMessageBuf.cmdId = CMD_DEV; + // // sf_com_message_send_to_app(&stMessageBuf); - stMessageBuf.arg1 = SF_DEV_CMD_TEMPER; - stMessageBuf.cmdId = CMD_DEV; - 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 sf_mcu_init(); sf_get_power_on_mode();