修改注册函数

Drivers/Business/PumpBusiness.c

@@ -21,7 +21,7 @@ uint8_t Business_time_flag = 0;
 uint32_t Business_timer_ms = 0;
 uint32_t Business_wait_time = 1200; // 秒
 uint8_t resend_counter = 0;//nb失败重发标志
-uint8_t send_data_switch = 1; // 发送数据的开关，0表示发送数据
+uint8_t send_data_switch = 0; // 发送数据的开关，0表示发送数据
 uint8_t networkTest_Flag=0;//开机判断是否有信号，1有信号，0无信号。
 static struct Pump_Params pump_params; // 泵参数
 uint8_t test_switch=1; //0代表正常流程，1代表测试流程

Drivers/LowPower.c

@@ -124,6 +124,7 @@ void Power_Handle(void)
 	{
 		case STEP_START: // 开始
 			pownext_step(STEP_EXIT_SLEEP);
+		   query_cgreg_times = 0; // 查询网络状态的次数
 			break;
 		case STEP_EXIT_SLEEP: // 退出休眠
 			ec800m.exit_sleep();

Drivers/Regist.c

@@ -259,24 +259,20 @@ uint8_t regist_Handle()
  ec800m.exit_sleep();//退出休眠
  delay_ms(10);
   result=ec800m.set_sleep_sync(1);//设置休眠模式
-  if(result==Result_Failed)
+  if(result==Result_Success)
  {
-   return 0;
+   result=ec800m.set_cfun_sync(1);//设置全功能模式
  }
-  result=ec800m.set_cfun_sync(1);//设置全功能模式
+  
  
-  if(result==Result_Failed)
+  if(result==Result_Success)
  {
-   return 0;
+   result=ec800m.set_cgreg_sync(2);//设置网络状态
  }
-    result=ec800m.set_cgreg_sync(2);//设置网络状态
-  if(result==Result_Failed)
+   
+  if(result==Result_Success)
  {
-   return 0;
- }
-  
- 
-for(int i=0;i<20;i++){
+   for(int i=0;i<20;i++){
  delay_ms(400);
 result=ec800m.query_cgreg_sync(&regist_result,&stat,&lac,&ci);//循环查询网络状态最多20次
 	if(stat==1)
@@ -284,65 +280,62 @@ result=ec800m.query_cgreg_sync(&regist_result,&stat,&lac,&ci);//循
 	
 	}
 }
-
-  if(result==Result_Failed)
- {
-   return 0;
  }
-   if(stat==0)
+  
+ 
+
+
+  if(result==Result_Success&&stat==1)
  {
-	  Log_Printf_Debug(" stat=%d\r\n", stat);
-   return 0;
- }
-  //tcp连接流程
+    //tcp连接流程
   result=ec800m.open_socket_sync(tcpconnectID,"TCP",REGIST_SERVER,REGIST_PORT,1,&err);//连接tcp
-  if(result==Result_Failed)
- {
-	Log_Printf_Debug(" result=%d\r\n", result);
-   return 0;
  }
+
+ 
  
- if(result==Result_Failed)
+ if(result==Result_Success)
  {
-   return 0;
+    result =(enum Result)packRegistDataAnd(&length);//数据打包
+	 Log_Printf_Debug("data length=%d\r\n", length);
  }
-  result =(enum Result)packRegistDataAnd(&length);//数据打包
-  Log_Printf_Debug("data length=%d\r\n", length);
-   if(result==Result_Failed)
+ 
+  
+   if(result==Result_Success)
  {
-   return 0;
+    result = ec800m.set_qisde_sync(0);//关闭回显
  }
- result = ec800m.set_qisde_sync(0);//关闭回显
-   if(result==Result_Failed)
+
+   if(result==Result_Success)
  {
-   return 0;
+   result =ec800m.send_sync(tcpconnectID,(uint8_t *)registData,length);//数据发送
  }
- result =ec800m.send_sync(tcpconnectID,(uint8_t *)registData,length);//数据发送
-    if(result==Result_Failed)
+
+    if(result==Result_Success)
  {
-   return 0;
+   result =analysis_recvdata();
  }
 
-   result =analysis_recvdata();
-    if(result==Result_Failed)
+   
+    if(result==Result_Success)
  {
-   return 0;
+   result=ec800m.close_socket_sync(tcpconnectID);//断开tcp连接
  }
  
- result=ec800m.close_socket_sync(tcpconnectID);//断开tcp连接
-  if(result==Result_Failed)
- {
-   return 0;
- }
-  result=ec800m.set_cfun_sync(0);//设置最小功能模式
  
-  if(result==Result_Failed)
- {
-   return 0;
- }
+
+ ec800m.set_cfun_sync(0);//设置最小功能模式
+ 
+
 
  ec800m.enter_sleep();//进入休眠状态
-  return 1;
+   if(result==Result_Success)
+ {
+   return 1;
+ }
+ else
+{
+  return 0;
+ }
 }
 
 #endif