潘浩彬 / JZSDK_Linux · 提交

转到一个项目

作者 ookk303
提交 647ff30d868ff675571962fe9a0fbab346790dc2 1 个父辈 f602fa4d

2.21日志填补

内嵌 并排对比
正在显示 7 个修改的文件 包含 95 行增加 和 15 行删除
@@ -26,7 +26,7 @@ project_build/GDU_普宙PSDK @@ -26,7 +26,7 @@ project_build/GDU_普宙PSDK
26 # !project_build/DJI_大疆PSDK/samples/sample_c/platform/linux/all/hal 26 # !project_build/DJI_大疆PSDK/samples/sample_c/platform/linux/all/hal
27 # !project_build/DJI_大疆PSDK/samples/sample_c/platform/linux/all/CMakeLists.txt 27 # !project_build/DJI_大疆PSDK/samples/sample_c/platform/linux/all/CMakeLists.txt
28 28
29 -project_build/Payload-SDK-release-v3.11.0/* 29 +project_build/Payload-SDK-release-v3.12.0/*
30 project_build/特殊固件 30 project_build/特殊固件
31 project_build/DJI_Test 31 project_build/DJI_Test
32 32
1 # 编译链的配置 1 # 编译链的配置
2 2
3 #1、编译链与设备类型的选择 3 #1、编译链与设备类型的选择
4 -set(DEVICE_NAME JZ_H1T) 4 +set(DEVICE_NAME JZ_U3S)
5 #上一行为禁止修改行 5 #上一行为禁止修改行
6 6
7 message("**************************JZSDK构建编译开始***************************\n") 7 message("**************************JZSDK构建编译开始***************************\n")
@@ -109,6 +109,63 @@ void JZsdk_UserLogOutput(E_JZsdkConsoleLogLevel level, const char *fmt, ...) @@ -109,6 +109,63 @@ void JZsdk_UserLogOutput(E_JZsdkConsoleLogLevel level, const char *fmt, ...)
109 109
110 110
111 111
  112 +void JZsdk_User_OutputHex(E_JZsdkConsoleLogLevel level, const char *fmt, ...)
  113 +{
  114 + // 将日志级别转换为相应的字符串
  115 + const char *JZSDK_LOGGER_CONSOLE_LOG_LEVEL = "";
  116 + switch (level) {
  117 + case JZSDK_LOGGER_CONSOLE_LOG_LEVEL_DEBUG:
  118 + JZSDK_LOGGER_CONSOLE_LOG_LEVEL = "DEBUG";
  119 + break;
  120 + case JZSDK_LOGGER_CONSOLE_LOG_LEVEL_INFO:
  121 + JZSDK_LOGGER_CONSOLE_LOG_LEVEL = "INFO";
  122 + break;
  123 + case JZSDK_LOGGER_CONSOLE_LOG_LEVEL_WARN:
  124 + JZSDK_LOGGER_CONSOLE_LOG_LEVEL = "WARNING";
  125 + break;
  126 + case JZSDK_LOGGER_CONSOLE_LOG_LEVEL_ERROR:
  127 + JZSDK_LOGGER_CONSOLE_LOG_LEVEL = "ERROR";
  128 + break;
  129 + default:
  130 + break;
  131 + }
  132 + // 使用可变参数处理传入的格式化字符串和可变参数
  133 + va_list args;
  134 + va_start(args, fmt);
  135 +
  136 + //格式化日志消息
  137 + char logMessage[10];
  138 + memset(logMessage, 0, sizeof(logMessage));
  139 + vsnprintf(logMessage, sizeof(logMessage), fmt, args);
  140 +
  141 + va_end(args);
  142 +
  143 + // 执行具体的日志输出操作
  144 + char finalLogMessage[512];
  145 + memset(finalLogMessage, 0, sizeof(finalLogMessage));
  146 + snprintf(finalLogMessage, 612, "%s", logMessage);
  147 +
  148 +
  149 + printf("%x ",finalLogMessage[0]);
  150 +
  151 + //写入日志
  152 + if (UserLogRecordConsole != NULL)
  153 + {
  154 + if(level <= UserLogRecordConsole->consoleLevel && UserLogRecordConsole->hexFunc != NULL)
  155 + {
  156 + UserLogRecordConsole->hexFunc(finalLogMessage, 1);
  157 + }
  158 + }
  159 +
  160 + return;
  161 +}
  162 +
  163 +
  164 +
  165 +
  166 +
  167 +
  168 +
112 169
113 170
114 171
@@ -48,11 +48,13 @@ typedef enum { @@ -48,11 +48,13 @@ typedef enum {
48 */ 48 */
49 typedef T_JZsdkReturnCode (*JZsdk_ConsoleFunc)(const JZ_U8 *data, JZ_U16 dataLen); 49 typedef T_JZsdkReturnCode (*JZsdk_ConsoleFunc)(const JZ_U8 *data, JZ_U16 dataLen);
50 50
  51 +
51 /** 52 /**
52 * @brief Logger console content. 53 * @brief Logger console content.
53 */ 54 */
54 typedef struct { 55 typedef struct {
55 JZsdk_ConsoleFunc func; 56 JZsdk_ConsoleFunc func;
  57 + JZsdk_ConsoleFunc hexFunc;
56 JZ_U8 consoleLevel; 58 JZ_U8 consoleLevel;
57 bool isSupportColor; 59 bool isSupportColor;
58 } T_JZsdkLoggerConsole; 60 } T_JZsdkLoggerConsole;
@@ -74,6 +74,19 @@ static T_JZsdkReturnCode JzUser_LocalWrite(const JZ_U8 *data, JZ_U16 dataLen) @@ -74,6 +74,19 @@ static T_JZsdkReturnCode JzUser_LocalWrite(const JZ_U8 *data, JZ_U16 dataLen)
74 } 74 }
75 } 75 }
76 76
  77 +static T_JZsdkReturnCode JzUser_LocalWriteHex(const JZ_U8 *data, JZ_U16 dataLen)
  78 +{
  79 + if (logFile == NULL)
  80 + {
  81 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  82 + }
  83 +
  84 + fprintf(logFile, "%x ", data[0]); // 写入新的数据
  85 + fflush(logFile);
  86 +
  87 + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  88 +}
  89 +
77 static T_JZsdkReturnCode JzUser_LocalWriteFsInit(const JZ_U8 *path) 90 static T_JZsdkReturnCode JzUser_LocalWriteFsInit(const JZ_U8 *path)
78 { 91 {
79 JZ_U8 filePath[JZSDK_FILE_PATH_SIZE_MAX]; 92 JZ_U8 filePath[JZSDK_FILE_PATH_SIZE_MAX];
@@ -195,11 +208,13 @@ T_JZsdkReturnCode JZsdk_LoggerInit() @@ -195,11 +208,13 @@ T_JZsdkReturnCode JZsdk_LoggerInit()
195 T_JZsdkLoggerConsole printfConsole = { 208 T_JZsdkLoggerConsole printfConsole = {
196 .func = JzUser_PrintConsole, 209 .func = JzUser_PrintConsole,
197 .consoleLevel = JZSDK_LOGGER_CONSOLE_LOG_LEVEL_DEBUG, 210 .consoleLevel = JZSDK_LOGGER_CONSOLE_LOG_LEVEL_DEBUG,
  211 + .hexFunc = NULL,
198 .isSupportColor = true, 212 .isSupportColor = true,
199 }; 213 };
200 214
201 T_JZsdkLoggerConsole localRecordConsole = { 215 T_JZsdkLoggerConsole localRecordConsole = {
202 .func = JzUser_LocalWrite, 216 .func = JzUser_LocalWrite,
  217 + .hexFunc = JzUser_LocalWriteHex,
203 .consoleLevel = JZSDK_LOGGER_CONSOLE_LOG_LEVEL_INFO, 218 .consoleLevel = JZSDK_LOGGER_CONSOLE_LOG_LEVEL_INFO,
204 .isSupportColor = true, 219 .isSupportColor = true,
205 }; 220 };
@@ -7,23 +7,23 @@ @@ -7,23 +7,23 @@
7 #define VERSION_CHOOSE_H 7 #define VERSION_CHOOSE_H
8 #include "JZsdk_Base/JZsdk_Code/JZsdk_DeviceCode.h" 8 #include "JZsdk_Base/JZsdk_Code/JZsdk_DeviceCode.h"
9 //1~10行 除了D可以修改版本选择 禁止动任何东西 9 //1~10行 除了D可以修改版本选择 禁止动任何东西
10 -#define DEVICE_VERSION JZ_H1T 10 +#define DEVICE_VERSION JZ_U3S
11 11
12 //禁止修改行 选择是串口程序 还是 psdk程序 12 //禁止修改行 选择是串口程序 还是 psdk程序
13 -#define APP_VERSION APP_PSDK 13 +#define APP_VERSION APP_UART
14 14
15 //禁止修改行 板子型号 15 //禁止修改行 板子型号
16 #define PLATFORM_VERSION PLATFORM_V3S 16 #define PLATFORM_VERSION PLATFORM_V3S
17 17
18 //禁止修改行 串口连接程序的软件版本号 18 //禁止修改行 串口连接程序的软件版本号
19 #define MAJOR_VERSION_TEN_POSITION 0 19 #define MAJOR_VERSION_TEN_POSITION 0
20 -#define MAJOR_VERSION_ONE_POSITION 1 20 +#define MAJOR_VERSION_ONE_POSITION 0
21 #define MINOR_VERSION_TEN_POSITION 0 21 #define MINOR_VERSION_TEN_POSITION 0
22 -#define MINOR_VERSION_ONE_POSITION 3  
23 -#define MODIFY_VERSION_TEN_POSITION 1  
24 -#define MODIFY_VERSION_ONE_POSITION 1  
25 -#define DEBUG_VERSION_TEN_POSITION 0  
26 -#define DEBUG_VERSION_ONE_POSITION 4 22 +#define MINOR_VERSION_ONE_POSITION 0
  23 +#define MODIFY_VERSION_TEN_POSITION 0
  24 +#define MODIFY_VERSION_ONE_POSITION 2
  25 +#define DEBUG_VERSION_TEN_POSITION 2
  26 +#define DEBUG_VERSION_ONE_POSITION 0
27 27
28 28
29 29
@@ -223,12 +223,18 @@ static void *UartDeal_rece(void *arg) @@ -223,12 +223,18 @@ static void *UartDeal_rece(void *arg)
223 // data_len2+=args->MessageLength; 223 // data_len2+=args->MessageLength;
224 // printf("当前接收长度%d bytesRead%d bmessage%d reslen%d\n",data_len,bytesRead,data_len2,args->ResLen); 224 // printf("当前接收长度%d bytesRead%d bmessage%d reslen%d\n",data_len,bytesRead,data_len2,args->ResLen);
225 225
226 - // JZSDK_LOG_INFO("从串口读取到,长度%d",(args->MessageLength-args->ResLen)); 226 +#if 1
  227 + if (args->UartDevName == UART_DEV_1)
  228 + {
  229 + JZSDK_LOG_INFO("从串口读取到,长度%d",(args->MessageLength-args->ResLen));
227 230
228 - // for (int i = 0; i < (args->MessageLength-args->ResLen); i++)  
229 - // {  
230 - // JZSDK_LOG_OUTPUTHEX("%s",&args->Message[i+args->ResLen]);  
231 - // } 231 + for (int i = 0; i < (args->MessageLength-args->ResLen); i++)
  232 + {
  233 + JZSDK_LOG_OUTPUTHEX("%s",&args->Message[i+args->ResLen]);
  234 + }
  235 + }
  236 +
  237 +#endif
232 238
233 // 更新剩余长度 239 // 更新剩余长度
234 args->ResLen = 0; 240 args->ResLen = 0;