潘浩彬 / JZSDK_Linux · 提交

转到一个项目

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

保存

内嵌 并排对比
正在显示 24 个修改的文件 包含 465 行增加 和 228 行删除
... ... @@ -86,7 +86,8 @@
"warninglight_v3s_tfa1.h": "c",
"gimbal.h": "c",
"jzsdk_uart_uartdeal.h": "c",
"powermanager_inandout.h": "c"
"powermanager_inandout.h": "c",
"jzsdk_definecode.h": "c"
},
"Codegeex.GenerationPreference": "automatic",
"C_Cpp.dimInactiveRegions": false
... ...
# 编译链的配置
#1、编译链与设备类型的选择
set(DEVICE_NAME JZ_C1)
set(DEVICE_NAME JZ_H1T)
#上一行为禁止修改行
message("**************************JZSDK构建编译开始***************************\n")
... ...
... ... @@ -139,12 +139,12 @@ if(${MEGAPHONE_MODULE} STREQUAL "VERSION_SWITCH_ON")
set(OPUS_MODULE VERSION_SWITCH_ON)
endif()
#如果要加载电源管理模块，需要加载以下附属内容
if(${POWER_MANAGER_MODULE} STREQUAL "VERSION_SWITCH_ON")
#如果要加载通用模块，需要加载以下附属内容
if(${COMMON_MODULE} STREQUAL "VERSION_SWITCH_ON")
message("\n电源模块加载中")
file(GLOB_RECURSE POWERMANAGER_SRC ${ROOT_DIRS}Module/PowerManager/*.c)
list(APPEND ALL_SRC_FILES ${POWERMANAGER_SRC})
message("\n通用模块加载中")
file(GLOB_RECURSE COMMON_MODULE_SRC ${ROOT_DIRS}Module/CommonMod/*.c)
list(APPEND ALL_SRC_FILES ${COMMON_MODULE_SRC})
endif()
... ... @@ -200,7 +200,7 @@ list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/Gimbal)
list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/Lighting)
list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/UI_control)
list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/Camera)
list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/PowerManager)
list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/COMMONManager)
list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/TestAPP)
list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/ImageProcessing)
list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/SerialManagement)
... ...
... ... @@ -26,7 +26,7 @@ set(LIGHTING_MODULE VERSION_SWITCH_OFF)
set(MEGAPHONE_MODULE VERSION_SWITCH_OFF)
# 电源管理模块
set(POWER_MANAGER_MODULE VERSION_SWITCH_OFF)
set(COMMON_MODULE VERSION_SWITCH_OFF)
# UI管理模块
set(UI_CONTROL_MODULE VERSION_SWITCH_OFF)
... ... @@ -66,8 +66,8 @@ set(DEVICE_CONFIG_MODULE VERSION_SWITCH_ON)
# 添加UI管理模块
set(UI_CONTROL_MODULE VERSION_SWITCH_ON)
# 添加电源管理模块
set(POWER_MANAGER_MODULE VERSION_SWITCH_ON)
# 添加通用模块
set(COMMON_MODULE VERSION_SWITCH_ON)
message("通用库加载完成")
... ...
... ... @@ -25,6 +25,7 @@ extern "C" {
#include "./JZsdk_FileType.h"
#include "./JZsdk_WidgetCode.h"
#include "./JZsdk_DefineCode.h"
#include "./JZsdk_DeviceCode.h"
/* Exported types ------------------------------------------------------------*/
... ...
#include <stdio.h>
#include "./JZsdk_DeviceCode.h"
unsigned char *JZsdk_GetDeviceName()
{
return
}
... ...
/* ********************************************************************
*
* 用来规范version_choose的参数
*
***********************************************/
#ifndef JZSDK_DEVICE_CODE_H
#define JZSDK_DEVICE_CODE_H
//特殊版本号
typedef enum SpecialVersion
{
SPECIAL_NORMAL = 0x01, //普通版本
SPECIAL_DAOTONG = 0x02, //道通版本
}SpecialVersion;
//软件模式
typedef enum AppMode
{
APP_PSDK = 0x01, //psdk设备
APP_UART = 0x02, //串口设备
APP_TEST = 0x03, //测试设备
}AppMode;
//平台选择
typedef enum Platform
{
PLATFORM_H3 = 0x01, //H3平台
PLATFORM_V3S = 0x02, //V3S平台
}Platform;
//固件属地
typedef enum FirmwarePlace
{
OVERSEAS_VERSION = 0x01, //海外版
DOMESTIC_VERSION = 0x02, //国内版
}FirmwarePlace;
//加载开关
typedef enum VersionLoadSwitch
{
VERSION_SWITCH_ON = 0x0001, //加载
VERSION_SWITCH_OFF = 0x0000, //不加载
}VersionLoadSwitch;
//设备名
typedef enum DeviceName
{
JZ_H1E = 0x0011, //H1E
JZ_H1T = 0x0016, //H1T
JZ_U3 = 0x0017, //U3
JZ_U3S = 0x0018, //U3S
JZ_U3D = 0x0019, //U3D
JZ_U30 = 0x001A, //U30
JZ_H150S = 0x0013, //H150S
JZ_H150T = 0x0015, //H150T
JZ_H10 = 0x0012, //H10
JZ_H10T = 0x0014, //H10T
TF_A1 = 0x1010, //TF-A1
JZ_C1 = 0x1011, //C1
}DeviceName;
/***********************************
*
* 已退出历史舞台
*
* *********************************/
// //音频滤波的方式
// //目前只有和h10使用带阻滤波
// #define DIRECTED_STOPBAND_FILTERING 0x10001 //带阻滤波
// #define HIGH_PASS_FILTERING 0x10002 //高通滤波
// #define INTERGRATED_FILTERING_1 0x10003 //综合滤波1代
#endif
... ...
... ... @@ -29,7 +29,7 @@
#endif
#include "DeviceInfo/DeviceInfo.h"
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
#include "AudioDeal/AudioDeal.h"
#include "Megaphone/Megaphone.h"
#endif
... ... @@ -58,7 +58,7 @@ T_JZsdkReturnCode Main_M30_all_filter_mode(int *mode)
{
//喊话器功能被打开时
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
if (*mode == JZ_FLAGCODE_GET)
{
*mode = g_All_filter_Mode;
... ... @@ -149,7 +149,7 @@ T_JZsdkReturnCode Main_APP_Psdk()
JZsdk_data_transmisson_Receive_Init();
//喊话器功能被打开时
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
//音频库初始化
AudioDeal_Init();
... ... @@ -382,7 +382,7 @@ int Main_APP_Uart()
Main_WorkMode();
//喊话器功能被打开时
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
//音频库初始化
AudioDeal_Init();
#endif
... ... @@ -752,7 +752,7 @@ static void *Main_WorkModeTask(void *arg)
JZSDK_LOG_INFO("选择开始psdk播报");
#endif
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
while (1)
{
if (start_voice_flag == JZ_FLAGCODE_OFF && MegaphoneStatusFlag == JZ_FLAGCODE_ON)
... ...
/* ********************************************************************
*
* 用来规范version_choose的参数
*
***********************************************/
#ifndef CONFIG_PARAMS_H
#define CONFIG_PARAMS_H
//特殊版本号
#define SPECIAL_NORMAL 0x01
#define SPECIAL_DAOTONG 0x02
//软件模式
#define APP_PSDK 0x01 //psdk设备
#define APP_UART 0x02 //串口设备
#define APP_TEST 0x03 //测试设备
//平台选择
#define PLATFORM_H3 0x01
#define PLATFORM_V3S 0x02
//固件属地
#define OVERSEAS_VERSION 0x01 //海外版
#define DOMESTIC_VERSION 0x02 //国内版
//音频滤波的方式
//目前只有和h10使用带阻滤波
#define DIRECTED_STOPBAND_FILTERING 0x10001 //带阻滤波
#define HIGH_PASS_FILTERING 0x10002 //高通滤波
#define INTERGRATED_FILTERING_1 0x10003 //综合滤波1代
//加载开关
#define VERSION_SWITCH_ON 0x0001
#define VERSION_SWITCH_OFF 0x0000
//设备选择
#define JZ_H1E 0x0011
#define JZ_H1T 0x0016
#define JZ_U3 0x0017
#define JZ_U3S 0x0018
#define JZ_U3D 0x0019
#define JZ_U30 0x001A
#define JZ_H150S 0x0013
#define JZ_H150T 0x0015
#define JZ_H10 0x0012
#define JZ_H10T 0x0014
#define TF_A1 0x1010
#define JZ_C1 0x1011
#endif
... ... @@ -5,24 +5,23 @@
***********************************************/
#ifndef VERSION_CHOOSE_H
#define VERSION_CHOOSE_H
#include "./ConfigParams.h"
#include "JZsdk_Base/JZsdk_Code/JZsdk_DeviceNameCode.h"
//1~10行 除了D可以修改版本选择 禁止动任何东西
#define DEVICE_VERSION JZ_C1
#define DEVICE_VERSION JZ_H1T
//禁止修改行 选择是串口程序 还是 psdk程序
#define APP_VERSION APP_PSDK
#define APP_VERSION APP_UART
//禁止修改行 板子型号
#define PLATFORM_VERSION PLATFORM_V3S
//禁止修改行 串口连接程序的软件版本号
#define MAJOR_VERSION 0x01
#define MINOR_VERSION 0x03
#define MODIFY_VERSION 0x09
#define DEBUG_VERSION 0x07
//禁止修改行 滤波方式
#define FILTERING_TYPE HIGH_PASS_FILTERING
#define MAJOR_VERSION 0x00
#define MINOR_VERSION 0x00
#define MODIFY_VERSION 0x02
#define DEBUG_VERSION 0x12
//禁止修改行固件属地 目前 国内版/海外版
#define FIRMWARE_ORIGIN DOMESTIC_VERSION
... ... @@ -40,25 +39,17 @@
#ifdef COMPILE_MODE_MODULE
//是否开启喊话器功能
#ifdef MACRO_MEGAPHONE_MODULE
#define MEGAPHONE_CONFIG_STATUS VERSION_SWITCH_ON
#else
#define MEGAPHONE_CONFIG_STATUS VERSION_SWITCH_OFF
#define MEGAPHONE_CONFIG_STATUS_ON
#endif
//是否开启媒体功能
#ifdef MACRO_MEDIA_PROC_MODULE
#define MEDIA_PROC_CONFIG_STATUS VERSION_SWITCH_ON
#define MEDIA_PROC_CONFIG_STATUS_ON
#else
#define MEDIA_PROC_CONFIG_STATUS VERSION_SWITCH_OFF
#endif
//是否开启红外相机功能
#ifdef MACRO_IRC_MODULE
#define IRC_CONFIG_STATUS VERSION_SWITCH_ON
#define IRC_CONFIG_STATUS_ON
#else
#define IRC_CONFIG_STATUS VERSION_SWITCH_OFF
#endif
//是否加载ktirclib
... ... @@ -68,9 +59,7 @@
//是否加载usb模块
#ifdef MACRO_USB_MODULE
#define USB_CONFIG_STATUS VERSION_SWITCH_ON
#else
#define USB_CONFIG_STATUS VERSION_SWITCH_OFF
#define USB_CONFIG_STATUS_ON
#endif
//是否加载RTK_MPP模块
... ... @@ -100,17 +89,16 @@
#else //这里用于方便调试使用，不是实际加载的模组
//是否开启喊话器功能
#define MEGAPHONE_CONFIG_STATUS VERSION_SWITCH_ON
#define MEGAPHONE_CONFIG_STATUS_ON
//是否开启媒体管理功能
#define MEDIA_PROC_CONFIG_STATUS VERSION_SWITCH_ON
#define MEDIA_PROC_CONFIG_STATUS_ON
//是否开启红外相机功能
#define IRC_CONFIG_STATUS VERSION_SWITCH_ON
#define IRC_CONFIG_STATUS_ON
//是否加载usb模块
#define USB_CONFIG_STATUS VERSION_SWITCH_ON
#define USB_CONFIG_STATUS_ON
//是否加载RTK_MPP模块
#define RTK_MPP_STATUS_ON
... ...
... ... @@ -7,7 +7,7 @@
#include "./JZsdk_usb_bulk.h"
#if USB_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef USB_CONFIG_STATUS_ON
#include <libusb-1.0/libusb.h>
#endif
... ... @@ -17,7 +17,7 @@
typedef struct JZsdk_T_HalUsbBulkObj{
#if USB_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef USB_CONFIG_STATUS_ON
libusb_device_handle *handle; //usb的权柄
#endif
... ... @@ -35,7 +35,7 @@ typedef struct JZsdk_T_HalUsbBulkObj{
T_JZsdkReturnCode JZsdk_HalUsbBulk_Init(void **index, int interfaceNum, int isUsbHost,
unsigned int pid, unsigned int vid, unsigned int PointIn, unsigned int PointOut)
{
#if USB_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef USB_CONFIG_STATUS_ON
//创建一个usb信息结构体
struct JZsdk_T_HalUsbBulkObj *UsbBulkObj = NULL;
... ... @@ -121,7 +121,7 @@ T_JZsdkReturnCode JZsdk_HalUsbBulk_WriteData(void **index ,const unsigned char *
int ret;
int actualLen = 0;
#if USB_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef USB_CONFIG_STATUS_ON
ret = libusb_bulk_transfer(UsbBulkObj->handle, UsbBulkObj->PointOut,
(unsigned char *) buf, len, &actualLen, LINUX_USB_BULK_TRANSFER_TIMEOUT_MS);
if (ret < 0) {
... ... @@ -142,7 +142,7 @@ T_JZsdkReturnCode JZsdk_HalUsbBulk_ReadData(void **index ,unsigned char *buf, un
int ret;
int actualLen = 0;
#if USB_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef USB_CONFIG_STATUS_ON
ret = libusb_bulk_transfer(UsbBulkObj->handle, UsbBulkObj->PointIn,
buf, len, &actualLen, LINUX_USB_BULK_TRANSFER_WAIT_FOREVER);
if (ret < 0) {
... ...
#include <stdio.h>
#include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h"
#include "JZsdkLib.h"
/***************
*
* * 通用模块初始化
*
*
* *************/
T_JZsdkReturnCode CommonMod_Init()
{
//初始化升级模块
//初始化心跳模块
//初始化电源模块
}
\ No newline at end of file
... ...
/**
********************************************************************
* @file CommonMod.h
* CommonMod.c的头文件
*
*
*********************************************************************
*/
/* Define to prevent recursive inclusion 避免重定义 -------------------------------------*/
#ifndef COMMONMOD_H
#define COMMONMOD_H
/* Includes ------------------------------------------------------------------*/
#include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h"
#ifdef __cplusplus
extern "C" {
#endif
/* Exported constants --------------------------------------------------------*/
/* 常亮定义*/
/* Exported types ------------------------------------------------------------*/
/* Exported functions --------------------------------------------------------*/
#ifdef __cplusplus
}
#endif
#endif
... ...
#include <stdio.h>
#include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h"
#include "JZsdkLib.h"
#define POWER_STATUS_OFF 0
#define POWER_STATUS_REBOOT 1
//电源管理初始化
T_JZsdkReturnCode PowerManger_Init()
{
... ... @@ -17,15 +15,18 @@ T_JZsdkReturnCode PowerManger_PowerOff()
{
JZSDK_LOG_INFO("执行关闭电源");
JZsdk_RunSystemCmd("poweroff");
return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
}
//电源重启
int PowerManger_PowerReboot()
T_JZsdkReturnCode PowerManger_PowerReboot()
{
JZSDK_LOG_INFO("执行重启电源");
JZsdk_RunSystemCmd("reboot");
return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
}
//电源状态修改
... ... @@ -46,54 +47,3 @@ T_JZsdkReturnCode PowerManger_SetPowerStatus(int status)
}
}
// T_JZsdkReturnCode PowerManger_HeartBeatAsk()
// {
// //如果4G模块有启动
// if (JZsdk_HalPort_UseFlag(UART_4G) == JZ_FLAGCODE_ON)
// {
// JZsdk_Uart_SendDeal_Ask_HeartBeatStatus(UART_4G, 0, 1);
// }
// //如果设备1有启动
// if (JZsdk_HalPort_UseFlag(UART_DEV_1) == JZ_FLAGCODE_ON)
// {
// JZsdk_Uart_SendDeal_Ask_HeartBeatStatus(UART_DEV_1, 0, 1);
// }
// //如果设备2有启动
// if (JZsdk_HalPort_UseFlag(UART_DEV_2) == JZ_FLAGCODE_ON)
// {
// JZsdk_Uart_SendDeal_Ask_HeartBeatStatus(UART_DEV_2, 0, 1);
// }
// //如果psdk接口已经使用
// if (JZsdk_Get_Psdk_UIcontrol_UseFlag() == JZ_FLAGCODE_ON)
// {
// }
// }
// T_JZsdkReturnCode UI_control_Ask_TimeStamp()
// {
// //如果4G模块有启动
// if (JZsdk_HalPort_UseFlag(UART_4G) == JZ_FLAGCODE_ON)
// {
// JZsdk_Uart_SendDeal_Ask_TimeStamp(UART_4G,0);
// }
// //如果设备1有启动
// if (JZsdk_HalPort_UseFlag(UART_DEV_1) == JZ_FLAGCODE_ON)
// {
// JZsdk_Uart_SendDeal_Ask_TimeStamp(UART_DEV_1,0);
// }
// //如果设备2有启动
// if (JZsdk_HalPort_UseFlag(UART_DEV_2) == JZ_FLAGCODE_ON)
// {
// JZsdk_Uart_SendDeal_Ask_TimeStamp(UART_DEV_2,0);
// }
// //如果psdk接口已经使用
// if (JZsdk_Get_Psdk_UIcontrol_UseFlag() == JZ_FLAGCODE_ON)
// {
// }
// }
... ...
/**
********************************************************************
* @file PowerManager_InAndOut.h
* PowerManager_InAndOut的头文件
* @file PowerManger.h
* PowerManger.c的头文件
*
*
*********************************************************************
*/
/* Define to prevent recursive inclusion 避免重定义 -------------------------------------*/
#ifndef POWERMANAGER_INANDOUT_H
#define POWERMANAGER_INANDOUT_H
#ifndef POWER_MANGER_H
#define POWER_MANGER_H
/* Includes ------------------------------------------------------------------*/
#include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h"
... ...
#include <stdio.h>
#include "JZsdkLib.h"
#include "BaseConfig.h"
#define UPGRADE_FILE_DIR "/root/ugradeFile"
#define UPGRADE_FILE_STATUS_A "/root/ugradeFile/upgrade_status_a"
#define UPGRADE_FILE_STATUS_B "/root/ugradeFile/upgrade_status_b"
static int Upgrade_status = JZ_FLAGCODE_OFF;
/************************************
*
* 升级包解析
*
*
* *************************************/
T_JZsdkReturnCode Upgrade_PackageParse()
{
//解析升级包
//1、分析是否存在linux自身的升级包
unsigned char upgradeFileName[128];
int upgradeFileNameLen = 0;
//拼接为升级包的名字
memcpy(upgradeFileName, )
if (JZsdk_check_file_exists(UPGRADE_FILE_DIR))
{
}
//2、分析是否存在其他模块的升级包
return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
}
/********************************
*
* 升级模块初始化
*
*
* ************************************/
T_JZsdkReturnCode Upgrade_Init()
{
T_JZsdkReturnCode ret;
//检查是否存在升级失败文件
ret = JZsdk_check_file_exists(UPGRADE_FILE_STATUS_B);
if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
{
//这种属于是喊话器自身升级失败了
JZSDK_LOG_ERROR("Upgrade_Init: upgrade failed file exists STATUS B");
//失败处理
}
//检查是否存在A文件
ret = JZsdk_check_file_exists(UPGRADE_FILE_STATUS_A);
if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
{
//正处于升级状态
//检查是否还存在升级包
}
}
\ No newline at end of file
... ...
... ... @@ -10,7 +10,7 @@
#include "Gimbal/Gimbal.h"
#include "UI_control/Psdk_UI_io.h"
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
#include "Megaphone/Megaphone.h"
#include "Megaphone/MegTempControl/MegTempControl.h"
#endif
... ... @@ -25,7 +25,7 @@ static DeviceMessageLanguage g_MessageLanguage = DEVICE_MESSAGE_CHINESE;
int Widget_RealTimeOpusFlag = JZ_FLAGCODE_OFF; //用于标志ui里的实时语音开关
#if IRC_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef IRC_CONFIG_STATUS_ON
extern int g_temp_GasValueMax;
extern int g_temp_GasValueMin;
#endif
... ... @@ -123,7 +123,7 @@ static T_JZsdkReturnCode DeviceMessage_Enter_Default(unsigned char *message)
memset(old_message, 0, MESSAGE_MAX_LEN);
memset(new_message, 0, MESSAGE_MAX_LEN);
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
//如果实时语音按键打开了
if (Widget_RealTimeOpusFlag == JZ_FLAGCODE_ON)
{
... ... @@ -169,7 +169,7 @@ static T_JZsdkReturnCode DeviceMessage_Enter_Default(unsigned char *message)
}
#endif
#if IRC_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef IRC_CONFIG_STATUS_ON
if (g_MessageLanguage == DEVICE_MESSAGE_CHINESE)
{
memset(new_message,0,sizeof(new_message));
... ... @@ -265,7 +265,7 @@ static T_JZsdkReturnCode DeviceMessage_Enter_Debug(unsigned char *message)
snprintf(message,MESSAGE_MAX_LEN,"%s%s",old_message,new_message);
}
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
memset(new_message,0,sizeof(new_message));
memset(old_message,0,sizeof(old_message));
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)
g_Gimbal_Linkage = value;
#if DEVICE_VERSION == JZ_H1T
HalSend_type1Send_Set_GimbalLinkageControl(UART_DEV_1, g_Gimbal_Linkage);
HalSend_type1Send_Set_GimbalLinkageControl(UART_DEV_1, 0, g_Gimbal_Linkage);
#endif
}
break;
... ... @@ -481,6 +481,7 @@ T_JZsdkReturnCode Gimbal_CheckStatus_GimbalLinkage(int *value)
*value = g_Gimbal_Linkage;
#endif
}
break;
case JZ_FLAGCODE_OFF:
JZSDK_LOG_ERROR("云台未开启");
... ... @@ -501,14 +502,34 @@ T_JZsdkReturnCode Gimbal_Obtain_GimbalLinkage(int GimbalLinkage)
{
JZSDK_LOG_INFO("收到云台联动值\n");
switch(g_Gimbal_Mode)
{
//透传模式
case JZ_MODULE_CONTROL_WAY_TRANSPARENT:
{
g_Gimbal_Linkage = GimbalLinkage;
return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
}
break;
#if DEVICE_VERSION == JZ_H1T
//无操作
//毕竟是t60s返回来的值
#else
//暂时没做接口
#endif
//独立模式
case JZ_MODULE_CONTROL_WAY_INDEPENDENT:
{
g_Gimbal_Linkage = GimbalLinkage;
return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
}
break;
case JZ_FLAGCODE_OFF:
JZSDK_LOG_ERROR("云台未开启");
return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
break;
default:
JZSDK_LOG_ERROR("云台模式错误");
return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
break;
}
return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
}
... ... @@ -520,15 +541,38 @@ T_JZsdkReturnCode Gimbal_Obtain_GimbalLinkage(int GimbalLinkage)
**********/
T_JZsdkReturnCode Gimbal_CheckStatus_Angle(int *PitchAngle, int *YawAngle, int *RollAngle)
{
//组合机刷新查询角度
#if DEVICE_VERSION == JZ_H1T
JZsdk_Uart_Send_CheckStatus_GimbalAngle(UART_DEV_1, 0);
switch (g_Gimbal_Mode)
{
case JZ_MODULE_CONTROL_WAY_INDEPENDENT:
{
//无事发生
}
break;
case JZ_MODULE_CONTROL_WAY_TRANSPARENT:
{
//透传模式，查询一次云台角度
//组合机刷新查询角度
#if DEVICE_VERSION == JZ_H1T
HalSend_type1Send_CheckStatus_GimbalAngle(UART_DEV_1, 0);
//给点延时问题不大
delayMs(5);
#else
//直接获取即可
#endif
#endif
}
break;
case JZ_FLAGCODE_OFF:
JZSDK_LOG_ERROR("云台未开启");
return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
break;
default:
JZSDK_LOG_ERROR("云台模式错误");
return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
break;
}
//2、获取一次本地云台角度
if (PitchAngle != NULL)
... ... @@ -655,11 +699,10 @@ static T_JZsdkReturnCode Gimbal_Set_RealPitchAngle(int pitch, int FineTuningP, i
{
int temp_angle = 0;
//组合机不用堆叠角度
#if DEVICE_VERSION == JZ_H1T
temp_angle = pitch;
Gimbal_RealPitchAngle = temp_angle;
#else
switch (g_Gimbal_Mode)
{
case JZ_MODULE_CONTROL_WAY_INDEPENDENT:
{
//叠加飞机角度和微调角度
temp_angle = pitch - UAV_pitch + FineTuningP;
... ... @@ -674,7 +717,34 @@ static T_JZsdkReturnCode Gimbal_Set_RealPitchAngle(int pitch, int FineTuningP, i
}
Gimbal_RealPitchAngle = temp_angle;
#endif
}
break;
case JZ_MODULE_CONTROL_WAY_TRANSPARENT:
{
//组合机不用堆叠角度
#if DEVICE_VERSION == JZ_H1T
temp_angle = pitch;
Gimbal_RealPitchAngle = temp_angle;
#endif
}
break;
case JZ_FLAGCODE_OFF:
{
JZSDK_LOG_ERROR("云台模式未设置");
return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
}
break;
default:
{
JZSDK_LOG_ERROR("云台模式设置错误");
return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
}
break;
}
//printf("设置真实俯仰角度\n"); //禁止打印
... ...
/**
********************************************************************
* @file GIMBAL.h
* GIMBAL.h 的头文件
*
*********************************************************************
*/
/* Define to prevent recursive inclusion 避免重定义 -------------------------------------*/
#ifndef GIMBAL_H
#define GIMBAL_H
/* Includes ------------------------------------------------------------------*/
#include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h"
#ifdef __cplusplus
extern "C" {
#endif
/* Exported constants --------------------------------------------------------*/
/* 常亮定义*/
/* Exported types ------------------------------------------------------------*/
/* Exported functions --------------------------------------------------------*/
/*************************************************
*
* 云台 独立控制模式的 handler
* 请按内部内容，以此初始化数据
*
* *************************************************/
typedef struct s_Gimbal_PitchHandler
{
int Max_Pitch; //最大pitch角度
int Min_Pitch; //最小pitch角度
int Max_FinePitch; //最大精细pitch角度(通常取pitch值的 1/3)
int Min_FinePitch; //最小精细pitch角度(通常取pitch值的 1/3)
/*************************************************
*
* 用于给云台模块一个真实pitch的输出函数
* 云台通过 云台微调pitch，飞机pitch 设置值pitch 计算得到真实pitch
* * 云台模块通过调用此函数，将真实pitch输出给对应的函数
*
* **********************************************/
T_JZsdkReturnCode (*Out_SetRealPitchAngle)(int);
//
}s_Gimbal_PitchHandler;
typedef struct s_Gimbal_IndependentHandler
{
//yaw轴控制
s_Gimbal_PitchHandler Pitch;
//计算得到的真实yaw角度
T_JZsdkReturnCode (*_Gimbal_Set_RealYawAngle)(int);
//计算得到的真实roll角度
T_JZsdkReturnCode (*_Gimbal_Set_RealRollAngle)(int);
} s_Gimbal_IndependentHandler;
#ifdef __cplusplus
}
#endif
#endif
... ...
... ... @@ -357,14 +357,14 @@ int DJI_VideoReplay_input(int command, unsigned int Command_timeMS, char* path)
VideoFrameOneSecond = JZ_FLAGCODE_OFF; //视频一秒的帧数
PlayFrameNumber = JZ_FLAGCODE_OFF; //当前播放的帧数
transcode_flag = JZ_FLAGCODE_OFF; //转码标志位
#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEDIA_PROC_CONFIG_STATUS_ON
VideoMgmt_VideoStreamFlow_RecordPlay(JZ_FLAGCODE_OFF);
#endif
break;
case COMMAND_PAUSE:
//JZSDK_LOG_DEBUG("dji录像推流暂停\n");
#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEDIA_PROC_CONFIG_STATUS_ON
VideoMgmt_VideoStreamFlow_RecordPlay(JZ_FLAGCODE_OFF);
#endif
break;
... ... @@ -382,7 +382,7 @@ int DJI_VideoReplay_input(int command, unsigned int Command_timeMS, char* path)
transcode_flag = JZ_FLAGCODE_ON;
}
#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEDIA_PROC_CONFIG_STATUS_ON
VideoMgmt_VideoStreamFlow_RecordPlay(JZ_FLAGCODE_ON);
#endif
... ...
... ... @@ -393,7 +393,7 @@ T_JZsdkReturnCode JZsdk_Psdk_UI_io_PlaySong(int wheather_control)
// 如果有进行控制，不只是改控件
if (wheather_control == 1)
{
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
// 获取当前播放的歌曲名字
Megaphone_get_play_FileName(MusicName, &MusicNameLen);
... ... @@ -1165,7 +1165,7 @@ T_JZsdkReturnCode JZsdk_Psdk_UI_io_Set_OutputPowerStatus(int wheather_control,in
* *************/
T_JZsdkReturnCode JZsdk_Psdk_UI_io_GetRealTimeVoiceStatusFlag()
{
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
return Megaphone_RealTimeVoice_GetStatusFlag();
#endif
}
... ...
... ... @@ -22,7 +22,7 @@
#include "SideLaser/SideLaser.h"
#endif
#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEDIA_PROC_CONFIG_STATUS_ON
#include "MediaProc/MediaProc.h"
#endif
... ... @@ -95,7 +95,7 @@ T_JZsdkReturnCode UI_control_Set_DJI_SkyPort_SerialNumber(char *str)
//音量调节
T_JZsdkReturnCode UIcontrol_SetVolume(int DeviceName,int value)
{
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
//调用喊话器的接口
T_JZsdkReturnCode ret = Megaphone_param(JZ_FLAGCODE_SET, MEGAPHONE_VOLUME, &value);
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -139,7 +139,7 @@ T_JZsdkReturnCode UIcontrol_SetVolume(int DeviceName,int value)
//循环播放
T_JZsdkReturnCode UIcontrol_Set_AudioPlayLoop(int DeviceName,int value)
{
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
//调用喊话器的接口
T_JZsdkReturnCode ret = Megaphone_param(JZ_FLAGCODE_SET, MEGAPHONE_LOOP, &value);
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -183,7 +183,7 @@ T_JZsdkReturnCode UIcontrol_Set_AudioPlayLoop(int DeviceName,int value)
//循环播放间隔
T_JZsdkReturnCode UIcontrol_Set_AudioPlayLoopInterval(int DeviceName,int value)
{
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
//调用喊话器的接口
T_JZsdkReturnCode ret = Megaphone_param(JZ_FLAGCODE_SET, MEGAPHONE_LOOP_INTERVAL, &value);
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -232,7 +232,7 @@ T_JZsdkReturnCode UIcontrol_Set_AudioPlayLoopInterval(int DeviceName,int value)
//开始opus实时
T_JZsdkReturnCode UIcontrol_OpusRealTimeVoice_Start(int DeviceName, int BitRate)
{
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
//调用接口
T_JZsdkReturnCode ret = Megaphone_RealTimeVoice_Start(BitRate);
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -276,7 +276,7 @@ T_JZsdkReturnCode UIcontrol_OpusRealTimeVoice_Start(int DeviceName, int BitRate)
//opus实时传输
T_JZsdkReturnCode UIcontrol_OpusRealTimeVoice_Trans(int DeviceName, char* data, int size)
{
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
//调用接口
T_JZsdkReturnCode ret = Megaphone_RealTimeVoice_Trans(data, size);
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -293,7 +293,7 @@ T_JZsdkReturnCode UIcontrol_OpusRealTimeVoice_Trans(int DeviceName, char* data,
//结束opus实时
T_JZsdkReturnCode UIcontrol_OpusRealTimeVoice_Close(int DeviceName)
{
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
//调用接口
T_JZsdkReturnCode ret = Megaphone_RealTimeVoice_Close();
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -342,7 +342,7 @@ T_JZsdkReturnCode UIcontrol_OpusRealTimeVoice_Close(int DeviceName)
//播放指定名字的音频文件
T_JZsdkReturnCode UIcontrol_PlayAudioFile(int DeviceName, char *MusicName, int MusicNameLen)
{
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
//调用喊话器的播放接口
T_JZsdkReturnCode ret = Megaphone_PlayAudioFile(MusicName, MusicNameLen);
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -386,7 +386,7 @@ T_JZsdkReturnCode UIcontrol_PlayAudioFile(int DeviceName, char *MusicName, int M
//停止播放音频
T_JZsdkReturnCode UIcontrol_StopPlayAudio(int DeviceName)
{
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
//调用喊话器的停止接口
T_JZsdkReturnCode ret = Megaphone_StopPlay(JZ_FLAGCODE_OFF);
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -430,7 +430,7 @@ T_JZsdkReturnCode UIcontrol_StopPlayAudio(int DeviceName)
//暂停播放音频
T_JZsdkReturnCode UIcontrol_PausePlayAudio(int DeviceName)
{
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
//调用喊话器的停止接口
T_JZsdkReturnCode ret = Megaphone_PlayPause();
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -474,7 +474,7 @@ T_JZsdkReturnCode UIcontrol_PausePlayAudio(int DeviceName)
//继续播放音频
T_JZsdkReturnCode UIcontrol_ContinuePlayAudio(int DeviceName)
{
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
//调用喊话器的停止接口
T_JZsdkReturnCode ret = Megaphone_PlayContinue();
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -519,7 +519,7 @@ T_JZsdkReturnCode UIcontrol_ContinuePlayAudio(int DeviceName)
//上一曲
T_JZsdkReturnCode UIcontrol_LastSong(int DeviceName)
{
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
//调用喊话器的接口
T_JZsdkReturnCode ret = Megaphone_PlayLastSong();
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -563,7 +563,7 @@ T_JZsdkReturnCode UIcontrol_LastSong(int DeviceName)
//下一曲
T_JZsdkReturnCode UIcontrol_NextSong(int DeviceName)
{
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
//调用喊话器的接口
T_JZsdkReturnCode ret = Megaphone_PlayNextSong();
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -615,7 +615,7 @@ T_JZsdkReturnCode UIcontrol_Opus_PlayFixedFile(int DeviceName)
{
JZSDK_LOG_INFO("调用了固定播放");
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
//调用喊话器的接口
T_JZsdkReturnCode ret = Megaphone_Opus_PlayFixedFile();
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -664,7 +664,7 @@ T_JZsdkReturnCode UIcontrol_Opus_PlayFixedFile(int DeviceName)
//播放TTS
T_JZsdkReturnCode UIcontrol_TTS_Play(int DeviceName, char *data, int len)
{
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
//调用喊话器的接口
T_JZsdkReturnCode ret = Megaphone_TTS_Play(data, len, JZ_FLAGCODE_ON);
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -708,7 +708,7 @@ T_JZsdkReturnCode UIcontrol_TTS_Play(int DeviceName, char *data, int len)
//设置TTS音色
T_JZsdkReturnCode UIcontrol_Set_TTS_tone(int DeviceName,int value)
{
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
//调用喊话器的接口
T_JZsdkReturnCode ret = Megaphone_TTS_param(JZ_FLAGCODE_SET, MEGAPHONE_TTS_TONE, &value);
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -752,7 +752,7 @@ T_JZsdkReturnCode UIcontrol_Set_TTS_tone(int DeviceName,int value)
//设置TTS语速
T_JZsdkReturnCode UIcontrol_Set_TTS_speed(int DeviceName,int value)
{
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
//调用喊话器的接口
T_JZsdkReturnCode ret = Megaphone_TTS_param(JZ_FLAGCODE_SET, MEGAPHONE_TTS_SPEED, &value);
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -796,7 +796,7 @@ T_JZsdkReturnCode UIcontrol_Set_TTS_speed(int DeviceName,int value)
//设置TTS追加音色
T_JZsdkReturnCode UIcontrol_Set_TTS_AppendTone(int DeviceName,int value)
{
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
//调用喊话器的接口
T_JZsdkReturnCode ret = Megaphone_TTS_param(JZ_FLAGCODE_SET, MEGAPHONE_TTS_APPEND_TONE, &value);
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -1763,7 +1763,7 @@ T_JZsdkReturnCode UIcontrol_ObtainGimbal_Pitch(int DeviceName, int GimbalPitchAn
**********/
T_JZsdkReturnCode UIcontrol_VideoRecordFuntion(int DeviceName, int status)
{
#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEDIA_PROC_CONFIG_STATUS_ON
//调用录制模式的接口
T_JZsdkReturnCode ret = VideoRecord_TransMode(status);
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -1790,7 +1790,7 @@ T_JZsdkReturnCode UIcontrol_VideoRecordFuntion(int DeviceName, int status)
**********/
T_JZsdkReturnCode UIcontrol_Set_ShootPhoto(int DeviceName, int num)
{
#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEDIA_PROC_CONFIG_STATUS_ON
//调用拍照数量接口
T_JZsdkReturnCode ret = VideoRecord_ShootPhotoNum(num);
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -1817,7 +1817,7 @@ T_JZsdkReturnCode UIcontrol_Set_ShootPhoto(int DeviceName, int num)
T_JZsdkReturnCode UIcontrol_Set_VideoMgmtPushIndex(int DeviceName, int Pushindex)
{
T_JZsdkReturnCode ret;
#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEDIA_PROC_CONFIG_STATUS_ON
//1、设置推流索引值
ret = VideoMgmt_VideoStreamFlowIndex(Pushindex);
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -1856,7 +1856,7 @@ T_JZsdkReturnCode UIcontrol_Set_VideoMgmtPushIndex(int DeviceName, int Pushinde
T_JZsdkReturnCode UIcontrol_Set_ShutterSwitch(int DeviceName, int value)
{
T_JZsdkReturnCode ret;
#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEDIA_PROC_CONFIG_STATUS_ON
//1、设置推流索引值
ret = JZsdk_Camera_ShutterSwitch(value);
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -1892,7 +1892,7 @@ T_JZsdkReturnCode UIcontrol_Set_ShutterSwitch(int DeviceName, int value)
T_JZsdkReturnCode UIcontrol_Set_PseudoColor(int DeviceName, int value)
{
T_JZsdkReturnCode ret;
#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEDIA_PROC_CONFIG_STATUS_ON
//1、设置推流索引值
ret = Camera_param(JZ_FLAGCODE_SET, CAMERA_PSEUDO_COLOR, &value);
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -1929,7 +1929,7 @@ T_JZsdkReturnCode UIcontrol_Set_PseudoColor(int DeviceName, int value)
T_JZsdkReturnCode UIcontrol_Set_PixelColorMode(int DeviceName, int value)
{
T_JZsdkReturnCode ret;
#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEDIA_PROC_CONFIG_STATUS_ON
//1、设置推流索引值
ret = Camera_param(JZ_FLAGCODE_SET, CAMERA_PIXEL_PSEUDO_COLOR_MODE, &value);
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -1966,7 +1966,7 @@ T_JZsdkReturnCode UIcontrol_Set_PixelColorMode(int DeviceName, int value)
T_JZsdkReturnCode UIcontrol_Set_ZoomSize(int DeviceName, int value)
{
T_JZsdkReturnCode ret = JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEDIA_PROC_CONFIG_STATUS_ON
//1、设置变焦值
ret = Camera_param(JZ_FLAGCODE_SET, CAMERA_RESIZE, &value);
... ... @@ -1989,7 +1989,7 @@ T_JZsdkReturnCode UIcontrol_Set_ZoomSize(int DeviceName, int value)
T_JZsdkReturnCode UIcontrol_Set_GasEnhancementColor(int DeviceName, int value)
{
T_JZsdkReturnCode ret;
#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEDIA_PROC_CONFIG_STATUS_ON
//1、设置推流索引值
ret = Camera_param(JZ_FLAGCODE_SET, CAMERA_GAS_ENHANCEMENT_COLOR, &value);
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -2025,7 +2025,7 @@ T_JZsdkReturnCode UIcontrol_Set_GasEnhancementColor(int DeviceName, int value)
T_JZsdkReturnCode UIcontrol_Set_SPCmode(int DeviceName, int value)
{
T_JZsdkReturnCode ret;
#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEDIA_PROC_CONFIG_STATUS_ON
//1、设置红外
ret = Proc_IRC_param(JZ_FLAGCODE_SET, JZSDK_WIDGET_SPC_MODE, &value);
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -2061,7 +2061,7 @@ T_JZsdkReturnCode UIcontrol_Set_SPCmode(int DeviceName, int value)
T_JZsdkReturnCode UIcontrol_Set_SpcAutoTime(int DeviceName, int value)
{
T_JZsdkReturnCode ret;
#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEDIA_PROC_CONFIG_STATUS_ON
//1、设置红外
ret = Proc_IRC_param(JZ_FLAGCODE_SET, JZSDK_WIDGET_SPC_AUTO_TIME, &value);
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -2097,7 +2097,7 @@ T_JZsdkReturnCode UIcontrol_Set_SpcAutoTime(int DeviceName, int value)
T_JZsdkReturnCode UIcontrol_Set_TpcMode(int DeviceName, int value)
{
T_JZsdkReturnCode ret;
#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEDIA_PROC_CONFIG_STATUS_ON
//1、设置红外
ret = Proc_IRC_param(JZ_FLAGCODE_SET, JZSDK_WIDGET_TPC_MODE, &value);
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -2133,7 +2133,7 @@ T_JZsdkReturnCode UIcontrol_Set_TpcMode(int DeviceName, int value)
T_JZsdkReturnCode UIcontrol_Set_AutoBadPixelCorrectMode(int DeviceName, int value)
{
T_JZsdkReturnCode ret;
#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEDIA_PROC_CONFIG_STATUS_ON
//1、设置红外
ret = Proc_IRC_param(JZ_FLAGCODE_SET, JZSDK_WIDGET_BAD_PIXEL_CORRECT_MODE, &value);
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -2171,7 +2171,7 @@ T_JZsdkReturnCode UIcontrol_Set_AutoBadPixelCorrectMode(int DeviceName, int valu
T_JZsdkReturnCode UIcontrol_FreezeVideo(int DeviceName, int value)
{
T_JZsdkReturnCode ret;
#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEDIA_PROC_CONFIG_STATUS_ON
//1、设置推流索引值
ret = VideoMgmt_param(JZ_FLAGCODE_SET, VIDEO_MGMT_FREEZE, &value);
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -2208,7 +2208,7 @@ T_JZsdkReturnCode UIcontrol_FreezeVideo(int DeviceName, int value)
T_JZsdkReturnCode UIcontrol_CameraCorrectionMode(int DeviceName, int value)
{
T_JZsdkReturnCode ret;
#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEDIA_PROC_CONFIG_STATUS_ON
//1、设置推流索引值
ret = Camera_param(JZ_FLAGCODE_SET, CAMERA_CORRCTION_MODE, &value);
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -2246,7 +2246,7 @@ T_JZsdkReturnCode UIcontrol_CameraCorrectionMode(int DeviceName, int value)
T_JZsdkReturnCode UIcontrol_GasEnhancementCorrect(int DeviceName, int value)
{
T_JZsdkReturnCode ret;
#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEDIA_PROC_CONFIG_STATUS_ON
//1、设置推流索引值
ret = Camera_param(JZ_FLAGCODE_SET, CAMERA_GAS_ENHANCEMENT_CORRCTION, &value);
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -2268,7 +2268,7 @@ T_JZsdkReturnCode UIcontrol_GasEnhancementCorrect(int DeviceName, int value)
T_JZsdkReturnCode UIcontrol_CameraRegionbox(int DeviceName, int value1, int value2)
{
T_JZsdkReturnCode ret;
#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEDIA_PROC_CONFIG_STATUS_ON
int param[2];
param[0] = value1;
param[1] = value2;
... ... @@ -2307,7 +2307,7 @@ T_JZsdkReturnCode UIcontrol_CameraRegionbox(int DeviceName, int value1, int valu
**********/
T_JZsdkReturnCode UIcontrol_Camera_BadPixelSwitch(int DeviceName, int value)
{
#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEDIA_PROC_CONFIG_STATUS_ON
T_JZsdkReturnCode ret;
ret = JZsdk_Camera_BadPixelSwitch();
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ... @@ -2324,7 +2324,7 @@ T_JZsdkReturnCode UIcontrol_Camera_BadPixelSwitch(int DeviceName, int value)
**********/
T_JZsdkReturnCode UIcontrol_Camera_SPC_ResetSwitch(int DeviceName, int value)
{
#if MEDIA_PROC_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEDIA_PROC_CONFIG_STATUS_ON
T_JZsdkReturnCode ret;
ret = JZsdk_CameraSPC_ResetSwitch();
if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
... ...
... ... @@ -13,7 +13,7 @@ static T_JZsdkReturnCode JZSDK_WidgetMgMT_DJI_GetWidgetIndex(int tpye, int *inde
int ReturnIndex1 = 0;
int ReturnIndex2 = 0;
#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef MEGAPHONE_CONFIG_STATUS_ON
switch (tpye)
{
case JZSDK_WIDGET_PLAYANDSTOP:
... ... @@ -33,7 +33,7 @@ static T_JZsdkReturnCode JZSDK_WidgetMgMT_DJI_GetWidgetIndex(int tpye, int *inde
}
#endif
#if IRC_CONFIG_STATUS == VERSION_SWITCH_ON
#ifdef IRC_CONFIG_STATUS_ON
switch (tpye)
{
case JZSDK_WIDGET_VIDEOPUSH_INDEX:
... ...