潘浩彬 / JZSDK_Linux · 提交

转到一个项目

作者 ookk303
提交 46b6e76b486b8254af927f3f8108fee0164235f4 1 个父辈 497950f5

保存

内嵌 并排对比
正在显示 24 个修改的文件 包含 479 行增加 和 242 行删除
@@ -86,7 +86,8 @@ @@ -86,7 +86,8 @@
86 "warninglight_v3s_tfa1.h": "c", 86 "warninglight_v3s_tfa1.h": "c",
87 "gimbal.h": "c", 87 "gimbal.h": "c",
88 "jzsdk_uart_uartdeal.h": "c", 88 "jzsdk_uart_uartdeal.h": "c",
89 - "powermanager_inandout.h": "c" 89 + "powermanager_inandout.h": "c",
  90 + "jzsdk_definecode.h": "c"
90 }, 91 },
91 "Codegeex.GenerationPreference": "automatic", 92 "Codegeex.GenerationPreference": "automatic",
92 "C_Cpp.dimInactiveRegions": false 93 "C_Cpp.dimInactiveRegions": false
1 # 编译链的配置 1 # 编译链的配置
2 2
3 #1、编译链与设备类型的选择 3 #1、编译链与设备类型的选择
4 -set(DEVICE_NAME JZ_C1) 4 +set(DEVICE_NAME JZ_H1T)
5 #上一行为禁止修改行 5 #上一行为禁止修改行
6 6
7 message("**************************JZSDK构建编译开始***************************\n") 7 message("**************************JZSDK构建编译开始***************************\n")
@@ -139,12 +139,12 @@ if(${MEGAPHONE_MODULE} STREQUAL "VERSION_SWITCH_ON") @@ -139,12 +139,12 @@ if(${MEGAPHONE_MODULE} STREQUAL "VERSION_SWITCH_ON")
139 set(OPUS_MODULE VERSION_SWITCH_ON) 139 set(OPUS_MODULE VERSION_SWITCH_ON)
140 endif() 140 endif()
141 141
142 -#如果要加载电源管理模块，需要加载以下附属内容  
143 -if(${POWER_MANAGER_MODULE} STREQUAL "VERSION_SWITCH_ON") 142 +#如果要加载通用模块，需要加载以下附属内容
  143 +if(${COMMON_MODULE} STREQUAL "VERSION_SWITCH_ON")
144 144
145 - message("\n电源模块加载中")  
146 - file(GLOB_RECURSE POWERMANAGER_SRC ${ROOT_DIRS}Module/PowerManager/*.c)  
147 - list(APPEND ALL_SRC_FILES ${POWERMANAGER_SRC}) 145 + message("\n通用模块加载中")
  146 + file(GLOB_RECURSE COMMON_MODULE_SRC ${ROOT_DIRS}Module/CommonMod/*.c)
  147 + list(APPEND ALL_SRC_FILES ${COMMON_MODULE_SRC})
148 148
149 endif() 149 endif()
150 150
@@ -200,7 +200,7 @@ list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/Gimbal) @@ -200,7 +200,7 @@ list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/Gimbal)
200 list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/Lighting) 200 list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/Lighting)
201 list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/UI_control) 201 list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/UI_control)
202 list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/Camera) 202 list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/Camera)
203 -list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/PowerManager) 203 +list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/COMMONManager)
204 list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/TestAPP) 204 list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/TestAPP)
205 list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/ImageProcessing) 205 list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/ImageProcessing)
206 list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/SerialManagement) 206 list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/SerialManagement)
@@ -26,7 +26,7 @@ set(LIGHTING_MODULE VERSION_SWITCH_OFF) @@ -26,7 +26,7 @@ set(LIGHTING_MODULE VERSION_SWITCH_OFF)
26 set(MEGAPHONE_MODULE VERSION_SWITCH_OFF) 26 set(MEGAPHONE_MODULE VERSION_SWITCH_OFF)
27 27
28 # 电源管理模块 28 # 电源管理模块
29 -set(POWER_MANAGER_MODULE VERSION_SWITCH_OFF) 29 +set(COMMON_MODULE VERSION_SWITCH_OFF)
30 30
31 # UI管理模块 31 # UI管理模块
32 set(UI_CONTROL_MODULE VERSION_SWITCH_OFF) 32 set(UI_CONTROL_MODULE VERSION_SWITCH_OFF)
@@ -66,8 +66,8 @@ set(DEVICE_CONFIG_MODULE VERSION_SWITCH_ON) @@ -66,8 +66,8 @@ set(DEVICE_CONFIG_MODULE VERSION_SWITCH_ON)
66 # 添加UI管理模块 66 # 添加UI管理模块
67 set(UI_CONTROL_MODULE VERSION_SWITCH_ON) 67 set(UI_CONTROL_MODULE VERSION_SWITCH_ON)
68 68
69 -# 添加电源管理模块  
70 -set(POWER_MANAGER_MODULE VERSION_SWITCH_ON) 69 +# 添加通用模块
  70 +set(COMMON_MODULE VERSION_SWITCH_ON)
71 71
72 72
73 message("通用库加载完成") 73 message("通用库加载完成")
@@ -25,6 +25,7 @@ extern "C" { @@ -25,6 +25,7 @@ extern "C" {
25 #include "./JZsdk_FileType.h" 25 #include "./JZsdk_FileType.h"
26 #include "./JZsdk_WidgetCode.h" 26 #include "./JZsdk_WidgetCode.h"
27 #include "./JZsdk_DefineCode.h" 27 #include "./JZsdk_DefineCode.h"
  28 +#include "./JZsdk_DeviceCode.h"
28 29
29 /* Exported types ------------------------------------------------------------*/ 30 /* Exported types ------------------------------------------------------------*/
30 31
  1 +#include <stdio.h>
  2 +#include "./JZsdk_DeviceCode.h"
  3 +
  4 +unsigned char *JZsdk_GetDeviceName()
  5 +{
  6 + return
  7 +}
  1 +/* ********************************************************************
  2 +*
  3 +* 用来规范version_choose的参数
  4 +*
  5 +***********************************************/
  6 +#ifndef JZSDK_DEVICE_CODE_H
  7 +#define JZSDK_DEVICE_CODE_H
  8 +
  9 +//特殊版本号
  10 +typedef enum SpecialVersion
  11 +{
  12 + SPECIAL_NORMAL = 0x01, //普通版本
  13 + SPECIAL_DAOTONG = 0x02, //道通版本
  14 +}SpecialVersion;
  15 +
  16 +//软件模式
  17 +typedef enum AppMode
  18 +{
  19 + APP_PSDK = 0x01, //psdk设备
  20 + APP_UART = 0x02, //串口设备
  21 + APP_TEST = 0x03, //测试设备
  22 +}AppMode;
  23 +
  24 +//平台选择
  25 +typedef enum Platform
  26 +{
  27 + PLATFORM_H3 = 0x01, //H3平台
  28 + PLATFORM_V3S = 0x02, //V3S平台
  29 +}Platform;
  30 +
  31 +//固件属地
  32 +typedef enum FirmwarePlace
  33 +{
  34 + OVERSEAS_VERSION = 0x01, //海外版
  35 + DOMESTIC_VERSION = 0x02, //国内版
  36 +}FirmwarePlace;
  37 +
  38 +//加载开关
  39 +typedef enum VersionLoadSwitch
  40 +{
  41 + VERSION_SWITCH_ON = 0x0001, //加载
  42 + VERSION_SWITCH_OFF = 0x0000, //不加载
  43 +}VersionLoadSwitch;
  44 +
  45 +//设备名
  46 +typedef enum DeviceName
  47 +{
  48 + JZ_H1E = 0x0011, //H1E
  49 + JZ_H1T = 0x0016, //H1T
  50 + JZ_U3 = 0x0017, //U3
  51 + JZ_U3S = 0x0018, //U3S
  52 + JZ_U3D = 0x0019, //U3D
  53 + JZ_U30 = 0x001A, //U30
  54 + JZ_H150S = 0x0013, //H150S
  55 + JZ_H150T = 0x0015, //H150T
  56 + JZ_H10 = 0x0012, //H10
  57 + JZ_H10T = 0x0014, //H10T
  58 + TF_A1 = 0x1010, //TF-A1
  59 + JZ_C1 = 0x1011, //C1
  60 +
  61 +}DeviceName;
  62 +
  63 +
  64 +
  65 +
  66 +/***********************************
  67 + *
  68 + * 已退出历史舞台
  69 + *
  70 + * *********************************/
  71 +
  72 +// //音频滤波的方式
  73 +// //目前只有和h10使用带阻滤波
  74 +// #define DIRECTED_STOPBAND_FILTERING 0x10001 //带阻滤波
  75 +// #define HIGH_PASS_FILTERING 0x10002 //高通滤波
  76 +// #define INTERGRATED_FILTERING_1 0x10003 //综合滤波1代
  77 +
  78 +
  79 +#endif
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 #endif 29 #endif
30 #include "DeviceInfo/DeviceInfo.h" 30 #include "DeviceInfo/DeviceInfo.h"
31 31
32 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 32 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
33 #include "AudioDeal/AudioDeal.h" 33 #include "AudioDeal/AudioDeal.h"
34 #include "Megaphone/Megaphone.h" 34 #include "Megaphone/Megaphone.h"
35 #endif 35 #endif
@@ -58,7 +58,7 @@ T_JZsdkReturnCode Main_M30_all_filter_mode(int *mode) @@ -58,7 +58,7 @@ T_JZsdkReturnCode Main_M30_all_filter_mode(int *mode)
58 { 58 {
59 59
60 //喊话器功能被打开时 60 //喊话器功能被打开时
61 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 61 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
62 if (*mode == JZ_FLAGCODE_GET) 62 if (*mode == JZ_FLAGCODE_GET)
63 { 63 {
64 *mode = g_All_filter_Mode; 64 *mode = g_All_filter_Mode;
@@ -149,7 +149,7 @@ T_JZsdkReturnCode Main_APP_Psdk() @@ -149,7 +149,7 @@ T_JZsdkReturnCode Main_APP_Psdk()
149 JZsdk_data_transmisson_Receive_Init(); 149 JZsdk_data_transmisson_Receive_Init();
150 150
151 //喊话器功能被打开时 151 //喊话器功能被打开时
152 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 152 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
153 153
154 //音频库初始化 154 //音频库初始化
155 AudioDeal_Init(); 155 AudioDeal_Init();
@@ -382,7 +382,7 @@ int Main_APP_Uart() @@ -382,7 +382,7 @@ int Main_APP_Uart()
382 Main_WorkMode(); 382 Main_WorkMode();
383 383
384 //喊话器功能被打开时 384 //喊话器功能被打开时
385 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 385 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
386 //音频库初始化 386 //音频库初始化
387 AudioDeal_Init(); 387 AudioDeal_Init();
388 #endif 388 #endif
@@ -752,7 +752,7 @@ static void *Main_WorkModeTask(void *arg) @@ -752,7 +752,7 @@ static void *Main_WorkModeTask(void *arg)
752 JZSDK_LOG_INFO("选择开始psdk播报"); 752 JZSDK_LOG_INFO("选择开始psdk播报");
753 #endif 753 #endif
754 754
755 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 755 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
756 while (1) 756 while (1)
757 { 757 {
758 if (start_voice_flag == JZ_FLAGCODE_OFF && MegaphoneStatusFlag == JZ_FLAGCODE_ON) 758 if (start_voice_flag == JZ_FLAGCODE_OFF && MegaphoneStatusFlag == JZ_FLAGCODE_ON)
1 -/* ********************************************************************  
2 -*  
3 -* 用来规范version_choose的参数  
4 -*  
5 -***********************************************/  
6 -#ifndef CONFIG_PARAMS_H  
7 -#define CONFIG_PARAMS_H  
8 -  
9 -//特殊版本号  
10 -#define SPECIAL_NORMAL 0x01  
11 -#define SPECIAL_DAOTONG 0x02  
12 -  
13 -//软件模式  
14 -#define APP_PSDK 0x01 //psdk设备  
15 -#define APP_UART 0x02 //串口设备  
16 -#define APP_TEST 0x03 //测试设备  
17 -  
18 -//平台选择  
19 -#define PLATFORM_H3 0x01  
20 -#define PLATFORM_V3S 0x02  
21 -  
22 -//固件属地  
23 -#define OVERSEAS_VERSION 0x01 //海外版  
24 -#define DOMESTIC_VERSION 0x02 //国内版  
25 -  
26 -//音频滤波的方式  
27 -//目前只有和h10使用带阻滤波  
28 -#define DIRECTED_STOPBAND_FILTERING 0x10001 //带阻滤波  
29 -#define HIGH_PASS_FILTERING 0x10002 //高通滤波  
30 -#define INTERGRATED_FILTERING_1 0x10003 //综合滤波1代  
31 -  
32 -//加载开关  
33 -#define VERSION_SWITCH_ON 0x0001  
34 -#define VERSION_SWITCH_OFF 0x0000  
35 -  
36 -//设备选择  
37 -#define JZ_H1E 0x0011  
38 -  
39 -#define JZ_H1T 0x0016  
40 -  
41 -#define JZ_U3 0x0017  
42 -#define JZ_U3S 0x0018  
43 -#define JZ_U3D 0x0019  
44 -#define JZ_U30 0x001A  
45 -  
46 -#define JZ_H150S 0x0013  
47 -#define JZ_H150T 0x0015  
48 -  
49 -#define JZ_H10 0x0012  
50 -#define JZ_H10T 0x0014  
51 -  
52 -#define TF_A1 0x1010  
53 -#define JZ_C1 0x1011  
54 -  
55 -#endif  
@@ -5,24 +5,23 @@ @@ -5,24 +5,23 @@
5 ***********************************************/ 5 ***********************************************/
6 #ifndef VERSION_CHOOSE_H 6 #ifndef VERSION_CHOOSE_H
7 #define VERSION_CHOOSE_H 7 #define VERSION_CHOOSE_H
8 -#include "./ConfigParams.h" 8 +
  9 +#include "JZsdk_Base/JZsdk_Code/JZsdk_DeviceNameCode.h"
  10 +
9 //1~10行 除了D可以修改版本选择 禁止动任何东西 11 //1~10行 除了D可以修改版本选择 禁止动任何东西
10 -#define DEVICE_VERSION JZ_C1 12 +#define DEVICE_VERSION JZ_H1T
11 13
12 //禁止修改行 选择是串口程序 还是 psdk程序 14 //禁止修改行 选择是串口程序 还是 psdk程序
13 -#define APP_VERSION APP_PSDK 15 +#define APP_VERSION APP_UART
14 16
15 //禁止修改行 板子型号 17 //禁止修改行 板子型号
16 #define PLATFORM_VERSION PLATFORM_V3S 18 #define PLATFORM_VERSION PLATFORM_V3S
17 19
18 //禁止修改行 串口连接程序的软件版本号 20 //禁止修改行 串口连接程序的软件版本号
19 -#define MAJOR_VERSION 0x01  
20 -#define MINOR_VERSION 0x03  
21 -#define MODIFY_VERSION 0x09  
22 -#define DEBUG_VERSION 0x07  
23 -  
24 -//禁止修改行 滤波方式  
25 -#define FILTERING_TYPE HIGH_PASS_FILTERING 21 +#define MAJOR_VERSION 0x00
  22 +#define MINOR_VERSION 0x00
  23 +#define MODIFY_VERSION 0x02
  24 +#define DEBUG_VERSION 0x12
26 25
27 //禁止修改行固件属地 目前 国内版/海外版 26 //禁止修改行固件属地 目前 国内版/海外版
28 #define FIRMWARE_ORIGIN DOMESTIC_VERSION 27 #define FIRMWARE_ORIGIN DOMESTIC_VERSION
@@ -40,25 +39,17 @@ @@ -40,25 +39,17 @@
40 #ifdef COMPILE_MODE_MODULE 39 #ifdef COMPILE_MODE_MODULE
41 //是否开启喊话器功能 40 //是否开启喊话器功能
42 #ifdef MACRO_MEGAPHONE_MODULE 41 #ifdef MACRO_MEGAPHONE_MODULE
43 - #define MEGAPHONE_CONFIG_STATUS VERSION_SWITCH_ON  
44 - #else  
45 - #define MEGAPHONE_CONFIG_STATUS VERSION_SWITCH_OFF 42 + #define MEGAPHONE_CONFIG_STATUS_ON
46 #endif 43 #endif
47 44
48 //是否开启媒体功能 45 //是否开启媒体功能
49 #ifdef MACRO_MEDIA_PROC_MODULE 46 #ifdef MACRO_MEDIA_PROC_MODULE
50 - #define MEDIA_PROC_CONFIG_STATUS VERSION_SWITCH_ON  
51 #define MEDIA_PROC_CONFIG_STATUS_ON 47 #define MEDIA_PROC_CONFIG_STATUS_ON
52 - #else  
53 - #define MEDIA_PROC_CONFIG_STATUS VERSION_SWITCH_OFF  
54 #endif 48 #endif
55 49
56 //是否开启红外相机功能 50 //是否开启红外相机功能
57 #ifdef MACRO_IRC_MODULE 51 #ifdef MACRO_IRC_MODULE
58 - #define IRC_CONFIG_STATUS VERSION_SWITCH_ON  
59 #define IRC_CONFIG_STATUS_ON 52 #define IRC_CONFIG_STATUS_ON
60 - #else  
61 - #define IRC_CONFIG_STATUS VERSION_SWITCH_OFF  
62 #endif 53 #endif
63 54
64 //是否加载ktirclib 55 //是否加载ktirclib
@@ -68,9 +59,7 @@ @@ -68,9 +59,7 @@
68 59
69 //是否加载usb模块 60 //是否加载usb模块
70 #ifdef MACRO_USB_MODULE 61 #ifdef MACRO_USB_MODULE
71 - #define USB_CONFIG_STATUS VERSION_SWITCH_ON  
72 - #else  
73 - #define USB_CONFIG_STATUS VERSION_SWITCH_OFF 62 + #define USB_CONFIG_STATUS_ON
74 #endif 63 #endif
75 64
76 //是否加载RTK_MPP模块 65 //是否加载RTK_MPP模块
@@ -100,17 +89,16 @@ @@ -100,17 +89,16 @@
100 89
101 #else //这里用于方便调试使用，不是实际加载的模组 90 #else //这里用于方便调试使用，不是实际加载的模组
102 //是否开启喊话器功能 91 //是否开启喊话器功能
103 - #define MEGAPHONE_CONFIG_STATUS VERSION_SWITCH_ON 92 + #define MEGAPHONE_CONFIG_STATUS_ON
104 93
105 //是否开启媒体管理功能 94 //是否开启媒体管理功能
106 - #define MEDIA_PROC_CONFIG_STATUS VERSION_SWITCH_ON  
107 #define MEDIA_PROC_CONFIG_STATUS_ON 95 #define MEDIA_PROC_CONFIG_STATUS_ON
108 96
109 //是否开启红外相机功能 97 //是否开启红外相机功能
110 - #define IRC_CONFIG_STATUS VERSION_SWITCH_ON 98 + #define IRC_CONFIG_STATUS_ON
111 99
112 //是否加载usb模块 100 //是否加载usb模块
113 - #define USB_CONFIG_STATUS VERSION_SWITCH_ON 101 + #define USB_CONFIG_STATUS_ON
114 102
115 //是否加载RTK_MPP模块 103 //是否加载RTK_MPP模块
116 #define RTK_MPP_STATUS_ON 104 #define RTK_MPP_STATUS_ON
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 #include "./JZsdk_usb_bulk.h" 7 #include "./JZsdk_usb_bulk.h"
8 8
9 9
10 -#if USB_CONFIG_STATUS == VERSION_SWITCH_ON 10 +#ifdef USB_CONFIG_STATUS_ON
11 #include <libusb-1.0/libusb.h> 11 #include <libusb-1.0/libusb.h>
12 #endif 12 #endif
13 13
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 typedef struct JZsdk_T_HalUsbBulkObj{ 17 typedef struct JZsdk_T_HalUsbBulkObj{
18 18
19 19
20 -#if USB_CONFIG_STATUS == VERSION_SWITCH_ON 20 +#ifdef USB_CONFIG_STATUS_ON
21 libusb_device_handle *handle; //usb的权柄 21 libusb_device_handle *handle; //usb的权柄
22 #endif 22 #endif
23 23
@@ -35,7 +35,7 @@ typedef struct JZsdk_T_HalUsbBulkObj{ @@ -35,7 +35,7 @@ typedef struct JZsdk_T_HalUsbBulkObj{
35 T_JZsdkReturnCode JZsdk_HalUsbBulk_Init(void **index, int interfaceNum, int isUsbHost, 35 T_JZsdkReturnCode JZsdk_HalUsbBulk_Init(void **index, int interfaceNum, int isUsbHost,
36 unsigned int pid, unsigned int vid, unsigned int PointIn, unsigned int PointOut) 36 unsigned int pid, unsigned int vid, unsigned int PointIn, unsigned int PointOut)
37 { 37 {
38 -#if USB_CONFIG_STATUS == VERSION_SWITCH_ON 38 +#ifdef USB_CONFIG_STATUS_ON
39 //创建一个usb信息结构体 39 //创建一个usb信息结构体
40 struct JZsdk_T_HalUsbBulkObj *UsbBulkObj = NULL; 40 struct JZsdk_T_HalUsbBulkObj *UsbBulkObj = NULL;
41 41
@@ -121,7 +121,7 @@ T_JZsdkReturnCode JZsdk_HalUsbBulk_WriteData(void **index ,const unsigned char * @@ -121,7 +121,7 @@ T_JZsdkReturnCode JZsdk_HalUsbBulk_WriteData(void **index ,const unsigned char *
121 121
122 int ret; 122 int ret;
123 int actualLen = 0; 123 int actualLen = 0;
124 -#if USB_CONFIG_STATUS == VERSION_SWITCH_ON 124 +#ifdef USB_CONFIG_STATUS_ON
125 ret = libusb_bulk_transfer(UsbBulkObj->handle, UsbBulkObj->PointOut, 125 ret = libusb_bulk_transfer(UsbBulkObj->handle, UsbBulkObj->PointOut,
126 (unsigned char *) buf, len, &actualLen, LINUX_USB_BULK_TRANSFER_TIMEOUT_MS); 126 (unsigned char *) buf, len, &actualLen, LINUX_USB_BULK_TRANSFER_TIMEOUT_MS);
127 if (ret < 0) { 127 if (ret < 0) {
@@ -142,7 +142,7 @@ T_JZsdkReturnCode JZsdk_HalUsbBulk_ReadData(void **index ,unsigned char *buf, un @@ -142,7 +142,7 @@ T_JZsdkReturnCode JZsdk_HalUsbBulk_ReadData(void **index ,unsigned char *buf, un
142 int ret; 142 int ret;
143 int actualLen = 0; 143 int actualLen = 0;
144 144
145 -#if USB_CONFIG_STATUS == VERSION_SWITCH_ON 145 +#ifdef USB_CONFIG_STATUS_ON
146 ret = libusb_bulk_transfer(UsbBulkObj->handle, UsbBulkObj->PointIn, 146 ret = libusb_bulk_transfer(UsbBulkObj->handle, UsbBulkObj->PointIn,
147 buf, len, &actualLen, LINUX_USB_BULK_TRANSFER_WAIT_FOREVER); 147 buf, len, &actualLen, LINUX_USB_BULK_TRANSFER_WAIT_FOREVER);
148 if (ret < 0) { 148 if (ret < 0) {
  1 +#include <stdio.h>
  2 +#include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h"
  3 +#include "JZsdkLib.h"
  4 +
  5 +/***************
  6 + *
  7 + * * 通用模块初始化
  8 + *
  9 + *
  10 + * *************/
  11 +T_JZsdkReturnCode CommonMod_Init()
  12 +{
  13 + //初始化升级模块
  14 +
  15 + //初始化心跳模块
  16 +
  17 + //初始化电源模块
  18 +}
  1 +/**
  2 + ********************************************************************
  3 + * @file CommonMod.h
  4 + * CommonMod.c的头文件
  5 + *
  6 + *
  7 + *********************************************************************
  8 + */
  9 +
  10 +/* Define to prevent recursive inclusion 避免重定义 -------------------------------------*/
  11 +#ifndef COMMONMOD_H
  12 +#define COMMONMOD_H
  13 +
  14 +/* Includes ------------------------------------------------------------------*/
  15 +#include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h"
  16 +
  17 +#ifdef __cplusplus
  18 +extern "C" {
  19 +#endif
  20 +
  21 +/* Exported constants --------------------------------------------------------*/
  22 +/* 常亮定义*/
  23 +
  24 +/* Exported types ------------------------------------------------------------*/
  25 +
  26 +/* Exported functions --------------------------------------------------------*/
  27 +
  28 +
  29 +#ifdef __cplusplus
  30 +}
  31 +#endif
  32 +
  33 +#endif
1 #include <stdio.h> 1 #include <stdio.h>
2 -#include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h"  
3 #include "JZsdkLib.h" 2 #include "JZsdkLib.h"
4 3
5 #define POWER_STATUS_OFF 0 4 #define POWER_STATUS_OFF 0
6 #define POWER_STATUS_REBOOT 1 5 #define POWER_STATUS_REBOOT 1
7 6
8 -  
9 //电源管理初始化 7 //电源管理初始化
10 T_JZsdkReturnCode PowerManger_Init() 8 T_JZsdkReturnCode PowerManger_Init()
11 { 9 {
@@ -17,15 +15,18 @@ T_JZsdkReturnCode PowerManger_PowerOff() @@ -17,15 +15,18 @@ T_JZsdkReturnCode PowerManger_PowerOff()
17 { 15 {
18 JZSDK_LOG_INFO("执行关闭电源"); 16 JZSDK_LOG_INFO("执行关闭电源");
19 JZsdk_RunSystemCmd("poweroff"); 17 JZsdk_RunSystemCmd("poweroff");
  18 +
  19 + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
20 } 20 }
21 21
22 22
23 //电源重启 23 //电源重启
24 -int PowerManger_PowerReboot() 24 +T_JZsdkReturnCode PowerManger_PowerReboot()
25 { 25 {
26 - 26 + JZSDK_LOG_INFO("执行重启电源");
27 JZsdk_RunSystemCmd("reboot"); 27 JZsdk_RunSystemCmd("reboot");
28 28
  29 + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
29 } 30 }
30 31
31 //电源状态修改 32 //电源状态修改
@@ -46,54 +47,3 @@ T_JZsdkReturnCode PowerManger_SetPowerStatus(int status) @@ -46,54 +47,3 @@ T_JZsdkReturnCode PowerManger_SetPowerStatus(int status)
46 } 47 }
47 48
48 } 49 }
49 -  
50 -  
51 -// T_JZsdkReturnCode PowerManger_HeartBeatAsk()  
52 -// {  
53 -// //如果4G模块有启动  
54 -// if (JZsdk_HalPort_UseFlag(UART_4G) == JZ_FLAGCODE_ON)  
55 -// {  
56 -// JZsdk_Uart_SendDeal_Ask_HeartBeatStatus(UART_4G, 0, 1);  
57 -// }  
58 -// //如果设备1有启动  
59 -// if (JZsdk_HalPort_UseFlag(UART_DEV_1) == JZ_FLAGCODE_ON)  
60 -// {  
61 -// JZsdk_Uart_SendDeal_Ask_HeartBeatStatus(UART_DEV_1, 0, 1);  
62 -// }  
63 -// //如果设备2有启动  
64 -// if (JZsdk_HalPort_UseFlag(UART_DEV_2) == JZ_FLAGCODE_ON)  
65 -// {  
66 -// JZsdk_Uart_SendDeal_Ask_HeartBeatStatus(UART_DEV_2, 0, 1);  
67 -// }  
68 -// //如果psdk接口已经使用  
69 -// if (JZsdk_Get_Psdk_UIcontrol_UseFlag() == JZ_FLAGCODE_ON)  
70 -// {  
71 -  
72 -// }  
73 -// }  
74 -  
75 -  
76 -// T_JZsdkReturnCode UI_control_Ask_TimeStamp()  
77 -// {  
78 -// //如果4G模块有启动  
79 -// if (JZsdk_HalPort_UseFlag(UART_4G) == JZ_FLAGCODE_ON)  
80 -// {  
81 -// JZsdk_Uart_SendDeal_Ask_TimeStamp(UART_4G,0);  
82 -// }  
83 -// //如果设备1有启动  
84 -// if (JZsdk_HalPort_UseFlag(UART_DEV_1) == JZ_FLAGCODE_ON)  
85 -// {  
86 -// JZsdk_Uart_SendDeal_Ask_TimeStamp(UART_DEV_1,0);  
87 -// }  
88 -// //如果设备2有启动  
89 -// if (JZsdk_HalPort_UseFlag(UART_DEV_2) == JZ_FLAGCODE_ON)  
90 -// {  
91 -// JZsdk_Uart_SendDeal_Ask_TimeStamp(UART_DEV_2,0);  
92 -// }  
93 -// //如果psdk接口已经使用  
94 -// if (JZsdk_Get_Psdk_UIcontrol_UseFlag() == JZ_FLAGCODE_ON)  
95 -// {  
96 -  
97 -// }  
98 -// }  
99 -  
1 /** 1 /**
2 ******************************************************************** 2 ********************************************************************
3 - * @file PowerManager_InAndOut.h  
4 - * PowerManager_InAndOut的头文件 3 + * @file PowerManger.h
  4 + * PowerManger.c的头文件
  5 + *
5 * 6 *
6 ********************************************************************* 7 *********************************************************************
7 */ 8 */
8 9
9 /* Define to prevent recursive inclusion 避免重定义 -------------------------------------*/ 10 /* Define to prevent recursive inclusion 避免重定义 -------------------------------------*/
10 -#ifndef POWERMANAGER_INANDOUT_H  
11 -#define POWERMANAGER_INANDOUT_H 11 +#ifndef POWER_MANGER_H
  12 +#define POWER_MANGER_H
12 13
13 /* Includes ------------------------------------------------------------------*/ 14 /* Includes ------------------------------------------------------------------*/
14 #include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h" 15 #include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h"
  1 +#include <stdio.h>
  2 +#include "JZsdkLib.h"
  3 +
  4 +#include "BaseConfig.h"
  5 +
  6 +#define UPGRADE_FILE_DIR "/root/ugradeFile"
  7 +#define UPGRADE_FILE_STATUS_A "/root/ugradeFile/upgrade_status_a"
  8 +#define UPGRADE_FILE_STATUS_B "/root/ugradeFile/upgrade_status_b"
  9 +
  10 +static int Upgrade_status = JZ_FLAGCODE_OFF;
  11 +
  12 +/************************************
  13 + *
  14 + * 升级包解析
  15 + *
  16 + *
  17 + * *************************************/
  18 +T_JZsdkReturnCode Upgrade_PackageParse()
  19 +{
  20 + //解析升级包
  21 +
  22 + //1、分析是否存在linux自身的升级包
  23 + unsigned char upgradeFileName[128];
  24 + int upgradeFileNameLen = 0;
  25 +
  26 + //拼接为升级包的名字
  27 + memcpy(upgradeFileName, )
  28 +
  29 + if (JZsdk_check_file_exists(UPGRADE_FILE_DIR))
  30 + {
  31 +
  32 + }
  33 +
  34 + //2、分析是否存在其他模块的升级包
  35 +
  36 + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  37 +}
  38 +
  39 +/********************************
  40 + *
  41 + * 升级模块初始化
  42 + *
  43 + *
  44 + * ************************************/
  45 +T_JZsdkReturnCode Upgrade_Init()
  46 +{
  47 + T_JZsdkReturnCode ret;
  48 +
  49 + //检查是否存在升级失败文件
  50 + ret = JZsdk_check_file_exists(UPGRADE_FILE_STATUS_B);
  51 + if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
  52 + {
  53 + //这种属于是喊话器自身升级失败了
  54 + JZSDK_LOG_ERROR("Upgrade_Init: upgrade failed file exists STATUS B");
  55 +
  56 +
  57 + //失败处理
  58 +
  59 + }
  60 +
  61 + //检查是否存在A文件
  62 + ret = JZsdk_check_file_exists(UPGRADE_FILE_STATUS_A);
  63 + if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
  64 + {
  65 + //正处于升级状态
  66 +
  67 + //检查是否还存在升级包
  68 +
  69 +
  70 + }
  71 +
  72 +
  73 +}
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 #include "Gimbal/Gimbal.h" 10 #include "Gimbal/Gimbal.h"
11 #include "UI_control/Psdk_UI_io.h" 11 #include "UI_control/Psdk_UI_io.h"
12 12
13 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 13 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
14 #include "Megaphone/Megaphone.h" 14 #include "Megaphone/Megaphone.h"
15 #include "Megaphone/MegTempControl/MegTempControl.h" 15 #include "Megaphone/MegTempControl/MegTempControl.h"
16 #endif 16 #endif
@@ -25,7 +25,7 @@ static DeviceMessageLanguage g_MessageLanguage = DEVICE_MESSAGE_CHINESE; @@ -25,7 +25,7 @@ static DeviceMessageLanguage g_MessageLanguage = DEVICE_MESSAGE_CHINESE;
25 25
26 int Widget_RealTimeOpusFlag = JZ_FLAGCODE_OFF; //用于标志ui里的实时语音开关 26 int Widget_RealTimeOpusFlag = JZ_FLAGCODE_OFF; //用于标志ui里的实时语音开关
27 27
28 -#if IRC_CONFIG_STATUS == VERSION_SWITCH_ON 28 +#ifdef IRC_CONFIG_STATUS_ON
29 extern int g_temp_GasValueMax; 29 extern int g_temp_GasValueMax;
30 extern int g_temp_GasValueMin; 30 extern int g_temp_GasValueMin;
31 #endif 31 #endif
@@ -123,7 +123,7 @@ static T_JZsdkReturnCode DeviceMessage_Enter_Default(unsigned char *message) @@ -123,7 +123,7 @@ static T_JZsdkReturnCode DeviceMessage_Enter_Default(unsigned char *message)
123 memset(old_message, 0, MESSAGE_MAX_LEN); 123 memset(old_message, 0, MESSAGE_MAX_LEN);
124 memset(new_message, 0, MESSAGE_MAX_LEN); 124 memset(new_message, 0, MESSAGE_MAX_LEN);
125 125
126 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 126 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
127 //如果实时语音按键打开了 127 //如果实时语音按键打开了
128 if (Widget_RealTimeOpusFlag == JZ_FLAGCODE_ON) 128 if (Widget_RealTimeOpusFlag == JZ_FLAGCODE_ON)
129 { 129 {
@@ -169,7 +169,7 @@ static T_JZsdkReturnCode DeviceMessage_Enter_Default(unsigned char *message) @@ -169,7 +169,7 @@ static T_JZsdkReturnCode DeviceMessage_Enter_Default(unsigned char *message)
169 } 169 }
170 #endif 170 #endif
171 171
172 -#if IRC_CONFIG_STATUS == VERSION_SWITCH_ON 172 +#ifdef IRC_CONFIG_STATUS_ON
173 if (g_MessageLanguage == DEVICE_MESSAGE_CHINESE) 173 if (g_MessageLanguage == DEVICE_MESSAGE_CHINESE)
174 { 174 {
175 memset(new_message,0,sizeof(new_message)); 175 memset(new_message,0,sizeof(new_message));
@@ -265,7 +265,7 @@ static T_JZsdkReturnCode DeviceMessage_Enter_Debug(unsigned char *message) @@ -265,7 +265,7 @@ static T_JZsdkReturnCode DeviceMessage_Enter_Debug(unsigned char *message)
265 snprintf(message,MESSAGE_MAX_LEN,"%s%s",old_message,new_message); 265 snprintf(message,MESSAGE_MAX_LEN,"%s%s",old_message,new_message);
266 } 266 }
267 267
268 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 268 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
269 memset(new_message,0,sizeof(new_message)); 269 memset(new_message,0,sizeof(new_message));
270 memset(old_message,0,sizeof(old_message)); 270 memset(old_message,0,sizeof(old_message));
271 snprintf(new_message,MESSAGE_MAX_LEN,"rtv:%d rsv:%d",Megaphone_get_RealTargetVolume(), Megaphone_get_RealSetVolume()); 271 snprintf(new_message,MESSAGE_MAX_LEN,"rtv:%d rsv:%d",Megaphone_get_RealTargetVolume(), Megaphone_get_RealSetVolume());
@@ -437,7 +437,7 @@ T_JZsdkReturnCode Gimbal_Set_GimbalLinkageControl(int value) @@ -437,7 +437,7 @@ T_JZsdkReturnCode Gimbal_Set_GimbalLinkageControl(int value)
437 g_Gimbal_Linkage = value; 437 g_Gimbal_Linkage = value;
438 438
439 #if DEVICE_VERSION == JZ_H1T 439 #if DEVICE_VERSION == JZ_H1T
440 - HalSend_type1Send_Set_GimbalLinkageControl(UART_DEV_1, g_Gimbal_Linkage); 440 + HalSend_type1Send_Set_GimbalLinkageControl(UART_DEV_1, 0, g_Gimbal_Linkage);
441 #endif 441 #endif
442 } 442 }
443 break; 443 break;
@@ -481,6 +481,7 @@ T_JZsdkReturnCode Gimbal_CheckStatus_GimbalLinkage(int *value) @@ -481,6 +481,7 @@ T_JZsdkReturnCode Gimbal_CheckStatus_GimbalLinkage(int *value)
481 *value = g_Gimbal_Linkage; 481 *value = g_Gimbal_Linkage;
482 #endif 482 #endif
483 } 483 }
  484 + break;
484 485
485 case JZ_FLAGCODE_OFF: 486 case JZ_FLAGCODE_OFF:
486 JZSDK_LOG_ERROR("云台未开启"); 487 JZSDK_LOG_ERROR("云台未开启");
@@ -501,14 +502,34 @@ T_JZsdkReturnCode Gimbal_Obtain_GimbalLinkage(int GimbalLinkage) @@ -501,14 +502,34 @@ T_JZsdkReturnCode Gimbal_Obtain_GimbalLinkage(int GimbalLinkage)
501 { 502 {
502 JZSDK_LOG_INFO("收到云台联动值\n"); 503 JZSDK_LOG_INFO("收到云台联动值\n");
503 504
504 - g_Gimbal_Linkage = GimbalLinkage; 505 + switch(g_Gimbal_Mode)
  506 + {
  507 + //透传模式
  508 + case JZ_MODULE_CONTROL_WAY_TRANSPARENT:
  509 + {
  510 + g_Gimbal_Linkage = GimbalLinkage;
  511 + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  512 + }
  513 + break;
505 514
506 -#if DEVICE_VERSION == JZ_H1T  
507 - //无操作  
508 - //毕竟是t60s返回来的值  
509 -#else  
510 - //暂时没做接口  
511 -#endif 515 + //独立模式
  516 + case JZ_MODULE_CONTROL_WAY_INDEPENDENT:
  517 + {
  518 + g_Gimbal_Linkage = GimbalLinkage;
  519 + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  520 + }
  521 + break;
  522 +
  523 + case JZ_FLAGCODE_OFF:
  524 + JZSDK_LOG_ERROR("云台未开启");
  525 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  526 + break;
  527 +
  528 + default:
  529 + JZSDK_LOG_ERROR("云台模式错误");
  530 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  531 + break;
  532 + }
512 533
513 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; 534 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
514 } 535 }
@@ -520,15 +541,38 @@ T_JZsdkReturnCode Gimbal_Obtain_GimbalLinkage(int GimbalLinkage) @@ -520,15 +541,38 @@ T_JZsdkReturnCode Gimbal_Obtain_GimbalLinkage(int GimbalLinkage)
520 **********/ 541 **********/
521 T_JZsdkReturnCode Gimbal_CheckStatus_Angle(int *PitchAngle, int *YawAngle, int *RollAngle) 542 T_JZsdkReturnCode Gimbal_CheckStatus_Angle(int *PitchAngle, int *YawAngle, int *RollAngle)
522 { 543 {
523 -//组合机刷新查询角度  
524 -#if DEVICE_VERSION == JZ_H1T  
525 - JZsdk_Uart_Send_CheckStatus_GimbalAngle(UART_DEV_1, 0); 544 +
  545 + switch (g_Gimbal_Mode)
  546 + {
  547 + case JZ_MODULE_CONTROL_WAY_INDEPENDENT:
  548 + {
  549 + //无事发生
  550 + }
  551 + break;
526 552
527 - //给点延时问题不大  
528 - delayMs(5);  
529 -#else  
530 - //直接获取即可  
531 -#endif 553 + case JZ_MODULE_CONTROL_WAY_TRANSPARENT:
  554 + {
  555 + //透传模式，查询一次云台角度
  556 + //组合机刷新查询角度
  557 + #if DEVICE_VERSION == JZ_H1T
  558 + HalSend_type1Send_CheckStatus_GimbalAngle(UART_DEV_1, 0);
  559 +
  560 + //给点延时问题不大
  561 + delayMs(5);
  562 + #endif
  563 + }
  564 + break;
  565 +
  566 + case JZ_FLAGCODE_OFF:
  567 + JZSDK_LOG_ERROR("云台未开启");
  568 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  569 + break;
  570 +
  571 + default:
  572 + JZSDK_LOG_ERROR("云台模式错误");
  573 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  574 + break;
  575 + }
532 576
533 //2、获取一次本地云台角度 577 //2、获取一次本地云台角度
534 if (PitchAngle != NULL) 578 if (PitchAngle != NULL)
@@ -655,26 +699,52 @@ static T_JZsdkReturnCode Gimbal_Set_RealPitchAngle(int pitch, int FineTuningP, i @@ -655,26 +699,52 @@ static T_JZsdkReturnCode Gimbal_Set_RealPitchAngle(int pitch, int FineTuningP, i
655 { 699 {
656 int temp_angle = 0; 700 int temp_angle = 0;
657 701
658 -//组合机不用堆叠角度  
659 -#if DEVICE_VERSION == JZ_H1T  
660 - temp_angle = pitch;  
661 - Gimbal_RealPitchAngle = temp_angle;  
662 -#else  
663 - //叠加飞机角度和微调角度  
664 - temp_angle = pitch - UAV_pitch + FineTuningP;  
665 -  
666 - if (temp_angle < MIN_PITCH) 702 + switch (g_Gimbal_Mode)
667 { 703 {
668 - temp_angle = MIN_PITCH;  
669 - } 704 + case JZ_MODULE_CONTROL_WAY_INDEPENDENT:
  705 + {
  706 + //叠加飞机角度和微调角度
  707 + temp_angle = pitch - UAV_pitch + FineTuningP;
670 708
671 - if (temp_angle > MAX_PITCH)  
672 - {  
673 - temp_angle = MAX_PITCH;  
674 - } 709 + if (temp_angle < MIN_PITCH)
  710 + {
  711 + temp_angle = MIN_PITCH;
  712 + }
675 713
676 - Gimbal_RealPitchAngle = temp_angle;  
677 -#endif 714 + if (temp_angle > MAX_PITCH)
  715 + {
  716 + temp_angle = MAX_PITCH;
  717 + }
  718 +
  719 + Gimbal_RealPitchAngle = temp_angle;
  720 + }
  721 + break;
  722 +
  723 + case JZ_MODULE_CONTROL_WAY_TRANSPARENT:
  724 + {
  725 + //组合机不用堆叠角度
  726 + #if DEVICE_VERSION == JZ_H1T
  727 + temp_angle = pitch;
  728 + Gimbal_RealPitchAngle = temp_angle;
  729 + #endif
  730 + }
  731 + break;
  732 +
  733 +
  734 + case JZ_FLAGCODE_OFF:
  735 + {
  736 + JZSDK_LOG_ERROR("云台模式未设置");
  737 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  738 + }
  739 + break;
  740 +
  741 + default:
  742 + {
  743 + JZSDK_LOG_ERROR("云台模式设置错误");
  744 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  745 + }
  746 + break;
  747 + }
678 748
679 //printf("设置真实俯仰角度\n"); //禁止打印 749 //printf("设置真实俯仰角度\n"); //禁止打印
680 750
  1 +/**
  2 + ********************************************************************
  3 + * @file GIMBAL.h
  4 + * GIMBAL.h 的头文件
  5 + *
  6 + *********************************************************************
  7 + */
  8 +
  9 +/* Define to prevent recursive inclusion 避免重定义 -------------------------------------*/
  10 +#ifndef GIMBAL_H
  11 +#define GIMBAL_H
  12 +
  13 +/* Includes ------------------------------------------------------------------*/
  14 +#include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h"
  15 +
  16 +#ifdef __cplusplus
  17 +extern "C" {
  18 +#endif
  19 +
  20 +/* Exported constants --------------------------------------------------------*/
  21 +/* 常亮定义*/
  22 +
  23 +/* Exported types ------------------------------------------------------------*/
  24 +
  25 +/* Exported functions --------------------------------------------------------*/
  26 +
  27 +/*************************************************
  28 + *
  29 + * 云台 独立控制模式的 handler
  30 + * 请按内部内容，以此初始化数据
  31 + *
  32 + * *************************************************/
  33 +typedef struct s_Gimbal_PitchHandler
  34 +{
  35 + int Max_Pitch; //最大pitch角度
  36 + int Min_Pitch; //最小pitch角度
  37 +
  38 + int Max_FinePitch; //最大精细pitch角度(通常取pitch值的 1/3)
  39 + int Min_FinePitch; //最小精细pitch角度(通常取pitch值的 1/3)
  40 +
  41 + /*************************************************
  42 + *
  43 + * 用于给云台模块一个真实pitch的输出函数
  44 + * 云台通过 云台微调pitch，飞机pitch 设置值pitch 计算得到真实pitch
  45 + * * 云台模块通过调用此函数，将真实pitch输出给对应的函数
  46 + *
  47 + * **********************************************/
  48 + T_JZsdkReturnCode (*Out_SetRealPitchAngle)(int);
  49 +
  50 + //
  51 +
  52 +}s_Gimbal_PitchHandler;
  53 +
  54 +
  55 +typedef struct s_Gimbal_IndependentHandler
  56 +{
  57 + //yaw轴控制
  58 + s_Gimbal_PitchHandler Pitch;
  59 +
  60 + //计算得到的真实yaw角度
  61 + T_JZsdkReturnCode (*_Gimbal_Set_RealYawAngle)(int);
  62 + //计算得到的真实roll角度
  63 + T_JZsdkReturnCode (*_Gimbal_Set_RealRollAngle)(int);
  64 +
  65 +} s_Gimbal_IndependentHandler;
  66 +
  67 +#ifdef __cplusplus
  68 +}
  69 +#endif
  70 +
  71 +#endif
@@ -357,14 +357,14 @@ int DJI_VideoReplay_input(int command, unsigned int Command_timeMS, char* path) @@ -357,14 +357,14 @@ int DJI_VideoReplay_input(int command, unsigned int Command_timeMS, char* path)
357 VideoFrameOneSecond = JZ_FLAGCODE_OFF; //视频一秒的帧数 357 VideoFrameOneSecond = JZ_FLAGCODE_OFF; //视频一秒的帧数
358 PlayFrameNumber = JZ_FLAGCODE_OFF; //当前播放的帧数 358 PlayFrameNumber = JZ_FLAGCODE_OFF; //当前播放的帧数
359 transcode_flag = JZ_FLAGCODE_OFF; //转码标志位 359 transcode_flag = JZ_FLAGCODE_OFF; //转码标志位
360 -#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON 360 +#ifdef MEDIA_PROC_CONFIG_STATUS_ON
361 VideoMgmt_VideoStreamFlow_RecordPlay(JZ_FLAGCODE_OFF); 361 VideoMgmt_VideoStreamFlow_RecordPlay(JZ_FLAGCODE_OFF);
362 #endif 362 #endif
363 break; 363 break;
364 364
365 case COMMAND_PAUSE: 365 case COMMAND_PAUSE:
366 //JZSDK_LOG_DEBUG("dji录像推流暂停\n"); 366 //JZSDK_LOG_DEBUG("dji录像推流暂停\n");
367 -#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON 367 +#ifdef MEDIA_PROC_CONFIG_STATUS_ON
368 VideoMgmt_VideoStreamFlow_RecordPlay(JZ_FLAGCODE_OFF); 368 VideoMgmt_VideoStreamFlow_RecordPlay(JZ_FLAGCODE_OFF);
369 #endif 369 #endif
370 break; 370 break;
@@ -382,7 +382,7 @@ int DJI_VideoReplay_input(int command, unsigned int Command_timeMS, char* path) @@ -382,7 +382,7 @@ int DJI_VideoReplay_input(int command, unsigned int Command_timeMS, char* path)
382 transcode_flag = JZ_FLAGCODE_ON; 382 transcode_flag = JZ_FLAGCODE_ON;
383 } 383 }
384 384
385 -#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON 385 +#ifdef MEDIA_PROC_CONFIG_STATUS_ON
386 VideoMgmt_VideoStreamFlow_RecordPlay(JZ_FLAGCODE_ON); 386 VideoMgmt_VideoStreamFlow_RecordPlay(JZ_FLAGCODE_ON);
387 #endif 387 #endif
388 388
@@ -393,7 +393,7 @@ T_JZsdkReturnCode JZsdk_Psdk_UI_io_PlaySong(int wheather_control) @@ -393,7 +393,7 @@ T_JZsdkReturnCode JZsdk_Psdk_UI_io_PlaySong(int wheather_control)
393 // 如果有进行控制，不只是改控件 393 // 如果有进行控制，不只是改控件
394 if (wheather_control == 1) 394 if (wheather_control == 1)
395 { 395 {
396 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 396 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
397 // 获取当前播放的歌曲名字 397 // 获取当前播放的歌曲名字
398 Megaphone_get_play_FileName(MusicName, &MusicNameLen); 398 Megaphone_get_play_FileName(MusicName, &MusicNameLen);
399 399
@@ -1165,7 +1165,7 @@ T_JZsdkReturnCode JZsdk_Psdk_UI_io_Set_OutputPowerStatus(int wheather_control,in @@ -1165,7 +1165,7 @@ T_JZsdkReturnCode JZsdk_Psdk_UI_io_Set_OutputPowerStatus(int wheather_control,in
1165 * *************/ 1165 * *************/
1166 T_JZsdkReturnCode JZsdk_Psdk_UI_io_GetRealTimeVoiceStatusFlag() 1166 T_JZsdkReturnCode JZsdk_Psdk_UI_io_GetRealTimeVoiceStatusFlag()
1167 { 1167 {
1168 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 1168 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
1169 return Megaphone_RealTimeVoice_GetStatusFlag(); 1169 return Megaphone_RealTimeVoice_GetStatusFlag();
1170 #endif 1170 #endif
1171 } 1171 }
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 #include "SideLaser/SideLaser.h" 22 #include "SideLaser/SideLaser.h"
23 #endif 23 #endif
24 24
25 -#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON 25 +#ifdef MEDIA_PROC_CONFIG_STATUS_ON
26 #include "MediaProc/MediaProc.h" 26 #include "MediaProc/MediaProc.h"
27 #endif 27 #endif
28 28
@@ -95,7 +95,7 @@ T_JZsdkReturnCode UI_control_Set_DJI_SkyPort_SerialNumber(char *str) @@ -95,7 +95,7 @@ T_JZsdkReturnCode UI_control_Set_DJI_SkyPort_SerialNumber(char *str)
95 //音量调节 95 //音量调节
96 T_JZsdkReturnCode UIcontrol_SetVolume(int DeviceName,int value) 96 T_JZsdkReturnCode UIcontrol_SetVolume(int DeviceName,int value)
97 { 97 {
98 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 98 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
99 //调用喊话器的接口 99 //调用喊话器的接口
100 T_JZsdkReturnCode ret = Megaphone_param(JZ_FLAGCODE_SET, MEGAPHONE_VOLUME, &value); 100 T_JZsdkReturnCode ret = Megaphone_param(JZ_FLAGCODE_SET, MEGAPHONE_VOLUME, &value);
101 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 101 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -139,7 +139,7 @@ T_JZsdkReturnCode UIcontrol_SetVolume(int DeviceName,int value) @@ -139,7 +139,7 @@ T_JZsdkReturnCode UIcontrol_SetVolume(int DeviceName,int value)
139 //循环播放 139 //循环播放
140 T_JZsdkReturnCode UIcontrol_Set_AudioPlayLoop(int DeviceName,int value) 140 T_JZsdkReturnCode UIcontrol_Set_AudioPlayLoop(int DeviceName,int value)
141 { 141 {
142 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 142 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
143 //调用喊话器的接口 143 //调用喊话器的接口
144 T_JZsdkReturnCode ret = Megaphone_param(JZ_FLAGCODE_SET, MEGAPHONE_LOOP, &value); 144 T_JZsdkReturnCode ret = Megaphone_param(JZ_FLAGCODE_SET, MEGAPHONE_LOOP, &value);
145 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 145 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -183,7 +183,7 @@ T_JZsdkReturnCode UIcontrol_Set_AudioPlayLoop(int DeviceName,int value) @@ -183,7 +183,7 @@ T_JZsdkReturnCode UIcontrol_Set_AudioPlayLoop(int DeviceName,int value)
183 //循环播放间隔 183 //循环播放间隔
184 T_JZsdkReturnCode UIcontrol_Set_AudioPlayLoopInterval(int DeviceName,int value) 184 T_JZsdkReturnCode UIcontrol_Set_AudioPlayLoopInterval(int DeviceName,int value)
185 { 185 {
186 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 186 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
187 //调用喊话器的接口 187 //调用喊话器的接口
188 T_JZsdkReturnCode ret = Megaphone_param(JZ_FLAGCODE_SET, MEGAPHONE_LOOP_INTERVAL, &value); 188 T_JZsdkReturnCode ret = Megaphone_param(JZ_FLAGCODE_SET, MEGAPHONE_LOOP_INTERVAL, &value);
189 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 189 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -232,7 +232,7 @@ T_JZsdkReturnCode UIcontrol_Set_AudioPlayLoopInterval(int DeviceName,int value) @@ -232,7 +232,7 @@ T_JZsdkReturnCode UIcontrol_Set_AudioPlayLoopInterval(int DeviceName,int value)
232 //开始opus实时 232 //开始opus实时
233 T_JZsdkReturnCode UIcontrol_OpusRealTimeVoice_Start(int DeviceName, int BitRate) 233 T_JZsdkReturnCode UIcontrol_OpusRealTimeVoice_Start(int DeviceName, int BitRate)
234 { 234 {
235 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 235 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
236 //调用接口 236 //调用接口
237 T_JZsdkReturnCode ret = Megaphone_RealTimeVoice_Start(BitRate); 237 T_JZsdkReturnCode ret = Megaphone_RealTimeVoice_Start(BitRate);
238 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 238 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -276,7 +276,7 @@ T_JZsdkReturnCode UIcontrol_OpusRealTimeVoice_Start(int DeviceName, int BitRate) @@ -276,7 +276,7 @@ T_JZsdkReturnCode UIcontrol_OpusRealTimeVoice_Start(int DeviceName, int BitRate)
276 //opus实时传输 276 //opus实时传输
277 T_JZsdkReturnCode UIcontrol_OpusRealTimeVoice_Trans(int DeviceName, char* data, int size) 277 T_JZsdkReturnCode UIcontrol_OpusRealTimeVoice_Trans(int DeviceName, char* data, int size)
278 { 278 {
279 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 279 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
280 //调用接口 280 //调用接口
281 T_JZsdkReturnCode ret = Megaphone_RealTimeVoice_Trans(data, size); 281 T_JZsdkReturnCode ret = Megaphone_RealTimeVoice_Trans(data, size);
282 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 282 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -293,7 +293,7 @@ T_JZsdkReturnCode UIcontrol_OpusRealTimeVoice_Trans(int DeviceName, char* data, @@ -293,7 +293,7 @@ T_JZsdkReturnCode UIcontrol_OpusRealTimeVoice_Trans(int DeviceName, char* data,
293 //结束opus实时 293 //结束opus实时
294 T_JZsdkReturnCode UIcontrol_OpusRealTimeVoice_Close(int DeviceName) 294 T_JZsdkReturnCode UIcontrol_OpusRealTimeVoice_Close(int DeviceName)
295 { 295 {
296 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 296 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
297 //调用接口 297 //调用接口
298 T_JZsdkReturnCode ret = Megaphone_RealTimeVoice_Close(); 298 T_JZsdkReturnCode ret = Megaphone_RealTimeVoice_Close();
299 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 299 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -342,7 +342,7 @@ T_JZsdkReturnCode UIcontrol_OpusRealTimeVoice_Close(int DeviceName) @@ -342,7 +342,7 @@ T_JZsdkReturnCode UIcontrol_OpusRealTimeVoice_Close(int DeviceName)
342 //播放指定名字的音频文件 342 //播放指定名字的音频文件
343 T_JZsdkReturnCode UIcontrol_PlayAudioFile(int DeviceName, char *MusicName, int MusicNameLen) 343 T_JZsdkReturnCode UIcontrol_PlayAudioFile(int DeviceName, char *MusicName, int MusicNameLen)
344 { 344 {
345 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 345 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
346 //调用喊话器的播放接口 346 //调用喊话器的播放接口
347 T_JZsdkReturnCode ret = Megaphone_PlayAudioFile(MusicName, MusicNameLen); 347 T_JZsdkReturnCode ret = Megaphone_PlayAudioFile(MusicName, MusicNameLen);
348 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 348 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -386,7 +386,7 @@ T_JZsdkReturnCode UIcontrol_PlayAudioFile(int DeviceName, char *MusicName, int M @@ -386,7 +386,7 @@ T_JZsdkReturnCode UIcontrol_PlayAudioFile(int DeviceName, char *MusicName, int M
386 //停止播放音频 386 //停止播放音频
387 T_JZsdkReturnCode UIcontrol_StopPlayAudio(int DeviceName) 387 T_JZsdkReturnCode UIcontrol_StopPlayAudio(int DeviceName)
388 { 388 {
389 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 389 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
390 //调用喊话器的停止接口 390 //调用喊话器的停止接口
391 T_JZsdkReturnCode ret = Megaphone_StopPlay(JZ_FLAGCODE_OFF); 391 T_JZsdkReturnCode ret = Megaphone_StopPlay(JZ_FLAGCODE_OFF);
392 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 392 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -430,7 +430,7 @@ T_JZsdkReturnCode UIcontrol_StopPlayAudio(int DeviceName) @@ -430,7 +430,7 @@ T_JZsdkReturnCode UIcontrol_StopPlayAudio(int DeviceName)
430 //暂停播放音频 430 //暂停播放音频
431 T_JZsdkReturnCode UIcontrol_PausePlayAudio(int DeviceName) 431 T_JZsdkReturnCode UIcontrol_PausePlayAudio(int DeviceName)
432 { 432 {
433 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 433 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
434 //调用喊话器的停止接口 434 //调用喊话器的停止接口
435 T_JZsdkReturnCode ret = Megaphone_PlayPause(); 435 T_JZsdkReturnCode ret = Megaphone_PlayPause();
436 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 436 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -474,7 +474,7 @@ T_JZsdkReturnCode UIcontrol_PausePlayAudio(int DeviceName) @@ -474,7 +474,7 @@ T_JZsdkReturnCode UIcontrol_PausePlayAudio(int DeviceName)
474 //继续播放音频 474 //继续播放音频
475 T_JZsdkReturnCode UIcontrol_ContinuePlayAudio(int DeviceName) 475 T_JZsdkReturnCode UIcontrol_ContinuePlayAudio(int DeviceName)
476 { 476 {
477 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 477 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
478 //调用喊话器的停止接口 478 //调用喊话器的停止接口
479 T_JZsdkReturnCode ret = Megaphone_PlayContinue(); 479 T_JZsdkReturnCode ret = Megaphone_PlayContinue();
480 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 480 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -519,7 +519,7 @@ T_JZsdkReturnCode UIcontrol_ContinuePlayAudio(int DeviceName) @@ -519,7 +519,7 @@ T_JZsdkReturnCode UIcontrol_ContinuePlayAudio(int DeviceName)
519 //上一曲 519 //上一曲
520 T_JZsdkReturnCode UIcontrol_LastSong(int DeviceName) 520 T_JZsdkReturnCode UIcontrol_LastSong(int DeviceName)
521 { 521 {
522 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 522 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
523 //调用喊话器的接口 523 //调用喊话器的接口
524 T_JZsdkReturnCode ret = Megaphone_PlayLastSong(); 524 T_JZsdkReturnCode ret = Megaphone_PlayLastSong();
525 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 525 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -563,7 +563,7 @@ T_JZsdkReturnCode UIcontrol_LastSong(int DeviceName) @@ -563,7 +563,7 @@ T_JZsdkReturnCode UIcontrol_LastSong(int DeviceName)
563 //下一曲 563 //下一曲
564 T_JZsdkReturnCode UIcontrol_NextSong(int DeviceName) 564 T_JZsdkReturnCode UIcontrol_NextSong(int DeviceName)
565 { 565 {
566 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 566 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
567 //调用喊话器的接口 567 //调用喊话器的接口
568 T_JZsdkReturnCode ret = Megaphone_PlayNextSong(); 568 T_JZsdkReturnCode ret = Megaphone_PlayNextSong();
569 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 569 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -615,7 +615,7 @@ T_JZsdkReturnCode UIcontrol_Opus_PlayFixedFile(int DeviceName) @@ -615,7 +615,7 @@ T_JZsdkReturnCode UIcontrol_Opus_PlayFixedFile(int DeviceName)
615 { 615 {
616 JZSDK_LOG_INFO("调用了固定播放"); 616 JZSDK_LOG_INFO("调用了固定播放");
617 617
618 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 618 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
619 //调用喊话器的接口 619 //调用喊话器的接口
620 T_JZsdkReturnCode ret = Megaphone_Opus_PlayFixedFile(); 620 T_JZsdkReturnCode ret = Megaphone_Opus_PlayFixedFile();
621 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 621 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -664,7 +664,7 @@ T_JZsdkReturnCode UIcontrol_Opus_PlayFixedFile(int DeviceName) @@ -664,7 +664,7 @@ T_JZsdkReturnCode UIcontrol_Opus_PlayFixedFile(int DeviceName)
664 //播放TTS 664 //播放TTS
665 T_JZsdkReturnCode UIcontrol_TTS_Play(int DeviceName, char *data, int len) 665 T_JZsdkReturnCode UIcontrol_TTS_Play(int DeviceName, char *data, int len)
666 { 666 {
667 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 667 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
668 //调用喊话器的接口 668 //调用喊话器的接口
669 T_JZsdkReturnCode ret = Megaphone_TTS_Play(data, len, JZ_FLAGCODE_ON); 669 T_JZsdkReturnCode ret = Megaphone_TTS_Play(data, len, JZ_FLAGCODE_ON);
670 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 670 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -708,7 +708,7 @@ T_JZsdkReturnCode UIcontrol_TTS_Play(int DeviceName, char *data, int len) @@ -708,7 +708,7 @@ T_JZsdkReturnCode UIcontrol_TTS_Play(int DeviceName, char *data, int len)
708 //设置TTS音色 708 //设置TTS音色
709 T_JZsdkReturnCode UIcontrol_Set_TTS_tone(int DeviceName,int value) 709 T_JZsdkReturnCode UIcontrol_Set_TTS_tone(int DeviceName,int value)
710 { 710 {
711 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 711 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
712 //调用喊话器的接口 712 //调用喊话器的接口
713 T_JZsdkReturnCode ret = Megaphone_TTS_param(JZ_FLAGCODE_SET, MEGAPHONE_TTS_TONE, &value); 713 T_JZsdkReturnCode ret = Megaphone_TTS_param(JZ_FLAGCODE_SET, MEGAPHONE_TTS_TONE, &value);
714 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 714 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -752,7 +752,7 @@ T_JZsdkReturnCode UIcontrol_Set_TTS_tone(int DeviceName,int value) @@ -752,7 +752,7 @@ T_JZsdkReturnCode UIcontrol_Set_TTS_tone(int DeviceName,int value)
752 //设置TTS语速 752 //设置TTS语速
753 T_JZsdkReturnCode UIcontrol_Set_TTS_speed(int DeviceName,int value) 753 T_JZsdkReturnCode UIcontrol_Set_TTS_speed(int DeviceName,int value)
754 { 754 {
755 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 755 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
756 //调用喊话器的接口 756 //调用喊话器的接口
757 T_JZsdkReturnCode ret = Megaphone_TTS_param(JZ_FLAGCODE_SET, MEGAPHONE_TTS_SPEED, &value); 757 T_JZsdkReturnCode ret = Megaphone_TTS_param(JZ_FLAGCODE_SET, MEGAPHONE_TTS_SPEED, &value);
758 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 758 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -796,7 +796,7 @@ T_JZsdkReturnCode UIcontrol_Set_TTS_speed(int DeviceName,int value) @@ -796,7 +796,7 @@ T_JZsdkReturnCode UIcontrol_Set_TTS_speed(int DeviceName,int value)
796 //设置TTS追加音色 796 //设置TTS追加音色
797 T_JZsdkReturnCode UIcontrol_Set_TTS_AppendTone(int DeviceName,int value) 797 T_JZsdkReturnCode UIcontrol_Set_TTS_AppendTone(int DeviceName,int value)
798 { 798 {
799 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 799 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
800 //调用喊话器的接口 800 //调用喊话器的接口
801 T_JZsdkReturnCode ret = Megaphone_TTS_param(JZ_FLAGCODE_SET, MEGAPHONE_TTS_APPEND_TONE, &value); 801 T_JZsdkReturnCode ret = Megaphone_TTS_param(JZ_FLAGCODE_SET, MEGAPHONE_TTS_APPEND_TONE, &value);
802 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 802 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -1763,7 +1763,7 @@ T_JZsdkReturnCode UIcontrol_ObtainGimbal_Pitch(int DeviceName, int GimbalPitchAn @@ -1763,7 +1763,7 @@ T_JZsdkReturnCode UIcontrol_ObtainGimbal_Pitch(int DeviceName, int GimbalPitchAn
1763 **********/ 1763 **********/
1764 T_JZsdkReturnCode UIcontrol_VideoRecordFuntion(int DeviceName, int status) 1764 T_JZsdkReturnCode UIcontrol_VideoRecordFuntion(int DeviceName, int status)
1765 { 1765 {
1766 -#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON 1766 +#ifdef MEDIA_PROC_CONFIG_STATUS_ON
1767 //调用录制模式的接口 1767 //调用录制模式的接口
1768 T_JZsdkReturnCode ret = VideoRecord_TransMode(status); 1768 T_JZsdkReturnCode ret = VideoRecord_TransMode(status);
1769 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1769 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -1790,7 +1790,7 @@ T_JZsdkReturnCode UIcontrol_VideoRecordFuntion(int DeviceName, int status) @@ -1790,7 +1790,7 @@ T_JZsdkReturnCode UIcontrol_VideoRecordFuntion(int DeviceName, int status)
1790 **********/ 1790 **********/
1791 T_JZsdkReturnCode UIcontrol_Set_ShootPhoto(int DeviceName, int num) 1791 T_JZsdkReturnCode UIcontrol_Set_ShootPhoto(int DeviceName, int num)
1792 { 1792 {
1793 -#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON 1793 +#ifdef MEDIA_PROC_CONFIG_STATUS_ON
1794 //调用拍照数量接口 1794 //调用拍照数量接口
1795 T_JZsdkReturnCode ret = VideoRecord_ShootPhotoNum(num); 1795 T_JZsdkReturnCode ret = VideoRecord_ShootPhotoNum(num);
1796 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1796 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -1817,7 +1817,7 @@ T_JZsdkReturnCode UIcontrol_Set_ShootPhoto(int DeviceName, int num) @@ -1817,7 +1817,7 @@ T_JZsdkReturnCode UIcontrol_Set_ShootPhoto(int DeviceName, int num)
1817 T_JZsdkReturnCode UIcontrol_Set_VideoMgmtPushIndex(int DeviceName, int Pushindex) 1817 T_JZsdkReturnCode UIcontrol_Set_VideoMgmtPushIndex(int DeviceName, int Pushindex)
1818 { 1818 {
1819 T_JZsdkReturnCode ret; 1819 T_JZsdkReturnCode ret;
1820 -#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON 1820 +#ifdef MEDIA_PROC_CONFIG_STATUS_ON
1821 //1、设置推流索引值 1821 //1、设置推流索引值
1822 ret = VideoMgmt_VideoStreamFlowIndex(Pushindex); 1822 ret = VideoMgmt_VideoStreamFlowIndex(Pushindex);
1823 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1823 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -1856,7 +1856,7 @@ T_JZsdkReturnCode UIcontrol_Set_VideoMgmtPushIndex(int DeviceName, int Pushinde @@ -1856,7 +1856,7 @@ T_JZsdkReturnCode UIcontrol_Set_VideoMgmtPushIndex(int DeviceName, int Pushinde
1856 T_JZsdkReturnCode UIcontrol_Set_ShutterSwitch(int DeviceName, int value) 1856 T_JZsdkReturnCode UIcontrol_Set_ShutterSwitch(int DeviceName, int value)
1857 { 1857 {
1858 T_JZsdkReturnCode ret; 1858 T_JZsdkReturnCode ret;
1859 -#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON 1859 +#ifdef MEDIA_PROC_CONFIG_STATUS_ON
1860 //1、设置推流索引值 1860 //1、设置推流索引值
1861 ret = JZsdk_Camera_ShutterSwitch(value); 1861 ret = JZsdk_Camera_ShutterSwitch(value);
1862 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1862 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -1892,7 +1892,7 @@ T_JZsdkReturnCode UIcontrol_Set_ShutterSwitch(int DeviceName, int value) @@ -1892,7 +1892,7 @@ T_JZsdkReturnCode UIcontrol_Set_ShutterSwitch(int DeviceName, int value)
1892 T_JZsdkReturnCode UIcontrol_Set_PseudoColor(int DeviceName, int value) 1892 T_JZsdkReturnCode UIcontrol_Set_PseudoColor(int DeviceName, int value)
1893 { 1893 {
1894 T_JZsdkReturnCode ret; 1894 T_JZsdkReturnCode ret;
1895 -#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON 1895 +#ifdef MEDIA_PROC_CONFIG_STATUS_ON
1896 //1、设置推流索引值 1896 //1、设置推流索引值
1897 ret = Camera_param(JZ_FLAGCODE_SET, CAMERA_PSEUDO_COLOR, &value); 1897 ret = Camera_param(JZ_FLAGCODE_SET, CAMERA_PSEUDO_COLOR, &value);
1898 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1898 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -1929,7 +1929,7 @@ T_JZsdkReturnCode UIcontrol_Set_PseudoColor(int DeviceName, int value) @@ -1929,7 +1929,7 @@ T_JZsdkReturnCode UIcontrol_Set_PseudoColor(int DeviceName, int value)
1929 T_JZsdkReturnCode UIcontrol_Set_PixelColorMode(int DeviceName, int value) 1929 T_JZsdkReturnCode UIcontrol_Set_PixelColorMode(int DeviceName, int value)
1930 { 1930 {
1931 T_JZsdkReturnCode ret; 1931 T_JZsdkReturnCode ret;
1932 -#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON 1932 +#ifdef MEDIA_PROC_CONFIG_STATUS_ON
1933 //1、设置推流索引值 1933 //1、设置推流索引值
1934 ret = Camera_param(JZ_FLAGCODE_SET, CAMERA_PIXEL_PSEUDO_COLOR_MODE, &value); 1934 ret = Camera_param(JZ_FLAGCODE_SET, CAMERA_PIXEL_PSEUDO_COLOR_MODE, &value);
1935 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1935 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -1966,7 +1966,7 @@ T_JZsdkReturnCode UIcontrol_Set_PixelColorMode(int DeviceName, int value) @@ -1966,7 +1966,7 @@ T_JZsdkReturnCode UIcontrol_Set_PixelColorMode(int DeviceName, int value)
1966 T_JZsdkReturnCode UIcontrol_Set_ZoomSize(int DeviceName, int value) 1966 T_JZsdkReturnCode UIcontrol_Set_ZoomSize(int DeviceName, int value)
1967 { 1967 {
1968 T_JZsdkReturnCode ret = JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; 1968 T_JZsdkReturnCode ret = JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
1969 -#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON 1969 +#ifdef MEDIA_PROC_CONFIG_STATUS_ON
1970 1970
1971 //1、设置变焦值 1971 //1、设置变焦值
1972 ret = Camera_param(JZ_FLAGCODE_SET, CAMERA_RESIZE, &value); 1972 ret = Camera_param(JZ_FLAGCODE_SET, CAMERA_RESIZE, &value);
@@ -1989,7 +1989,7 @@ T_JZsdkReturnCode UIcontrol_Set_ZoomSize(int DeviceName, int value) @@ -1989,7 +1989,7 @@ T_JZsdkReturnCode UIcontrol_Set_ZoomSize(int DeviceName, int value)
1989 T_JZsdkReturnCode UIcontrol_Set_GasEnhancementColor(int DeviceName, int value) 1989 T_JZsdkReturnCode UIcontrol_Set_GasEnhancementColor(int DeviceName, int value)
1990 { 1990 {
1991 T_JZsdkReturnCode ret; 1991 T_JZsdkReturnCode ret;
1992 -#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON 1992 +#ifdef MEDIA_PROC_CONFIG_STATUS_ON
1993 //1、设置推流索引值 1993 //1、设置推流索引值
1994 ret = Camera_param(JZ_FLAGCODE_SET, CAMERA_GAS_ENHANCEMENT_COLOR, &value); 1994 ret = Camera_param(JZ_FLAGCODE_SET, CAMERA_GAS_ENHANCEMENT_COLOR, &value);
1995 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1995 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -2025,7 +2025,7 @@ T_JZsdkReturnCode UIcontrol_Set_GasEnhancementColor(int DeviceName, int value) @@ -2025,7 +2025,7 @@ T_JZsdkReturnCode UIcontrol_Set_GasEnhancementColor(int DeviceName, int value)
2025 T_JZsdkReturnCode UIcontrol_Set_SPCmode(int DeviceName, int value) 2025 T_JZsdkReturnCode UIcontrol_Set_SPCmode(int DeviceName, int value)
2026 { 2026 {
2027 T_JZsdkReturnCode ret; 2027 T_JZsdkReturnCode ret;
2028 -#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON 2028 +#ifdef MEDIA_PROC_CONFIG_STATUS_ON
2029 //1、设置红外 2029 //1、设置红外
2030 ret = Proc_IRC_param(JZ_FLAGCODE_SET, JZSDK_WIDGET_SPC_MODE, &value); 2030 ret = Proc_IRC_param(JZ_FLAGCODE_SET, JZSDK_WIDGET_SPC_MODE, &value);
2031 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 2031 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -2061,7 +2061,7 @@ T_JZsdkReturnCode UIcontrol_Set_SPCmode(int DeviceName, int value) @@ -2061,7 +2061,7 @@ T_JZsdkReturnCode UIcontrol_Set_SPCmode(int DeviceName, int value)
2061 T_JZsdkReturnCode UIcontrol_Set_SpcAutoTime(int DeviceName, int value) 2061 T_JZsdkReturnCode UIcontrol_Set_SpcAutoTime(int DeviceName, int value)
2062 { 2062 {
2063 T_JZsdkReturnCode ret; 2063 T_JZsdkReturnCode ret;
2064 -#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON 2064 +#ifdef MEDIA_PROC_CONFIG_STATUS_ON
2065 //1、设置红外 2065 //1、设置红外
2066 ret = Proc_IRC_param(JZ_FLAGCODE_SET, JZSDK_WIDGET_SPC_AUTO_TIME, &value); 2066 ret = Proc_IRC_param(JZ_FLAGCODE_SET, JZSDK_WIDGET_SPC_AUTO_TIME, &value);
2067 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 2067 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -2097,7 +2097,7 @@ T_JZsdkReturnCode UIcontrol_Set_SpcAutoTime(int DeviceName, int value) @@ -2097,7 +2097,7 @@ T_JZsdkReturnCode UIcontrol_Set_SpcAutoTime(int DeviceName, int value)
2097 T_JZsdkReturnCode UIcontrol_Set_TpcMode(int DeviceName, int value) 2097 T_JZsdkReturnCode UIcontrol_Set_TpcMode(int DeviceName, int value)
2098 { 2098 {
2099 T_JZsdkReturnCode ret; 2099 T_JZsdkReturnCode ret;
2100 -#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON 2100 +#ifdef MEDIA_PROC_CONFIG_STATUS_ON
2101 //1、设置红外 2101 //1、设置红外
2102 ret = Proc_IRC_param(JZ_FLAGCODE_SET, JZSDK_WIDGET_TPC_MODE, &value); 2102 ret = Proc_IRC_param(JZ_FLAGCODE_SET, JZSDK_WIDGET_TPC_MODE, &value);
2103 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 2103 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -2133,7 +2133,7 @@ T_JZsdkReturnCode UIcontrol_Set_TpcMode(int DeviceName, int value) @@ -2133,7 +2133,7 @@ T_JZsdkReturnCode UIcontrol_Set_TpcMode(int DeviceName, int value)
2133 T_JZsdkReturnCode UIcontrol_Set_AutoBadPixelCorrectMode(int DeviceName, int value) 2133 T_JZsdkReturnCode UIcontrol_Set_AutoBadPixelCorrectMode(int DeviceName, int value)
2134 { 2134 {
2135 T_JZsdkReturnCode ret; 2135 T_JZsdkReturnCode ret;
2136 -#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON 2136 +#ifdef MEDIA_PROC_CONFIG_STATUS_ON
2137 //1、设置红外 2137 //1、设置红外
2138 ret = Proc_IRC_param(JZ_FLAGCODE_SET, JZSDK_WIDGET_BAD_PIXEL_CORRECT_MODE, &value); 2138 ret = Proc_IRC_param(JZ_FLAGCODE_SET, JZSDK_WIDGET_BAD_PIXEL_CORRECT_MODE, &value);
2139 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 2139 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -2171,7 +2171,7 @@ T_JZsdkReturnCode UIcontrol_Set_AutoBadPixelCorrectMode(int DeviceName, int valu @@ -2171,7 +2171,7 @@ T_JZsdkReturnCode UIcontrol_Set_AutoBadPixelCorrectMode(int DeviceName, int valu
2171 T_JZsdkReturnCode UIcontrol_FreezeVideo(int DeviceName, int value) 2171 T_JZsdkReturnCode UIcontrol_FreezeVideo(int DeviceName, int value)
2172 { 2172 {
2173 T_JZsdkReturnCode ret; 2173 T_JZsdkReturnCode ret;
2174 -#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON 2174 +#ifdef MEDIA_PROC_CONFIG_STATUS_ON
2175 //1、设置推流索引值 2175 //1、设置推流索引值
2176 ret = VideoMgmt_param(JZ_FLAGCODE_SET, VIDEO_MGMT_FREEZE, &value); 2176 ret = VideoMgmt_param(JZ_FLAGCODE_SET, VIDEO_MGMT_FREEZE, &value);
2177 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 2177 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -2208,7 +2208,7 @@ T_JZsdkReturnCode UIcontrol_FreezeVideo(int DeviceName, int value) @@ -2208,7 +2208,7 @@ T_JZsdkReturnCode UIcontrol_FreezeVideo(int DeviceName, int value)
2208 T_JZsdkReturnCode UIcontrol_CameraCorrectionMode(int DeviceName, int value) 2208 T_JZsdkReturnCode UIcontrol_CameraCorrectionMode(int DeviceName, int value)
2209 { 2209 {
2210 T_JZsdkReturnCode ret; 2210 T_JZsdkReturnCode ret;
2211 -#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON 2211 +#ifdef MEDIA_PROC_CONFIG_STATUS_ON
2212 //1、设置推流索引值 2212 //1、设置推流索引值
2213 ret = Camera_param(JZ_FLAGCODE_SET, CAMERA_CORRCTION_MODE, &value); 2213 ret = Camera_param(JZ_FLAGCODE_SET, CAMERA_CORRCTION_MODE, &value);
2214 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 2214 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -2246,7 +2246,7 @@ T_JZsdkReturnCode UIcontrol_CameraCorrectionMode(int DeviceName, int value) @@ -2246,7 +2246,7 @@ T_JZsdkReturnCode UIcontrol_CameraCorrectionMode(int DeviceName, int value)
2246 T_JZsdkReturnCode UIcontrol_GasEnhancementCorrect(int DeviceName, int value) 2246 T_JZsdkReturnCode UIcontrol_GasEnhancementCorrect(int DeviceName, int value)
2247 { 2247 {
2248 T_JZsdkReturnCode ret; 2248 T_JZsdkReturnCode ret;
2249 -#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON 2249 +#ifdef MEDIA_PROC_CONFIG_STATUS_ON
2250 //1、设置推流索引值 2250 //1、设置推流索引值
2251 ret = Camera_param(JZ_FLAGCODE_SET, CAMERA_GAS_ENHANCEMENT_CORRCTION, &value); 2251 ret = Camera_param(JZ_FLAGCODE_SET, CAMERA_GAS_ENHANCEMENT_CORRCTION, &value);
2252 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 2252 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -2268,7 +2268,7 @@ T_JZsdkReturnCode UIcontrol_GasEnhancementCorrect(int DeviceName, int value) @@ -2268,7 +2268,7 @@ T_JZsdkReturnCode UIcontrol_GasEnhancementCorrect(int DeviceName, int value)
2268 T_JZsdkReturnCode UIcontrol_CameraRegionbox(int DeviceName, int value1, int value2) 2268 T_JZsdkReturnCode UIcontrol_CameraRegionbox(int DeviceName, int value1, int value2)
2269 { 2269 {
2270 T_JZsdkReturnCode ret; 2270 T_JZsdkReturnCode ret;
2271 -#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON 2271 +#ifdef MEDIA_PROC_CONFIG_STATUS_ON
2272 int param[2]; 2272 int param[2];
2273 param[0] = value1; 2273 param[0] = value1;
2274 param[1] = value2; 2274 param[1] = value2;
@@ -2307,7 +2307,7 @@ T_JZsdkReturnCode UIcontrol_CameraRegionbox(int DeviceName, int value1, int valu @@ -2307,7 +2307,7 @@ T_JZsdkReturnCode UIcontrol_CameraRegionbox(int DeviceName, int value1, int valu
2307 **********/ 2307 **********/
2308 T_JZsdkReturnCode UIcontrol_Camera_BadPixelSwitch(int DeviceName, int value) 2308 T_JZsdkReturnCode UIcontrol_Camera_BadPixelSwitch(int DeviceName, int value)
2309 { 2309 {
2310 -#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON 2310 +#ifdef MEDIA_PROC_CONFIG_STATUS_ON
2311 T_JZsdkReturnCode ret; 2311 T_JZsdkReturnCode ret;
2312 ret = JZsdk_Camera_BadPixelSwitch(); 2312 ret = JZsdk_Camera_BadPixelSwitch();
2313 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 2313 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -2324,7 +2324,7 @@ T_JZsdkReturnCode UIcontrol_Camera_BadPixelSwitch(int DeviceName, int value) @@ -2324,7 +2324,7 @@ T_JZsdkReturnCode UIcontrol_Camera_BadPixelSwitch(int DeviceName, int value)
2324 **********/ 2324 **********/
2325 T_JZsdkReturnCode UIcontrol_Camera_SPC_ResetSwitch(int DeviceName, int value) 2325 T_JZsdkReturnCode UIcontrol_Camera_SPC_ResetSwitch(int DeviceName, int value)
2326 { 2326 {
2327 -#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON 2327 +#ifdef MEDIA_PROC_CONFIG_STATUS_ON
2328 T_JZsdkReturnCode ret; 2328 T_JZsdkReturnCode ret;
2329 ret = JZsdk_CameraSPC_ResetSwitch(); 2329 ret = JZsdk_CameraSPC_ResetSwitch();
2330 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 2330 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -13,7 +13,7 @@ static T_JZsdkReturnCode JZSDK_WidgetMgMT_DJI_GetWidgetIndex(int tpye, int *inde @@ -13,7 +13,7 @@ static T_JZsdkReturnCode JZSDK_WidgetMgMT_DJI_GetWidgetIndex(int tpye, int *inde
13 int ReturnIndex1 = 0; 13 int ReturnIndex1 = 0;
14 int ReturnIndex2 = 0; 14 int ReturnIndex2 = 0;
15 15
16 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 16 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
17 switch (tpye) 17 switch (tpye)
18 { 18 {
19 case JZSDK_WIDGET_PLAYANDSTOP: 19 case JZSDK_WIDGET_PLAYANDSTOP:
@@ -33,7 +33,7 @@ static T_JZsdkReturnCode JZSDK_WidgetMgMT_DJI_GetWidgetIndex(int tpye, int *inde @@ -33,7 +33,7 @@ static T_JZsdkReturnCode JZSDK_WidgetMgMT_DJI_GetWidgetIndex(int tpye, int *inde
33 } 33 }
34 #endif 34 #endif
35 35
36 -#if IRC_CONFIG_STATUS == VERSION_SWITCH_ON 36 +#ifdef IRC_CONFIG_STATUS_ON
37 switch (tpye) 37 switch (tpye)
38 { 38 {
39 case JZSDK_WIDGET_VIDEOPUSH_INDEX: 39 case JZSDK_WIDGET_VIDEOPUSH_INDEX: