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

1.參數優化；2.led優化

Browse Source
This commit is contained in:
payton 2023-08-17 15:11:23 +08:00
parent c609da3722
commit 931c1d8f9a
2 changed files with 52 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -357,52 +357,40 @@ SINT32 sf_app_cq_signal_to_cardv(void)
sf_com_message_send_to_cardv(&stMessageBuf); sf_com_message_send_to_cardv(&stMessageBuf);
return SF_SUCCESS; return SF_SUCCESS;
} }
/*************************************************
Function: sf_signal_led_show
Description: signal led show
Input: signal level
Output: N/A
Return: N/A
Others: N/A
*************************************************/
void sf_signal_led_show(UINT8 signalLevel)
{
if(signalLevel == 0)
sf_sys_status_led_set(SF_LED_SYS_STATE_GPRS_SIGNAL_0);
else if (signalLevel == 1)
sf_sys_status_led_set(SF_LED_SYS_STATE_GPRS_SIGNAL_1);
else if (signalLevel == 2)
sf_sys_status_led_set(SF_LED_SYS_STATE_GPRS_SIGNAL_2);
else if (signalLevel == 3)
sf_sys_status_led_set(SF_LED_SYS_STATE_GPRS_SIGNAL_3);
else
sf_sys_status_led_set(SF_LED_SYS_STATE_GPRS_SIGNAL_4);
}
SINT32 app_led_net_reg_stop(SINT32 s32ret) SINT32 app_led_net_reg_stop(SINT32 s32ret)
{ {
UIMenuStoreInfo *puiPara = sf_app_ui_para_get(); UIMenuStoreInfo *puiPara = sf_app_ui_para_get();
UINT8 netSearchStep = sf_get_netsearch_step(); //UINT8 netSearchStep = sf_get_netsearch_step();
UINT8 signalLevel = 0;
if(sf_get_power_off_flag()){ if(sf_get_power_off_flag()){
return SF_SUCCESS; return SF_SUCCESS;
} }
if(s32ret == SF_SUCCESS) {
UINT8 signalLevel = 0; if(s32ret == SF_4G_ERROR_NO_SIMCARD \
/*if(sf_get_fw_update())
{
sf_sys_status_led_set(SF_LED_SYS_STATE_GPRS_SIGNAL_0);
return SF_SUCCESS;
}*/
sf_4G_signal_level_get(puiPara->NetGeneration,sf_get_cq_signal(),&signalLevel);
MLOGI("signalLevel = %d\n",signalLevel);
sf_app_cq_signal_to_cardv();
if(netSearchStep == GPRS_SEARCH_STEP_LOGIN_FAILED)
{
sf_sys_status_led_set(SF_LED_SYS_STATE_SERVER_FAIL);
}
else
{
switch(signalLevel)
{
case 1:
sf_sys_status_led_set(SF_LED_SYS_STATE_GPRS_SIGNAL_1);
break;
case 2:
sf_sys_status_led_set(SF_LED_SYS_STATE_GPRS_SIGNAL_2);
break;
case 3:
sf_sys_status_led_set(SF_LED_SYS_STATE_GPRS_SIGNAL_3);
break;
case 4:
sf_sys_status_led_set(SF_LED_SYS_STATE_GPRS_SIGNAL_4);
break;
default:
sf_sys_status_led_set(SF_LED_SYS_STATE_GPRS_SIGNAL_0);
break;
}
}
}
else if(s32ret == SF_4G_ERROR_NO_SIMCARD \
|| s32ret == SF_4G_ERROR_NO_SUPPOET \ || s32ret == SF_4G_ERROR_NO_SUPPOET \
|| s32ret == SF_APP_ERROR_NO_SUPPOET \ || s32ret == SF_APP_ERROR_NO_SUPPOET \
|| s32ret == SF_SIM_ERROR_NO_SIMCARD \ || s32ret == SF_SIM_ERROR_NO_SIMCARD \
@ -423,15 +411,19 @@ SINT32 app_led_net_reg_stop(SINT32 s32ret)
//sf_sys_status_led_set(SF_LED_SYS_STATE_SIM_ERROR); //sf_sys_status_led_set(SF_LED_SYS_STATE_SIM_ERROR);
//sf_sys_status_led_set(SF_LED_SYS_STATE_ERROR); //sf_sys_status_led_set(SF_LED_SYS_STATE_ERROR);
} }
else { else if(SUCCESS != sf_get_ftp_open_flag())
sf_sys_status_led_set(SF_LED_SYS_STATE_ERROR);
}
if(SUCCESS != sf_get_ftp_open_flag())
{ {
//sf_sys_status_led_set(SF_LED_SYS_STATE_SEND_FAIL); //sf_sys_status_led_set(SF_LED_SYS_STATE_SEND_FAIL);
sf_sys_status_led_set(SF_LED_SYS_STATE_SERVER_FAIL); sf_sys_status_led_set(SF_LED_SYS_STATE_SERVER_FAIL);
} }
else {
sf_4G_signal_level_get(puiPara->NetGeneration,sf_get_cq_signal(),&signalLevel);
MLOGI("signalLevel = %d\n",signalLevel);
sf_app_cq_signal_to_cardv();
sf_signal_led_show(signalLevel);
}
return SF_SUCCESS; return SF_SUCCESS;
} }
SINT32 app_led_poweroff(void) SINT32 app_led_poweroff(void)

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

@ -1420,6 +1420,14 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam) {
if (s32ret != SF_SUCCESS) { if (s32ret != SF_SUCCESS) {
sf_set_signal_ready_flag(TRUE); sf_set_signal_ready_flag(TRUE);
} }
if (0 != sf_get_cq_signal()) {
pCustomerParam->NeedTimeSyncStartUp = 1;
}
if (pCustomerParam->DailyReportSwitch) {
pCustomerParam->GpsSendFlag = 1; // indicate need send dp file in b power on.
}
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
sf_4G_usb_net_apn_cfg(pfnParam); sf_4G_usb_net_apn_cfg(pfnParam);
sf_USB_net_init(); sf_USB_net_init();
@ -1437,13 +1445,6 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam) {
__FUNCTION__, __LINE__); __FUNCTION__, __LINE__);
sf_set_dr_reset_time_sys_flag(1); sf_set_dr_reset_time_sys_flag(1);
} }
if (0 != sf_get_cq_signal()) {
pCustomerParam->NeedTimeSyncStartUp = 1;
}
if (pCustomerParam->DailyReportSwitch) {
pCustomerParam->GpsSendFlag = 1; // indicate need send dp file in b power on.
}
//sf_dailyReport_set(); //sf_dailyReport_set();
//sf_share_mem_customer_down(1); //sf_share_mem_customer_down(1);
@ -1467,6 +1468,12 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam) {
if (s32ret != SF_SUCCESS) { if (s32ret != SF_SUCCESS) {
sf_set_signal_ready_flag(TRUE); sf_set_signal_ready_flag(TRUE);
} }
if (0 != sf_get_cq_signal()) {
pCustomerParam->GpsSendFlag = 1;
pCustomerParam->NeedTimeSyncStartUp = 1;
// avoid always A mode power on
pCustomerParam->NetWorkNeedSearch = 0;
}
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
sf_4G_usb_net_apn_cfg(pfnParam); sf_4G_usb_net_apn_cfg(pfnParam);
sf_USB_net_init(); sf_USB_net_init();
@ -1480,12 +1487,6 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam) {
open_gps(s32ret); open_gps(s32ret);
} }
if (0 != sf_get_cq_signal()) { if (0 != sf_get_cq_signal()) {
pCustomerParam->GpsSendFlag = 1;
pCustomerParam->NeedTimeSyncStartUp = 1;
// avoid always A mode power on
pCustomerParam->NetWorkNeedSearch = 0;
// printf("[%s:%d]NeedTimeSyncStartUp=%d\n", __FUNCTION__, __LINE__,
// pCustomerParam->NeedTimeSyncStartUp);
if(SUCCESS != sf_connect_ftps_server()){ if(SUCCESS != sf_connect_ftps_server()){
printf("[%s:%d]open ftps fail, reconnect\n", __FUNCTION__, __LINE__); printf("[%s:%d]open ftps fail, reconnect\n", __FUNCTION__, __LINE__);
@ -1498,6 +1499,9 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam) {
break; break;
case SF_MCU_STARTUP_SYN_PARAM: case SF_MCU_STARTUP_SYN_PARAM:
pCustomerParam->NetWorkNeedSearch = 0;
pCustomerParam->NeedTimeSyncStartUp = 0;
s32ret = app_ttyusb_IsOpen(); s32ret = app_ttyusb_IsOpen();
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
@ -1531,8 +1535,6 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam) {
s32ret = sf_file_send_auto(); s32ret = sf_file_send_auto();
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
pCustomerParam->NetWorkNeedSearch = 0;
pCustomerParam->NeedTimeSyncStartUp = 0;
if (sf_get_pic()) { if (sf_get_pic()) {
s32ret = sf_app_to_cardv_capture(); s32ret = sf_app_to_cardv_capture();