1.修复获取电池信息错误;2.调整手动模式时直接开启wifi
This commit is contained in:
parent
21f00d2f8d
commit
ef86747daa
|
@ -1171,7 +1171,7 @@ BOOL sf_cmd_mcu_power_on_para_get(unsigned char argc, char **argv)
|
|||
SF_MESSAGE_BUF_S stMessageBuf = {0};
|
||||
stMessageBuf.arg1 = SF_MCU_CMD_POWERON;
|
||||
stMessageBuf.cmdId = CMD_MCU;
|
||||
sf_com_message_send_to_cardv(&stMessageBuf);
|
||||
sf_com_message_send_to_app(&stMessageBuf);
|
||||
printf("[%s:%d] e\n", __FUNCTION__, __LINE__);
|
||||
|
||||
return TRUE;
|
||||
|
@ -1226,7 +1226,7 @@ UINT32 sf_set_pir_sensitivity(UINT8 pirs)
|
|||
puiPara->DigitPirSensitivity = digPirLevel[pirs];
|
||||
puiPara->DigitPirCnt = digPirCount[pirs];
|
||||
puiPara->DigitPirWindowTime = 0;
|
||||
#if SF_IQ_TEST == DISABLE
|
||||
#if SF_IS_RELEASE == ENABLE
|
||||
if(puiPara->PirSensitivity)
|
||||
{
|
||||
puiPara->TimelapseSwitch = SF_OFF;
|
||||
|
@ -1577,9 +1577,9 @@ static const SF_CHAR* sf_process_message_getstatusstring(SF_MESSAGE_TYPE_E enTyp
|
|||
case CMD_GPRS:
|
||||
return "CMD_GPRS";
|
||||
case CMD_WIFI:
|
||||
return "CMD_GPRS";
|
||||
return "CMD_WIFI";
|
||||
case CMD_DEV:
|
||||
return "CMD_GPRS";
|
||||
return "CMD_DEV";
|
||||
default:
|
||||
return "Unknown";
|
||||
}
|
||||
|
@ -1598,6 +1598,18 @@ static SINT32 sf_cardv_proccess_cmd_mcu(SF_MESSAGE_BUF_S *pMessageBuf)
|
|||
case SF_MCU_CMD_MCU_VER:
|
||||
sf_set_mcu_sub_ver(pMessageBuf->arg2);
|
||||
sf_set_mcu_ver(pMessageBuf->arg3);
|
||||
|
||||
if(sf_get_mode_flag())
|
||||
{
|
||||
GOIO_Turn_Onoff_IRCUT(1);
|
||||
|
||||
/*wifi init*/
|
||||
//stMessageBuf.arg1 = SF_WIFI_CMD_START;
|
||||
//stMessageBuf.cmdId = CMD_WIFI;
|
||||
//sf_com_message_send_to_cardv(&stMessageBuf);
|
||||
UINet_AppIpc_Init();
|
||||
sf_net_wifi_init(NET_AP_MODE, NET_AUTH_WPA2);
|
||||
}
|
||||
break;
|
||||
case SF_MCU_CMD_MCU_RTC:
|
||||
|
||||
|
@ -1808,9 +1820,11 @@ static SINT32 sf_cardv_proccess_cmd_dev(SF_MESSAGE_BUF_S *pMessageBuf)
|
|||
sf_com_message_send_to_app(&stMessageBuf);
|
||||
break;
|
||||
case SF_DEV_CMD_BAT:
|
||||
batteryVal = stMessageBuf.arg2;
|
||||
batteryType = stMessageBuf.arg3;
|
||||
batteryVal = pMessageBuf->arg2;
|
||||
batteryType = pMessageBuf->arg3;
|
||||
sf_cardv_battery_level_update(batteryVal);
|
||||
MLOGI("batteryVal:%d batteryType:%d\n",batteryVal,batteryType);
|
||||
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
Loading…
Reference in New Issue
Block a user