00 00 01 06更新

ookk303
JZsdk_Uart/JZsdk_Uart_Output.c
JZsdk_Uart/JZsdk_Uart_Recv/JZsdk_Uart_RecvDeal_4G.c
JZsdk_Uart/JZsdk_Uart_Recv/JZsdk_Uart_RecvDeal_DEV1.c
JZsdk_Uart/JZsdk_Uart_Recv/JZsdk_Uart_RecvDeal_DEV2.c
JZsdk_Uart/JZsdk_Uart_Send/JZsdk_Uart_Send.c
JZsdk_Uart/JZsdk_Uart_Send/JZsdk_Uart_Send.h
--- a/JZsdk_Uart/JZsdk_Uart_Output.c
查看文件 @d94219c
+++ b/JZsdk_Uart/JZsdk_Uart_Output.c
查看文件 @d94219c
@@ -835,9 +835,6 @@ T_JZsdkReturnCode JZsdl_Uart_ObtainGimbalPitchFineTuning(int DeviceName, int Fra
     // 2、发送到本地处理
     UIcontrol_Obtain_GimbalPitchFineTuninng(DeviceName, pitch);
-
-    // 3、回复操作成功
-    JZsdk_Uart_SendDeal_Reply_Sucesss(DeviceName, FrameSequence);
 }
 /*******************************************************************************************************************************
@@ -996,14 +993,4 @@ int JZsdk_Uart_QuerySecondaryDeviceName(int FrameSequence)
 T_JZsdkReturnCode JZsdk_Uart_ObtainGimbalLinkage(int DeviceName, int FrameSequence, int value)
 {
     T_JZsdkReturnCode ret = UIcontrol_Obtain_GimbalLinkage(DeviceName, value);
-    if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
-    {
-        // 回复操作成功
-        JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence);
-    }
-    else
-    {
-        // 回复操作失败
-        JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence);
-    }
 }
--- a/JZsdk_Uart/JZsdk_Uart_Recv/JZsdk_Uart_RecvDeal_4G.c
查看文件 @d94219c
+++ b/JZsdk_Uart/JZsdk_Uart_Recv/JZsdk_Uart_RecvDeal_4G.c
查看文件 @d94219c
@@ -49,7 +49,7 @@ static int Uart_4G_RecvDeal_AskForConnect(char *getbuf)
     int Device_name = JZsdk_Uart_GetVersionReplay();
     //3、回复连接成功
-    JZsdk_Uart_SendDeal_Send_Connect(UART_4G, Device_name);
+    JZsdk_Uart_SendDeal_Send_Connect(UART_4G, FrameSequence, Device_name);
 }
 /*********
@@ -151,13 +151,13 @@ static int Uart_4G_RecvDeal_RealTimeMP2_Unlimit_transmission(char *getdata, int 
 /*********
  *
- *  语音MP2实时喊话有限传输中
+ *  语音MP2实时喊话定长传输中
  * 
  * 
 **********/
 static int Uart_4G_RecvDeal_RealTimeMP2_Limit_transmission(char *getdata, int len)
 {
-    JZSDK_LOG_INFO("MP2实时喊话有限制传输中\n");
+    JZSDK_LOG_INFO("MP2实时喊话定长制传输中\n");
     T_JZsdkReturnCode ret;
     //提取出数据
@@ -1118,6 +1118,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_OpusTrans_start(char *getbuf)
     //回复操作成功
     JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence); 
 }
+
 /*********
  * 
  *  opus不定长传输
@@ -1732,6 +1733,18 @@ static int Uart_4G_RecvDeal_CheckStatus_WarningLightColor(char *getbuf)
  *          设备相关
  * 
  * *******************************************************************************************************************************/
+static int Uart_4G_RecvDeal_ObtainConnectFrame(char *getbuf)
+{
+    JZSDK_LOG_INFO("收到连接回复帧\n");
+    //获取帧的序列号
+    int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
+
+    //1、通过数据帧2，获取值
+    int value = getbuf[10]; 
+
+    //2、发送到本地处理
+    JZsdl_Uart_ObtainConnectFrame(getbuf, value);
+}
 /*******************************************************************************************************************************
  * 
@@ -2173,8 +2186,6 @@ static int Uart_4G_RecvDeal_ObtainGimbalLinkage(char *getbuf)
     JZsdk_Uart_ObtainGimbalLinkage(UART_4G,FrameSequence,value1);
 }
-
-
 /********************************************************************************************************
 *********                                                                                        ********|
 *********                                                                                        ********|
@@ -2608,6 +2619,11 @@ int Uart_4G_RecvDeal_RecvDeal(int Receive_mode, unsigned char *getdata, int len)
  *          5B类部分
  * 
  * *******************************************************************************************************************************/
+        //收到连接回复帧
+        case JZ_INSCODE_5BFRAME_INITIATECONNECT:
+            Uart_4G_RecvDeal_ObtainConnectFrame(getdata);
+        break;
+
         //回复灯光频率
         case JZ_INSCODE_5BFRAME_CHECKSTATUS_SEARCHLIGHT_FREQUENCY:
             Uart_4G_RecvDeal_ObtainSearchLight_Frequency(getdata);
--- a/JZsdk_Uart/JZsdk_Uart_Recv/JZsdk_Uart_RecvDeal_DEV1.c
查看文件 @d94219c
+++ b/JZsdk_Uart/JZsdk_Uart_Recv/JZsdk_Uart_RecvDeal_DEV1.c
查看文件 @d94219c
@@ -49,7 +49,7 @@ static int Uart_DEV1_RecvDeal_AskForConnect(char *getbuf)
     int Device_name = JZsdk_Uart_GetVersionReplay();
     //3、回复连接成功
-    JZsdk_Uart_SendDeal_Send_Connect(UART_DEV_1, Device_name);
+    JZsdk_Uart_SendDeal_Send_Connect(UART_DEV_1, FrameSequence, Device_name);
     //1、将串口程序设置为连接模式
     JZsdk_Uart_SetMainWorkMode(JZ_FLAGCODE_ON);
@@ -2189,8 +2189,6 @@ static int Uart_DEV1_RecvDeal_ObtainGimbalLinkage(char *getbuf)
     JZsdk_Uart_ObtainGimbalLinkage(UART_DEV_1,FrameSequence,value1);
 }
-
-
 /********************************************************************************************************
 *********                                                                                        ********|
 *********                                                                                        ********|
--- a/JZsdk_Uart/JZsdk_Uart_Recv/JZsdk_Uart_RecvDeal_DEV2.c
查看文件 @d94219c
+++ b/JZsdk_Uart/JZsdk_Uart_Recv/JZsdk_Uart_RecvDeal_DEV2.c
查看文件 @d94219c
@@ -49,7 +49,7 @@ static int Uart_DEV2_RecvDeal_AskForConnect(char *getbuf)
     int Device_name = JZsdk_Uart_GetVersionReplay();
     //3、回复连接成功
-    JZsdk_Uart_SendDeal_Send_Connect(UART_DEV_2, Device_name);
+    JZsdk_Uart_SendDeal_Send_Connect(UART_DEV_2, FrameSequence, Device_name);
 }
 /*********
@@ -151,13 +151,13 @@ static int Uart_DEV2_RecvDeal_RealTimeMP2_Unlimit_transmission(char *getdata, in
 /*********
  *
- *  语音MP2实时喊话有限传输中
+ *  语音MP2实时喊话定长传输中
  * 
  * 
 **********/
 static int Uart_DEV2_RecvDeal_RealTimeMP2_Limit_transmission(char *getdata, int len)
 {
-    JZSDK_LOG_INFO("MP2实时喊话有限制传输中\n");
+    JZSDK_LOG_INFO("MP2实时喊话定长制传输中\n");
     T_JZsdkReturnCode ret;
     //提取出数据
@@ -1118,6 +1118,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_OpusTrans_start(char *getbuf)
     //回复操作成功
     JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence); 
 }
+
 /*********
  * 
  *  opus不定长传输
@@ -1732,6 +1733,18 @@ static int Uart_DEV2_RecvDeal_CheckStatus_WarningLightColor(char *getbuf)
  *          设备相关
  * 
  * *******************************************************************************************************************************/
+static int Uart_DEV2_RecvDeal_ObtainConnectFrame(char *getbuf)
+{
+    JZSDK_LOG_INFO("收到连接回复帧\n");
+    //获取帧的序列号
+    int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
+
+    //1、通过数据帧2，获取值
+    int value = getbuf[10]; 
+
+    //2、发送到本地处理
+    JZsdl_Uart_ObtainConnectFrame(getbuf, value);
+}
 /*******************************************************************************************************************************
  * 
@@ -2173,8 +2186,6 @@ static int Uart_DEV2_RecvDeal_ObtainGimbalLinkage(char *getbuf)
     JZsdk_Uart_ObtainGimbalLinkage(UART_DEV_2,FrameSequence,value1);
 }
-
-
 /********************************************************************************************************
 *********                                                                                        ********|
 *********                                                                                        ********|
@@ -2608,6 +2619,11 @@ int Uart_DEV2_RecvDeal_RecvDeal(int Receive_mode, unsigned char *getdata, int le
  *          5B类部分
  * 
  * *******************************************************************************************************************************/
+        //收到连接回复帧
+        case JZ_INSCODE_5BFRAME_INITIATECONNECT:
+            Uart_DEV2_RecvDeal_ObtainConnectFrame(getdata);
+        break;
+
         //回复灯光频率
         case JZ_INSCODE_5BFRAME_CHECKSTATUS_SEARCHLIGHT_FREQUENCY:
             Uart_DEV2_RecvDeal_ObtainSearchLight_Frequency(getdata);
--- a/JZsdk_Uart/JZsdk_Uart_Send/JZsdk_Uart_Send.c
查看文件 @d94219c
+++ b/JZsdk_Uart/JZsdk_Uart_Send/JZsdk_Uart_Send.c
查看文件 @d94219c
@@ -27,7 +27,7 @@ int JZsdk_Uart_SendDeal_ConnectFrame(int PortNum)
 }
 //回复连接帧
-int JZsdk_Uart_SendDeal_Send_Connect(int Uartport ,int Version_flag)
+int JZsdk_Uart_SendDeal_Send_Connect(int Uartport , int FrameSequence,int Version_flag)
 {
     char sendbuf[256];
     int  send_buf_len;
@@ -37,6 +37,9 @@ int JZsdk_Uart_SendDeal_Send_Connect(int Uartport ,int Version_flag)
     //2、写入硬件码 
     sendbuf[9] = Version_flag;
+
+    //写入帧序列
+    sendbuf[6] = FrameSequence; //帧序列
     //3、发送帧
     JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
--- a/JZsdk_Uart/JZsdk_Uart_Send/JZsdk_Uart_Send.h
查看文件 @d94219c
+++ b/JZsdk_Uart/JZsdk_Uart_Send/JZsdk_Uart_Send.h
查看文件 @d94219c
@@ -21,7 +21,7 @@ extern "C" {
 /* Exported types ------------------------------------------------------------*/
-int JZsdk_Uart_SendDeal_Send_Connect(int Uartport ,int Version_flag);
+int JZsdk_Uart_SendDeal_Send_Connect(int Uartport , int FrameSequence,int Version_flag);
 int JZsdk_Uart_SendDeal_SendOreder(int UartPort  ,char *sendbuf, int len);
 int JZsdk_Uart_SendDeal_ConnectFrame(int PortNum);