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:
payton 2024-02-01 18:17:32 +08:00
commit 807289b22f
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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;
} }

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;