uart底层优化,opus优化,心跳帧优化，升级模块增加,osal层增加，hal层增加，日志层修改逻辑

@@ -135,11 +135,18 @@ int Main_Device_Wheather_Use()
 
 T_JZsdkReturnCode Main_APP_Psdk()
 {
+    int value[5] = {0, 0, 0, 0, 0};
+
     //sdklib加载
     JZsdk_LibInit();
 
+    //hal加载
+    JZsdk_Hal_Init();
+
     JZSDK_LOG_INFO("%x,PsdkVersion%x.%x.%x.%x\n",DEVICE_VERSION,MAJOR_VERSION, MINOR_VERSION, MODIFY_VERSION, DEBUG_VERSION);
 
+    CommonMod_Init();
+
     //引脚初始化
     Ircut_Init();
 
@@ -163,10 +170,12 @@ T_JZsdkReturnCode Main_APP_Psdk()
     if (DEVICE_VERSION == TF_A1)
     {
         //串口设备1初始化
-        //JZsdk_HalPort_Init_WithDefault(UART_DEV_1);
+        //value[0] = UART_DEV1_BITRATE;
+        //JZsdk_HalPort_Init(UART_DEV_1, value);
 
         //串口设备2初始化
-        JZsdk_HalPort_Init_WithDefault(UART_DEV_2);
+        value[0] = UART_DEV2_BITRATE;
+        JZsdk_HalPort_Init(UART_DEV_2, value);
 
         //喊话器初始化
         Megaphone_Init();    
@@ -186,19 +195,22 @@ T_JZsdkReturnCode Main_APP_Psdk()
     else if (DEVICE_VERSION == JZ_H1E)
     {
         //串口设备1初始化
-        //JZsdk_HalPort_Init_WithDefault(UART_DEV_1);
+        //value[0] = UART_DEV1_BITRATE;
+        //JZsdk_HalPort_Init(UART_DEV_1, value);
 
         //喊话器初始化
-        Megaphone_Init(JZ_MODULE_CONTROL_WAY_INDEPENDENT);
+        Megaphone_Init();
     }
 
     else if (DEVICE_VERSION == JZ_H1T)
     {
         //串口设备1初始化
-        //JZsdk_HalPort_Init_WithDefault(UART_DEV_1);
+        //value[0] = UART_DEV1_BITRATE;
+        //JZsdk_HalPort_Init(UART_DEV_1, value);
 
         //4g设备初始化
-        JZsdk_HalPort_Init_WithDefault(UART_4G);
+        value[0] = COMM_4G_UART_BITRATE;
+        JZsdk_HalPort_Init(UART_DEV_1, value);
 
         //喊话器初始化
         Megaphone_Init();
@@ -210,12 +222,14 @@ T_JZsdkReturnCode Main_APP_Psdk()
     else if (DEVICE_VERSION == JZ_H150S || DEVICE_VERSION == JZ_H150T)
     {
         //串口设备1初始化
-       // JZsdk_HalPort_Init_WithDefault(UART_DEV_1);
+        //value[0] = UART_DEV1_BITRATE;
+        //JZsdk_HalPort_Init(UART_DEV_1, value);
 
         if (DEVICE_VERSION == JZ_H150T)
         {
             //4g设备初始化
-            JZsdk_HalPort_Init_WithDefault(UART_4G);
+            value[0] = COMM_4G_UART_BITRATE;
+            JZsdk_HalPort_Init(UART_DEV_1, value);
         }
 
         //喊话器初始化
@@ -231,7 +245,8 @@ T_JZsdkReturnCode Main_APP_Psdk()
     else if (DEVICE_VERSION == JZ_H10)
     {
         //串口设备1初始化
-       // JZsdk_HalPort_Init_WithDefault(UART_DEV_1);
+        //value[0] = UART_DEV1_BITRATE;
+        //JZsdk_HalPort_Init(UART_DEV_1, value);
 
         //喊话器初始化
         Megaphone_Init();
@@ -243,10 +258,12 @@ T_JZsdkReturnCode Main_APP_Psdk()
     else if (DEVICE_VERSION == JZ_H10T)
     {
         //串口设备1初始化
-        //JZsdk_HalPort_Init_WithDefault(UART_DEV_1);
+        //value[0] = UART_DEV1_BITRATE;
+        //JZsdk_HalPort_Init(UART_DEV_1, value);
 
         //4g设备初始化
-        JZsdk_HalPort_Init_WithDefault(UART_4G);
+        value[0] = COMM_4G_UART_BITRATE;
+        JZsdk_HalPort_Init(UART_DEV_1, value);
 
         //喊话器初始化
         Megaphone_Init();
@@ -258,10 +275,12 @@ T_JZsdkReturnCode Main_APP_Psdk()
     else if (DEVICE_VERSION == JZ_U3)
     {
         //串口设备1初始化
-        //JZsdk_HalPort_Init_WithDefault(UART_DEV_1);
+        //value[0] = UART_DEV1_BITRATE;
+        //JZsdk_HalPort_Init(UART_DEV_1, value);
 
         //串口设备2初始化
-        JZsdk_HalPort_Init_WithDefault(UART_DEV_2);
+        value[0] = UART_DEV2_BITRATE;
+        JZsdk_HalPort_Init(UART_DEV_2, value);
 
         //喊话器初始化
         Megaphone_Init();    
@@ -281,10 +300,12 @@ T_JZsdkReturnCode Main_APP_Psdk()
     else if (DEVICE_VERSION == JZ_U3S)
     {
         //串口设备1初始化
-        //JZsdk_HalPort_Init_WithDefault(UART_DEV_1);
+        //value[0] = UART_DEV1_BITRATE;
+        //JZsdk_HalPort_Init(UART_DEV_1, value);
 
         //串口设备2初始化
-        JZsdk_HalPort_Init_WithDefault(UART_DEV_2);
+        value[0] = UART_DEV2_BITRATE;
+        JZsdk_HalPort_Init(UART_DEV_2, value);
 
         //喊话器初始化
         Megaphone_Init();    
@@ -307,10 +328,12 @@ T_JZsdkReturnCode Main_APP_Psdk()
     else if (DEVICE_VERSION == JZ_U3D)
     {
         //串口设备1初始化
-        //JZsdk_HalPort_Init_WithDefault(UART_DEV_1);
+        //value[0] = UART_DEV1_BITRATE;
+        //JZsdk_HalPort_Init(UART_DEV_1, value);
 
         //串口设备2初始化
-        JZsdk_HalPort_Init_WithDefault(UART_DEV_2);
+        value[0] = UART_DEV2_BITRATE;
+        JZsdk_HalPort_Init(UART_DEV_2, value);
 
         //喊话器初始化
         Megaphone_Init();    
@@ -330,10 +353,12 @@ T_JZsdkReturnCode Main_APP_Psdk()
     else if (DEVICE_VERSION == JZ_U30)
     {
         //串口设备1初始化
-        //JZsdk_HalPort_Init_WithDefault(UART_DEV_1);
+        //value[0] = UART_DEV1_BITRATE;
+        //JZsdk_HalPort_Init(UART_DEV_1, value);
 
         //串口设备2初始化
-        JZsdk_HalPort_Init_WithDefault(UART_DEV_2);
+        value[0] = UART_DEV2_BITRATE;
+        JZsdk_HalPort_Init(UART_DEV_2, value);
 
         //喊话器初始化
         Megaphone_Init();    
@@ -361,7 +386,7 @@ T_JZsdkReturnCode Main_APP_Psdk()
     JZSDK_WidgetMgMT_Init();
 
     //初始化app模式
-    JZsdk_Set_Psdk_UIcontrol_UseFlag(1);
+    JZsdk_HalPort_SetUseFlag(DEVICE_PSDK ,JZ_FLAGCODE_ON);
 
     Main_WorkModeSet(JZ_FLAGCODE_ON);
     
@@ -371,11 +396,18 @@ T_JZsdkReturnCode Main_APP_Psdk()
 
 int Main_APP_Uart()
 {
+    int value[5] = {0, 0, 0, 0, 0};
+
     //lib库初始化
     JZsdk_LibInit();
 
+    JZsdk_Hal_Init();
+    
     JZSDK_LOG_INFO("0x%x,UartVersion%x.%x.%x.%x\n",DEVICE_VERSION,MAJOR_VERSION, MINOR_VERSION, MODIFY_VERSION, DEBUG_VERSION);
 
+    //通用模块
+    CommonMod_Init();
+
     //引脚初始化
     Ircut_Init();  
 
@@ -394,7 +426,8 @@ int Main_APP_Uart()
     if (DEVICE_VERSION == JZ_H1E)
     {
         //串口设备1初始化
-        JZsdk_HalPort_Init_WithDefault(UART_DEV_1);
+        value[0] = UART_DEV1_BITRATE;
+        JZsdk_HalPort_Init(UART_DEV_1, value);
 
         //喊话器初始化
         Megaphone_Init();
@@ -403,10 +436,12 @@ int Main_APP_Uart()
     if (DEVICE_VERSION == JZ_H1T)
     {
         //串口设备1初始化
-        JZsdk_HalPort_Init_WithDefault(UART_DEV_1);
+        value[0] = UART_DEV1_BITRATE;
+        JZsdk_HalPort_Init(UART_DEV_1, value);
 
         //4g设备初始化
-        JZsdk_HalPort_Init_WithDefault(UART_4G);
+        value[0] = COMM_4G_UART_BITRATE;
+        JZsdk_HalPort_Init(UART_4G, value);
 
         //喊话器初始化
         Megaphone_Init();
@@ -425,7 +460,8 @@ int Main_APP_Uart()
     if (DEVICE_VERSION == JZ_H150S || DEVICE_VERSION == JZ_H150T)
     {
         //串口设备1初始化
-        JZsdk_HalPort_Init_WithDefault(UART_DEV_1);
+        value[0] = UART_DEV1_BITRATE;
+        JZsdk_HalPort_Init(UART_DEV_1, value);
 
         //网口初始化
         JZsdk_NetWork_Init();
@@ -433,7 +469,8 @@ int Main_APP_Uart()
         if (DEVICE_VERSION == JZ_H150T)
         {
             //4g设备初始化
-            JZsdk_HalPort_Init_WithDefault(UART_4G);
+            value[0] = COMM_4G_UART_BITRATE;
+            JZsdk_HalPort_Init(UART_4G, value);
         }
 
         //云台初始化
@@ -449,7 +486,8 @@ int Main_APP_Uart()
     if (DEVICE_VERSION == JZ_H10)
     {
         //串口设备1初始化
-        JZsdk_HalPort_Init_WithDefault(UART_DEV_1);
+        value[0] = UART_DEV1_BITRATE;
+        JZsdk_HalPort_Init(UART_DEV_1, value);
 
         //H10和10t固定打开滤波
         int filter_mode = JZ_FLAGCODE_ON;
@@ -465,10 +503,12 @@ int Main_APP_Uart()
     if (DEVICE_VERSION == JZ_H10T)
     {
         //串口设备1初始化
-        JZsdk_HalPort_Init_WithDefault(UART_DEV_1);
+        value[0] = UART_DEV1_BITRATE;
+        JZsdk_HalPort_Init(UART_DEV_1, value);
 
         //4g设备初始化
-        JZsdk_HalPort_Init_WithDefault(UART_4G);
+        value[0] = COMM_4G_UART_BITRATE;
+        JZsdk_HalPort_Init(UART_4G, value);
 
         //H10和10t固定打开滤波
         int filter_mode = JZ_FLAGCODE_ON;
@@ -484,10 +524,12 @@ int Main_APP_Uart()
     if (DEVICE_VERSION == JZ_U3)
     {
         //串口设备1初始化
-        JZsdk_HalPort_Init_WithDefault(UART_DEV_1);
+        value[0] = UART_DEV1_BITRATE;
+        JZsdk_HalPort_Init(UART_DEV_1, value);
 
         //串口设备2初始化
-        JZsdk_HalPort_Init_WithDefault(UART_DEV_2);
+        value[0] = UART_DEV2_BITRATE;
+        JZsdk_HalPort_Init(UART_DEV_2, value);
 
         //喊话器初始化
         Megaphone_Init();    
@@ -512,10 +554,12 @@ int Main_APP_Uart()
     else if (DEVICE_VERSION == JZ_U3S)
     {
         //串口设备1初始化
-        JZsdk_HalPort_Init_WithDefault(UART_DEV_1);
+        value[0] = UART_DEV1_BITRATE;
+        JZsdk_HalPort_Init(UART_DEV_1, value);
 
         //串口设备2初始化
-        JZsdk_HalPort_Init_WithDefault(UART_DEV_2);
+        value[0] = UART_DEV2_BITRATE;
+        JZsdk_HalPort_Init(UART_DEV_2, value);
 
         //喊话器初始化
         Megaphone_Init();    
@@ -538,10 +582,12 @@ int Main_APP_Uart()
     else if (DEVICE_VERSION == JZ_U3D)
     {
         //串口设备1初始化
-        JZsdk_HalPort_Init_WithDefault(UART_DEV_1);
+        value[0] = UART_DEV1_BITRATE;
+        JZsdk_HalPort_Init(UART_DEV_1, value);
 
         //串口设备2初始化
-        JZsdk_HalPort_Init_WithDefault(UART_DEV_2);
+        value[0] = UART_DEV2_BITRATE;
+        JZsdk_HalPort_Init(UART_DEV_2, value);
 
         //喊话器初始化
         Megaphone_Init();    
@@ -570,10 +616,12 @@ int Main_APP_Uart()
     else if (DEVICE_VERSION == JZ_U30)
     {
         //串口设备1初始化
-        JZsdk_HalPort_Init_WithDefault(UART_DEV_1);
+        value[0] = UART_DEV1_BITRATE;
+        JZsdk_HalPort_Init(UART_DEV_1, value);
 
         //串口设备2初始化
-        JZsdk_HalPort_Init_WithDefault(UART_DEV_2);
+        value[0] = UART_DEV2_BITRATE;
+        JZsdk_HalPort_Init(UART_DEV_2, value);
 
         //喊话器初始化
         Megaphone_Init();    
@@ -593,10 +641,12 @@ int Main_APP_Uart()
     if (DEVICE_VERSION == TF_A1)
     {
         //串口设备1初始化
-        JZsdk_HalPort_Init_WithDefault(UART_DEV_1);
+        value[0] = UART_DEV1_BITRATE;
+        JZsdk_HalPort_Init(UART_DEV_1, value);
 
         //串口设备2初始化
-        JZsdk_HalPort_Init_WithDefault(UART_DEV_2);
+        value[0] = UART_DEV2_BITRATE;
+        JZsdk_HalPort_Init(UART_DEV_2, value);
 
         //喊话器初始化
         Megaphone_Init();    
@@ -612,8 +662,17 @@ int Main_APP_Uart()
 
 int Main_TestAPP()
 {
+    int value[5] = {0, 0, 0, 0, 0};
+
+    JZsdk_LibInit();
+
+    JZsdk_Hal_Init();
+
+    CommonMod_Init();
+
     //串口设备1初始化
-    JZsdk_HalPort_Init_WithDefault(UART_DEV_1);
+    value[0] = UART_DEV1_BITRATE;
+    JZsdk_HalPort_Init(UART_4G, value);
 }
 
 //JZ_FLAGCODE_GET为返回工作值，其他值为设置
@@ -673,6 +732,13 @@ T_JZsdkReturnCode Main_StartupPriority(int *choose)
         //1、设置本地的版本号
         if (*choose == 0x00)
         {
+            //检查是否已存在串口连接标志
+            if(JZsdk_check_file_exists("/root/Uart_connected") == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+            {
+                JZSDK_LOG_INFO("已设置为优先启动Uart模式");
+                return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+            }
+
             //增加uart连接标志
             if(JZsdk_create_file("/root/Uart_connected") != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
             {
@@ -684,7 +750,7 @@ T_JZsdkReturnCode Main_StartupPriority(int *choose)
         else if (*choose == 0x01)
         {
             //连接后清除串口标志
-            if(JZsdk_delete_file("/root/Uart_connected") != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+            if(JZsdk_Osal_delete("/root/Uart_connected") != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
             {
                 JZSDK_LOG_ERROR("优先启动psdk模式失败");
                 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;

@@ -7,7 +7,7 @@
 #define VERSION_CHOOSE_H
 #include "JZsdk_Base/JZsdk_Code/JZsdk_DeviceCode.h"
 //1~10行 除了D可以修改版本选择 禁止动任何东西
-#define DEVICE_VERSION JZ_H10
+#define DEVICE_VERSION JZ_H1E
 
 //禁止修改行 选择是串口程序 还是 psdk程序
 #define APP_VERSION APP_UART
@@ -19,7 +19,7 @@
 #define MAJOR_VERSION 0x00
 #define MINOR_VERSION 0x00
 #define MODIFY_VERSION 0x02
-#define DEBUG_VERSION 0x12
+#define DEBUG_VERSION 0x13
 
 //禁止修改行 滤波方式
 #define FILTERING_TYPE HIGH_PASS_FILTERING