From abb834c296ca371edfd291a6f1d54c20f4794373 Mon Sep 17 00:00:00 2001
From: payton <payton@willfine.com>
Date: Wed, 29 Nov 2023 14:50:43 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E6=B3=A8=E7=BD=91=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=EF=BC=9B2.=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

---
 .../sf_app/code/source/4gMng/sf_eg91_sim.c    | 23 +++++++++----------
 .../source/sf_app/code/source/4gMng/sf_ftp.c  |  1 -
 2 files changed, 11 insertions(+), 13 deletions(-)

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 ecedf8cc0..06b8c4f7c 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
@@ -2419,9 +2419,7 @@ SINT32 sf_module_complete_init(void)
                     ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
                     SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
                     callTime = 0;
-                    //ttyData.cmp = "OK";
-                    ttyData.len = 21;
-                    //sf_sleep_ms(50);
+                    ttyData.len = 255;//Must wait for OK or error.
                 }
                 else if(strstr((const char *)gsmPara, "CME ERROR: SIM not inserted"))
                 {
@@ -2434,13 +2432,13 @@ SINT32 sf_module_complete_init(void)
                 }
                 else
                 {
-                    sf_sleep_ms(800);
+                    //sf_sleep_ms(800);
                     strcpy((char *)gsmPara, "ATE1\r");
                     ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
                     //printf("ttyRet:%d\n", ttyRet);
                     SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
                     //ttyData.cmp = "ATE1";
-                    ttyData.len = strlen(gsmPara) + 2;
+                    ttyData.len = 255;//Must wait for OK or error.
                 }
 
                 break;
@@ -2486,7 +2484,7 @@ SINT32 sf_module_complete_init(void)
                         SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
                         callTime = 0;
                         ttyData.cmp = "Revision";
-                        ttyData.len = 20;
+                        ttyData.len = 255;//Must wait for OK or error.
                     }
                     else
                     {
@@ -2545,7 +2543,7 @@ SINT32 sf_module_complete_init(void)
                     SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
                     callTime = 0;
                     ttyData.cmp = "OK";
-                    ttyData.len = strlen(gsmPara) + 2;
+                    ttyData.len = 255;//Must wait for OK or error.
                 }
                 else
                 {
@@ -2594,7 +2592,7 @@ SINT32 sf_module_complete_init(void)
                     ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
                     SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
                     ttyData.cmp = "OK";
-                    ttyData.len = strlen(gsmPara) + 2;
+                    ttyData.len = 255;//Must wait for OK or error.
                 }
                 else
                 {
@@ -2618,7 +2616,7 @@ SINT32 sf_module_complete_init(void)
                     strcpy((char *)gsmPara, "AT+QSIMSTAT?\r");
                     ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
                     SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
-                    ttyData.len = strlen(gsmPara) + 2;
+                    ttyData.len = 255;//Must wait for OK or error.
                 }
                 else
                 {
@@ -2678,7 +2676,7 @@ SINT32 sf_module_complete_init(void)
                     ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
                     SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
                     callTime = 0;
-                    ttyData.len = strlen(gsmPara) + 2;
+                    ttyData.len = 255;//Must wait for OK or error.
                 }
                 else if((strstr((const char *)gsmPara, "+QSIMSTAT: 0,2")))
                 {
@@ -4033,7 +4031,7 @@ SINT32 sf_auto_net_reg(void)
                     ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
 					SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
 					eNetRegLocation = QUECTEL_NETREG_QSIMSTAT;
-                    ttyData.len = strlen(gsmPara) + 2;
+                    ttyData.len = 255;//Must wait for OK or error.
 				}
 				else if(strstr((const char *)gsmPara, "ERROR"))
 				{
@@ -4048,7 +4046,7 @@ SINT32 sf_auto_net_reg(void)
 					strcpy((char *)gsmPara, "ATE1\r");
 					ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen((const char *)gsmPara));
 					SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
-                    ttyData.len = strlen(gsmPara) + 2;
+                    ttyData.len = 255;//Must wait for OK or error.
 				}
 
 				break;
@@ -5280,6 +5278,7 @@ void sf_4g_module_sleep(void)
 	}
 
 	sf_sim_qsclk(1);
+    sf_usb_mux_s(0);
 	return;
 }
 
diff --git a/code/application/source/sf_app/code/source/4gMng/sf_ftp.c b/code/application/source/sf_app/code/source/4gMng/sf_ftp.c
index 40787e187..16050cc0f 100755
--- a/code/application/source/sf_app/code/source/4gMng/sf_ftp.c
+++ b/code/application/source/sf_app/code/source/4gMng/sf_ftp.c
@@ -2214,7 +2214,6 @@ SINT32 sf_low_power_warn_send_ftp(void)
     
 	if(SUCCESS != sf_create_low_power_warn_file())
 	{
-		MLOGD("err\n");
 		return SF_FAILURE;
 	}
     MLOGD("start\n");