From 3560751dcfb3d2982edfb51877036b0df09fa87f Mon Sep 17 00:00:00 2001 From: payton Date: Wed, 22 Nov 2023 17:58:15 +0800 Subject: [PATCH 1/6] =?UTF-8?q?1.gps=E5=8F=91=E9=80=81=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=EF=BC=9B2.=E4=BF=AE=E6=94=B9=E5=8F=91=E9=80=81=E6=A0=87?= =?UTF-8?q?=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/sf_app/code/source/app/sf_service.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/application/source/sf_app/code/source/app/sf_service.c b/code/application/source/sf_app/code/source/app/sf_service.c index 593ba873d..5ed2ed0cb 100755 --- a/code/application/source/sf_app/code/source/app/sf_service.c +++ b/code/application/source/sf_app/code/source/app/sf_service.c @@ -1080,12 +1080,12 @@ static SINT32 app_file_transfer(SF_FN_PARAM_S *pfnParam) { if (sf_usb_IsInsert()) return SF_SUCCESS; - sf_4G_status_set(SF_4G_SENDING); SLOGD("STARTUP:[%d]\n", sf_poweron_type_get()); if (sf_get_cq_signal() == 0) { SLOGD("no csq signal\n"); return SF_SUCCESS; } + sf_4G_status_set(SF_4G_SENDING); switch (sf_poweron_type_get()) { case SF_MCU_STARTUP_OFF: @@ -2150,7 +2150,6 @@ int get_gps_location(void) strcpy(pCustomerParam->Latitude, location.latitude); LogInfo("location.Longitude = %s\n", pCustomerParam->Longitude); LogInfo("location.Latitude = %s\n", pCustomerParam->Latitude); - sf_save_camera_gps_info(); return GPS_GET_SUCCEED; } return GPS_GET_FAILED; @@ -2195,6 +2194,7 @@ void keep_get_gps_location(const SF_GPS_PARAM param) { NET_SLOGI("FristSendDaily:%d\n", puiPara->FristSendDailyAndGps); sf_set_send_gps_txt(1); + sf_save_camera_gps_info(); } } else //if((puiPara->GpsNumber == 1) && (puiPara->GpsSendFlag != 0)) @@ -2340,13 +2340,13 @@ void sf_save_camera_gps_info(void) } memset(temp,'\0', 200); - sprintf(temp, "LATITUDE:%s\r\nLONGITUDE:%s\r\n", puiPara->Latitude, puiPara->Longitude); + snprintf(temp, 200, "LATITUDE:%s\r\nLONGITUDE:%s\r\n", puiPara->Latitude, puiPara->Longitude); printf("[%s:%d] \n%s\n", __FUNCTION__, __LINE__,temp); if(access((char*)SF_CAMERA_GPS_INFO_FILENAME, F_OK) == 0) { - system("rm -rf /mnt/sd/gps.txt"); + system("rm -rf /tmp/gps.txt"); system("sync"); printf("[%s:%d] rm\n", __FUNCTION__, __LINE__); From 2e274f4f7f1cdf56b0eee39a7713b75fb38a1ef6 Mon Sep 17 00:00:00 2001 From: payton Date: Wed, 22 Nov 2023 17:59:16 +0800 Subject: [PATCH 2/6] =?UTF-8?q?1.=E5=8E=BB=E6=8E=89=E4=B8=80=E4=BA=9Blog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/DxInput_Key.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/DxInput_Key.c b/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/DxInput_Key.c index ec816f24a..f2add4af5 100755 --- a/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/DxInput_Key.c +++ b/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/DxInput_Key.c @@ -255,10 +255,10 @@ UINT32 DrvKey_DetNormalKey(void) // sf_set_module_update(1); // } else if((++SendKeyCnt < SendKey_LessCnt) && (!cmdflag)){//shot key - printf("[%s:%d] SendKeyCnt:%d KeyTestPressCnt:%d time: %dms\n", __FUNCTION__, __LINE__, SendKeyCnt, KeyTestPressCnt, time); + //printf("[%s:%d] SendKeyCnt:%d KeyTestPressCnt:%d time: %dms\n", __FUNCTION__, __LINE__, SendKeyCnt, KeyTestPressCnt, time); uiKeyCode |= FLGKEY_SHUTTER2; }else { - printf("[%s:%d] SendKeyCnt:%d KeyTestPressCnt:%d time: %dms\n", __FUNCTION__, __LINE__, SendKeyCnt, KeyTestPressCnt, time); + //printf("[%s:%d] SendKeyCnt:%d KeyTestPressCnt:%d time: %dms\n", __FUNCTION__, __LINE__, SendKeyCnt, KeyTestPressCnt, time); SendKeyCnt = 0; KeyTestPressCnt = 0; From 13de078eaa129dee3ab075f4661efaabf9e061b2 Mon Sep 17 00:00:00 2001 From: payton Date: Wed, 22 Nov 2023 18:02:54 +0800 Subject: [PATCH 3/6] =?UTF-8?q?1.=E5=8F=91=E9=80=81=E9=99=90=E5=88=B6?= =?UTF-8?q?=EF=BC=9B2.rtsp=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c | 7 ++++++- .../cardv/SrcCode/UIApp/Network/UIAppNetwork.c | 17 ++++++++++++++++- .../cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c | 12 +++++++++++- .../UIFlowMovie/UIFlowMovieEventCallback.c | 16 ++++++++-------- .../UIFlowPhoto/UIFlowPhotoEventCallback.c | 16 ++++++++-------- 5 files changed, 49 insertions(+), 19 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c b/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c index 39e10049e..d2b99cb71 100755 --- a/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c +++ b/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c @@ -1455,7 +1455,7 @@ static void MovieExe_UserEventCb(UINT32 id, MOVIE_USER_CB_EVENT event_id, UINT32 #if HUNTING_CAMERA_MCU == ENABLE DBG_IND(" ===== MOVIE_USER_CB_EVENT_CLOSE_FILE_COMPLETED ===== id:%d \r\n", id); UIMenuStoreInfo *puiPara = sf_ui_para_get(); - if(((SF_CAM_MODE_VIDEO2 == puiPara->CamMode) || (SF_CAM_MODE_PHOTO_VIDEO == puiPara->CamMode)) && (id == _CFG_REC_ID_1)) + if(((SF_CAM_MODE_VIDEO2 == puiPara->CamMode) || (SF_CAM_MODE_PHOTO_VIDEO == puiPara->CamMode)) && (id == _CFG_REC_ID_1) && (sf_cardv_get_cq_signal())) { if(SUCCESS == sf_share_mem_file_down(0, 0)){ sf_set_send_statu(TRUE); @@ -3084,6 +3084,11 @@ INT32 MovieExe_OnStrmStart(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray) if (UI_GetData(FL_MOVIE_DATEIMPRINT) == MOVIE_DATEIMPRINT_ON) { MovieExe_WifiMovieStamp(); } + + #if HUNTING_CAMERA_MCU == ENABLE + sf_set_rtsp_flag(1); + #endif + return NVTEVT_CONSUME; } diff --git a/code/application/source/cardv/SrcCode/UIApp/Network/UIAppNetwork.c b/code/application/source/cardv/SrcCode/UIApp/Network/UIAppNetwork.c index 6ec83c52e..2ca350eba 100644 --- a/code/application/source/cardv/SrcCode/UIApp/Network/UIAppNetwork.c +++ b/code/application/source/cardv/SrcCode/UIApp/Network/UIAppNetwork.c @@ -28,8 +28,10 @@ #include //#NT#2018/03/21#Niven Cho -end #endif +#if HUNTING_CAMERA_MCU == ENABLE #include - +#include "sf_common.h" +#endif #define _NETWORK_ON_CPU1_ ENABLE //local debug level: THIS_DBGLVL @@ -1619,6 +1621,7 @@ INT32 sf_net_wifi_init(UINT32 mode, UINT32 security) { UINT32 result = 0; + UINT32 i = 0; nvt_wifi_settings *pwifi = &wifiConfig; DBG_IND("set wifi %d %d \r\n", mode, security); @@ -1648,6 +1651,18 @@ INT32 sf_net_wifi_init(UINT32 mode, UINT32 security) UINet_RtspInit(); sf_wifi_app_start(); + for (i = 0; i < 50; i++) + { + if (1 == sf_get_rtsp_flag()) + { + DBG_IND("wifi config ok\r\n"); + break; + } + else + { + usleep(200*1000); + } + } ImageApp_Common_RtspStart(0); return result; diff --git a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c index f7006d68e..4de5280ec 100755 --- a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c +++ b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c @@ -1927,6 +1927,15 @@ static void PhotoExe_WifiCB(void) HD_VIDEO_FRAME video_frame = {0}; HD_RESULT ret; PHOTO_STRM_INFO *p_strm = NULL; + #if HUNTING_CAMERA_MCU == ENABLE + static int tmp = 1; + if(tmp)//test log + { + tmp = 0; + sf_set_rtsp_flag(1); + printf("[%s:%d]s\n", __FUNCTION__, __LINE__); + } + #endif p_strm = UIAppPhoto_get_StreamConfig(UIAPP_PHOTO_STRM_ID_1); if(p_strm->enable != PHOTO_PORT_STATE_EN_RUN){ vos_util_delay_ms(50); @@ -2132,6 +2141,7 @@ static void PhotoExe_InitNetworkStream(UINT32 dualCam, USIZE *pImageRatioSize) } #endif #if 1 + //printf("\r\n[%s] enable:%d strm_type:%d width_ratio:%d height_ratio:%d width:%d\n", __FUNCTION__, __LINE__,p_strm->enable, p_strm->strm_type, p_strm->multi_view_type, p_strm->width_ratio,p_strm->height_ratio,p_strm->width); for (i = 0; i < SENSOR_CAPS_COUNT; i++) { ImageApp_Photo_WiFiConfig(PHOTO_CFG_CBR_INFO, (UINT32)&(g_tStrmCbrInfo[i])); } @@ -6815,7 +6825,7 @@ INT32 PhotoExe_Preview_SliceEncode_CB3(void* user_data) snprintf(tmp2, sizeof(tmp2), "W%s%s.JPG", folder, number); /* DCF 8.3 naming rule */ DBG_DUMP("PHOTO THUMB %s \n %s\n", tmp, tmp2); sf_file_thumb_cfg_fill(tmp, tmp2, queue_ele_in->jpg_thumb_size, enFileType); - if((SF_CAM_MODE_PHOTO == puiPara->CamMode) || ((!sf_get_mode_flag()) && (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO || puiPara->CamMode == SF_CAM_MODE_VIDEO2))) + if(sf_cardv_get_cq_signal() && ((SF_CAM_MODE_PHOTO == puiPara->CamMode) || ((!sf_get_mode_flag()) && (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO || puiPara->CamMode == SF_CAM_MODE_VIDEO2)))) { if(SUCCESS == sf_share_mem_file_down(0, 0)){ sf_set_send_statu(TRUE); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c index 1e73f6294..f2b277772 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c @@ -1256,7 +1256,7 @@ static void UIFlowMovie_Key(lv_obj_t* obj, uint32_t key) case LV_KEY_ENTER: { #if HUNTING_CAMERA_MCU == ENABLE - sf_rtsp_stop(); + // sf_rtsp_stop(); if(TRUE == sf_get_send_statu()) { printf("\r\n[%s] line:%d %d running\n", __FUNCTION__, __LINE__,key); @@ -1506,13 +1506,13 @@ void UIFlowMovieEventCallback(lv_obj_t* obj, lv_event_t event) { OpenPasswordScreen(); } - #if HUNTING_CAMERA_MCU == ENABLE - UIMenuStoreInfo *puiPara = sf_ui_para_get(); - if((SF_CAM_MODE_VIDEO == puiPara->CamMode)) - { - sf_rtsp_restart(); - } - #endif + // #if HUNTING_CAMERA_MCU == ENABLE + // UIMenuStoreInfo *puiPara = sf_ui_para_get(); + // if((SF_CAM_MODE_VIDEO == puiPara->CamMode)) + // { + // sf_rtsp_restart(); + // } + // #endif break; case LV_PLUGIN_EVENT_SCR_CLOSE: diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c index 5235d3239..1ff4645f1 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c @@ -1572,7 +1572,7 @@ static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key) case LV_KEY_ENTER: { #if HUNTING_CAMERA_MCU == ENABLE - sf_rtsp_stop(); + // sf_rtsp_stop(); if(TRUE == sf_get_send_statu()) { printf("\r\n[%s] line:%d %d running\n", __FUNCTION__, __LINE__,key); @@ -1709,13 +1709,13 @@ void UIFlowPhotoEventCallback(lv_obj_t* obj, lv_event_t event) OpenPasswordScreen(); ShutDownTime = PASSWORD_GO_TO_WORK_MODE_TIME_S; } - #if HUNTING_CAMERA_MCU == ENABLE - UIMenuStoreInfo *puiPara = sf_ui_para_get(); - if((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2)) - { - sf_rtsp_restart(); - } - #endif + // #if HUNTING_CAMERA_MCU == ENABLE + // UIMenuStoreInfo *puiPara = sf_ui_para_get(); + // if((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2)) + // { + // sf_rtsp_restart(); + // } + // #endif break; case LV_PLUGIN_EVENT_SCR_CLOSE: From 6a303efec9d254a97eed199707b89e81aa2dc432 Mon Sep 17 00:00:00 2001 From: payton Date: Wed, 22 Nov 2023 18:05:45 +0800 Subject: [PATCH 4/6] =?UTF-8?q?1.rtsp=E6=A0=87=E8=AF=86=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lib/source/sifar/code/include/sf_common.h | 2 + .../sifar/code/source/common/sf_common.c | 50 +++++++++++++++---- 2 files changed, 43 insertions(+), 9 deletions(-) diff --git a/code/lib/source/sifar/code/include/sf_common.h b/code/lib/source/sifar/code/include/sf_common.h index 7217503ca..f4cfff4f8 100755 --- a/code/lib/source/sifar/code/include/sf_common.h +++ b/code/lib/source/sifar/code/include/sf_common.h @@ -170,4 +170,6 @@ void sf_set_ble_status(SF_BLE_STATUS_E enStatus); BOOL cmd_wifi_switch(unsigned char argc, char **argv); void sf_set_msdc_clk(void); void sf_send_message_to_create_qrcode(void); +UINT8 sf_get_rtsp_flag(void); +void sf_set_rtsp_flag(UINT8 flag); #endif diff --git a/code/lib/source/sifar/code/source/common/sf_common.c b/code/lib/source/sifar/code/source/common/sf_common.c index 7e740de84..cda78ff7c 100755 --- a/code/lib/source/sifar/code/source/common/sf_common.c +++ b/code/lib/source/sifar/code/source/common/sf_common.c @@ -74,7 +74,7 @@ static UINT8 NetWorkFlag = 0; //SF_4G_STATUS_E static UINT8 simCardInsert = 0; static int g_esim_flag = 0; static UINT8 operationSelectResp = 0; //WIFICameraErrCode_t -UINT8 RespFlag = 0; +UINT8 RtspFlag = 0; static BOOL IsMenu = FALSE; static BOOL IsCap = FALSE; static BOOL IsSend = FALSE; @@ -1428,23 +1428,23 @@ BOOL sf_cmd_usb_mux_s(unsigned char argc, char **argv) *************************************************/ void sf_rtsp_stop(void) { - if(0 == RespFlag) + if(0 == RtspFlag) { /*SF_MESSAGE_BUF_S stMessageBuf = {0}; stMessageBuf.arg1 = SF_WIFI_CMD_STOP; stMessageBuf.cmdId = CMD_WIFI; sf_com_message_send_to_cardv(&stMessageBuf);*/ UINT32 tmp = ImageApp_Common_IsRtspStart(0); - printf("[%s:%d] RespFlag = %d tmp:%d\n", __FUNCTION__, __LINE__,RespFlag, tmp); + printf("[%s:%d] RtspFlag = %d tmp:%d\n", __FUNCTION__, __LINE__,RtspFlag, tmp); if(1 == tmp) { //ImageApp_Common_RtspStop(0); - RespFlag = 1; + RtspFlag = 1; } } else { - printf("[%s:%d] RespFlag = %d\n", __FUNCTION__, __LINE__,RespFlag); + printf("[%s:%d] RtspFlag = %d\n", __FUNCTION__, __LINE__,RtspFlag); } } @@ -1458,26 +1458,54 @@ void sf_rtsp_stop(void) *************************************************/ void sf_rtsp_restart(void) { - if(1 == RespFlag) + if(1 == RtspFlag) { /*SF_MESSAGE_BUF_S stMessageBuf = {0}; stMessageBuf.arg1 = SF_WIFI_CMD_RESTART; stMessageBuf.cmdId = CMD_WIFI; sf_com_message_send_to_cardv(&stMessageBuf);*/ UINT32 tmp = ImageApp_Common_IsRtspStart(0); - printf("[%s:%d] RespFlag = %d tmp:%d\n", __FUNCTION__, __LINE__,RespFlag, tmp); + printf("[%s:%d] RtspFlag = %d tmp:%d\n", __FUNCTION__, __LINE__,RtspFlag, tmp); if(tmp == 0) { //ImageApp_Common_RtspStart(0); - RespFlag = 0; + RtspFlag = 0; } } else { - printf("[%s:%d] RespFlag = %d\n", __FUNCTION__, __LINE__,RespFlag); + printf("[%s:%d] RtspFlag = %d\n", __FUNCTION__, __LINE__,RtspFlag); } } +/************************************************* + Function: sf_set_rtsp_flag + Description: + Input: + Output: N/A + Return: N/A + Others: N/A +*************************************************/ +void sf_set_rtsp_flag(UINT8 flag) +{ + RtspFlag = flag; + printf("[%s:%d] RtspFlag = %d\n", __FUNCTION__, __LINE__,RtspFlag); +} + +/************************************************* + Function: sf_get_rtsp_flag + Description: + Input: + Output: N/A + Return: N/A + Others: N/A +*************************************************/ +UINT8 sf_get_rtsp_flag(void) +{ + printf("[%s:%d] RtspFlag = %d\n", __FUNCTION__, __LINE__,RtspFlag); + return RtspFlag; +} + short sf_cardv_get_cq_signal(void) { return cq_Signal; @@ -2512,6 +2540,10 @@ BOOL sf_check_net_work_flag(void) void sf_cardv_4G_status_set(UINT8 status) { NetWorkFlag = status; + // if((SF_4G_SENDING == NetWorkFlag) && (TRUE == sf_get_send_statu())) + // { + // sf_ui_sending_show(FILE_SENDING_GUI_START_SENDING); + // } printf("cardv NetWorkFlag:%d\n",NetWorkFlag); } From 4847a8db9a2d3b57796f3d0792b802619ec87abf Mon Sep 17 00:00:00 2001 From: payton Date: Wed, 22 Nov 2023 18:07:19 +0800 Subject: [PATCH 5/6] =?UTF-8?q?1.=E6=B3=A8=E7=BD=91=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=94=B990s=EF=BC=9B2.=E4=BC=98=E5=8C=96=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/sf_app/code/include/sf_eg91_sim.h | 2 +- .../sf_app/code/source/4gMng/sf_eg91_sim.c | 68 ++++++++++++------- 2 files changed, 44 insertions(+), 26 deletions(-) diff --git a/code/application/source/sf_app/code/include/sf_eg91_sim.h b/code/application/source/sf_app/code/include/sf_eg91_sim.h index f90497a10..b52b28fa8 100755 --- a/code/application/source/sf_app/code/include/sf_eg91_sim.h +++ b/code/application/source/sf_app/code/include/sf_eg91_sim.h @@ -17,7 +17,7 @@ extern "C" { //500ms * 480 = 240s = 4min #define SF_QUECTEL_NET_REG_CALLTIME_MAX 480 #define SF_MODULE_RESET_WAIT_TIME 30 - +#define SF_MODULE_CGREG_TIME_S 90 #define SF_NTP_SITE1 "time.windows.com" #define SF_NTP_SITE2 "time.nist.gov" diff --git a/code/application/source/sf_app/code/source/4gMng/sf_eg91_sim.c b/code/application/source/sf_app/code/source/4gMng/sf_eg91_sim.c index f2f0330f7..ecedf8cc0 100755 --- a/code/application/source/sf_app/code/source/4gMng/sf_eg91_sim.c +++ b/code/application/source/sf_app/code/source/4gMng/sf_eg91_sim.c @@ -2724,12 +2724,15 @@ SINT32 sf_module_complete_init(void) break; case QUECTEL_NETREG_DBGCTL: - eNetRegLocation = QUECTEL_NETREG_QCFG_NTP; - strcpy((char *)gsmPara, "AT+QCFG=\"ntp\",3,5\r"); - ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara)); - SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); - callTime = 0; - ttyData.len = strlen(gsmPara) + 2; + if(strstr((const char *)gsmPara, "ERROR") || strstr((const char *)gsmPara, "OK")) + { + eNetRegLocation = QUECTEL_NETREG_QCFG_NTP; + strcpy((char *)gsmPara, "AT+QCFG=\"ntp\",3,5\r"); + ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara)); + SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); + callTime = 0; + ttyData.len = strlen(gsmPara) + 2; + } break; case QUECTEL_NETREG_QCFG_NTP: @@ -2882,14 +2885,17 @@ SINT32 sf_module_complete_init(void) case QUECTEL_NETREG_CPIN: if(SF_STRNCMP(puiPara->ModuleVer, GPRS_MODULE_TYPE_EG915Q, 6) == 0){ - eNetRegLocation = QUECTEL_NETREG_READY; - strcpy((char *)gsmPara, "AT+CPIN?\r"); - ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara)); - SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); - ttyData.len = strlen(gsmPara) + 2; + if(strstr((const char *)gsmPara, "ERROR") || strstr((const char *)gsmPara, "OK")) + { + eNetRegLocation = QUECTEL_NETREG_READY; + strcpy((char *)gsmPara, "AT+CPIN?\r"); + ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara)); + SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); + ttyData.len = strlen(gsmPara) + 2; + } } else{ - if(strstr((const char *)gsmPara, "OK")) + if(strstr((const char *)gsmPara, "ERROR") || strstr((const char *)gsmPara, "OK")) { eNetRegLocation = QUECTEL_NETREG_READY; strcpy((char *)gsmPara, "AT+CPIN?\r"); @@ -3183,7 +3189,9 @@ SINT32 sf_net_regist_manual(void) { SINT32 ret = SF_SUCCESS; - + SINT64 cTime = 0; + SINT64 eTime = 0; + double elapsed_time = 0; //UINT8 gsmPara[GPRS_INFO_LINE_MAX] = {0}; SF_QUECTEL_NETREG_E eNetRegLocation = QUECTEL_NETREG_FRIST; UINT16 callTime = 0; @@ -3420,7 +3428,6 @@ SINT32 sf_net_regist_manual(void) //sprintf((char *)gsmPara, "AT+RSTSET\r"); //sprintf((char *)gsmPara, "AT+CGREG?\r"); //eNetRegLocation = QUECTEL_NETREG_CGREG; - //callTime = SF_QUECTEL_NET_REG_CALLTIME_MAX; /*4 min*/ sprintf((char *)gsmPara, "%s", "AT+CGDCONT=1,\"IPV4V6\",\"\"\r"); eNetRegLocation = QUECTEL_NETREG_CGDCONT; } @@ -3433,7 +3440,7 @@ SINT32 sf_net_regist_manual(void) { sprintf((char *)gsmPara, "AT+CGREG?\r"); eNetRegLocation = QUECTEL_NETREG_CGREG; - callTime = SF_QUECTEL_NET_REG_CALLTIME_MAX; /*4 min*/ + sf_time(&cTime); } else if(strstr((const char *)puiPara->Sim4gApn, APN_4G_ATT)) { @@ -3484,7 +3491,6 @@ SINT32 sf_net_regist_manual(void) eNetRegLocation = QUECTEL_NETREG_FRIST; //sprintf((char *)gsmPara, "AT+CGREG?\r"); //eNetRegLocation = QUECTEL_NETREG_CGREG; - //callTime = SF_QUECTEL_NET_REG_CALLTIME_MAX; } else { @@ -3498,11 +3504,11 @@ SINT32 sf_net_regist_manual(void) if(strstr((const char *)gsmPara, "OK")) { eNetRegLocation = QUECTEL_NETREG_CGREG; + sf_time(&cTime); strcpy((char *)gsmPara, "AT+CGREG?\r"); ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen((const char *)gsmPara)); SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); - callTime = SF_QUECTEL_NET_REG_CALLTIME_MAX; /*4 min*/ ttyData.cmp = "OK"; ttyData.len = strlen(gsmPara) + 2; } @@ -3544,14 +3550,18 @@ SINT32 sf_net_regist_manual(void) } else { - callTime--; + //callTime--; sprintf((char *)gsmPara, "AT+CGREG?\r"); ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen((const char *)gsmPara)); SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); sf_sleep_ms(300); - - if(callTime == 0) + // time + sf_time(&eTime); + elapsed_time = difftime(eTime, cTime); + // s + //printf("time: %.2f s\n", elapsed_time); + if(elapsed_time > SF_MODULE_CGREG_TIME_S) { if((strstr((const char *)puiPara->Sim4gApn, APNGPRS_WUYUAN1)) || (strstr((const char *)puiPara->Sim4gApn, APNGPRS_WUYUAN2))) { @@ -3608,7 +3618,6 @@ SINT32 sf_net_regist_manual(void) } } - callTime = SF_QUECTEL_NET_REG_CALLTIME_MAX; /*4 min*/ #if MEGA_TEST if(puiPara->MegaTestSwitch == 1) @@ -3627,6 +3636,7 @@ SINT32 sf_net_regist_manual(void) { printf("[%s:%d]:puiPara->OperatorCode:%s,new cimi:%s\n", __FUNCTION__, __LINE__, puiPara->OperatorCode, SimImei); eNetRegLocation = QUECTEL_NETREG_CGREG; //return net reg. + sf_time(&cTime); sprintf((char *)gsmPara, "AT+CGREG?\r"); ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen((const char *)gsmPara)); SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); @@ -3984,6 +3994,9 @@ SINT32 sf_net_regist_manual(void) SINT32 sf_auto_net_reg(void) { SINT32 ret = SF_SUCCESS; + SINT64 cTime = 0; + SINT64 eTime = 0; + double elapsed_time = 0; //UINT8 gsmPara[GPRS_INFO_LINE_MAX] = {0}; SF_QUECTEL_NETREG_E eNetRegLocation = QUECTEL_NETREG_FRIST; UINT16 callTime = 0; @@ -4070,6 +4083,7 @@ SINT32 sf_auto_net_reg(void) { eNetRegLocation = QUECTEL_NETREG_CGREG; strcpy((char *)gsmPara, "AT+CGREG?\r"); + sf_time(&cTime); } else { @@ -4151,9 +4165,9 @@ SINT32 sf_auto_net_reg(void) if(strstr((const char *)puiPara->Sim4gApn, APN_4G_VERIZON)) { - callTime = SF_QUECTEL_NET_REG_CALLTIME_MAX; /*4 min*/ eNetRegLocation = QUECTEL_NETREG_CGREG; strcpy((char *)gsmPara, "AT+CGREG?\r"); + sf_time(&cTime); } else if(strstr((const char *)puiPara->Sim4gApn, APN_4G_ATT)) { @@ -4177,11 +4191,11 @@ SINT32 sf_auto_net_reg(void) if(strstr((const char *)gsmPara, "OK")) { eNetRegLocation = QUECTEL_NETREG_CGREG; + sf_time(&cTime); strcpy((char *)gsmPara, "AT+CGREG?\r"); ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen((const char *)gsmPara)); SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); - callTime = SF_QUECTEL_NET_REG_CALLTIME_MAX; /*4 min*/ ttyData.cmp = "OK"; ttyData.len = strlen(gsmPara) + 2; } @@ -4215,7 +4229,11 @@ SINT32 sf_auto_net_reg(void) sf_sleep_ms(300); - if(callTime == 0) + sf_time(&eTime); + elapsed_time = difftime(eTime, cTime); + // s + //printf("time: %.2f s\n", elapsed_time); + if(elapsed_time > SF_MODULE_CGREG_TIME_S) { if((strstr((const char *)puiPara->Sim4gApn, APNGPRS_WUYUAN1)) || (strstr((const char *)puiPara->Sim4gApn, APNGPRS_WUYUAN2))) { @@ -4274,7 +4292,6 @@ SINT32 sf_auto_net_reg(void) } } - callTime = SF_QUECTEL_NET_REG_CALLTIME_MAX; /*4 min*/ #if MEGA_TEST if(puiPara->MegaTestSwitch == 1) @@ -4293,6 +4310,7 @@ SINT32 sf_auto_net_reg(void) { printf("[%s:%d]:puiPara->OperatorCode:%s,new cimi:%s\n", __FUNCTION__, __LINE__, puiPara->OperatorCode, SimImei); eNetRegLocation = QUECTEL_NETREG_CGREG; //return net reg. + sf_time(&cTime); sprintf((char *)gsmPara, "AT+CGREG?\r"); ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen((const char *)gsmPara)); SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); From d9a008e5f2e44639639f14bc936ca881068d5c74 Mon Sep 17 00:00:00 2001 From: payton Date: Wed, 22 Nov 2023 18:07:46 +0800 Subject: [PATCH 6/6] =?UTF-8?q?1.gps=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h b/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h index d07814849..0a9a13724 100755 --- a/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h +++ b/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h @@ -968,7 +968,7 @@ #define SF_MODULE_UP_FILE_PATH "/mnt/sd/EG915QNA.tar.bz2" #define SF_CAM_UP_FILE "S530.tar.bz2" #define SF_CAM_UP_FILE_PATH "/mnt/sd/S530.tar.bz2" -#define SF_CAMERA_GPS_INFO_FILENAME SF_SD_ROOT"gps.txt" +#define SF_CAMERA_GPS_INFO_FILENAME "/tmp/gps.txt" #define SF_UBOOT_UPDATA_FW ENABLE #ifndef ANR_FUNC