作者 ookk303

修复部分函数没有发送帧序列的问题

... ... @@ -270,7 +270,7 @@ static int Comparison_5AFRAME_FirstLevelCode_0x55(char *getdata)
//设置循环播放间隔
case 0x01:
return JZ_INSCODE_5AFRAME_CHECKSTATUS_ADUIO_LOOP_INTERVAL;
return JZ_INSCODE_5AFRAME_ADUIO_PLAY_LOOP_INTERVAL;
break;
default:
... ...
... ... @@ -1287,7 +1287,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_volume(int Port, char *getbuf)
//HalSend_type1Send_Reply_Success(Port, FrameSequence);
//2、发送音量
HalSend_type1Send_Reply_Volume(Port, volume);
HalSend_type1Send_Reply_Volume(Port, FrameSequence, volume);
return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
}
... ... @@ -1315,7 +1315,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_play(int Port, char *getbuf)
//HalSend_type1Send_Reply_Success(Port, FrameSequence);
//2、发送播放状态
HalSend_type1Send_Send_PlayStatus(Port, status);
HalSend_type1Send_Send_PlayStatus(Port, FrameSequence, status);
return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
}
... ... @@ -1342,7 +1342,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_gimbal(int Port, char *getbuf)
UIcontrol_CheckStatus_GimbalAngle(&PitchAngle, &YawAngle);
//2、发送本地云台值
HalSend_type1Send_Reply_GimbalPitchAngle(Port, PitchAngle);
HalSend_type1Send_Reply_GimbalPitchAngle(Port, FrameSequence, PitchAngle);
return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
}
... ... @@ -1402,7 +1402,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_PLayFileName(int Port, char *getbu
JZSDK_LOG_INFO("当前播放的是%s %d\n",MusicName, MusicName_Len);
//2、发送名字
HalSend_type1Send_Reply_MusicName(Port, MusicName,MusicName_Len);
HalSend_type1Send_Reply_MusicName(Port, FrameSequence, MusicName,MusicName_Len);
}
else
{
... ... @@ -1441,7 +1441,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_SoftwareVersion(int Port, char *ge
JZSDK_LOG_INFO("当前的软件版本号为:%2x, %2x, %2x, %2x",majorVersion, MinjorVersion, modifyVersion, debugVersion);
//2、发送版本号
HalSend_type1Send_Reply_SoftVersion(Port, majorVersion, MinjorVersion, modifyVersion, debugVersion);
HalSend_type1Send_Reply_SoftVersion(Port, FrameSequence, majorVersion, MinjorVersion, modifyVersion, debugVersion);
return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
}
... ... @@ -1478,7 +1478,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_LoopPlay(int Port, char *getbuf)
}
//2、发送循环状态
HalSend_type1Send_Reply_LoopPlayStatus(Port ,LoopStatus);
HalSend_type1Send_Reply_LoopPlayStatus(Port, FrameSequence, LoopStatus);
return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
}
... ... @@ -1518,7 +1518,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_TTS_tone(int Port, char *getbuf)
//HalSend_type1Send_Reply_Success(Port, FrameSequence);
//2、发送音色
HalSend_type1Send_Reply_TTS_tone(Port ,TTS_tone);
HalSend_type1Send_Reply_TTS_tone(Port, FrameSequence,TTS_tone);
return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
}
... ... @@ -1555,7 +1555,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_TTS_speed(int Port, char *getbuf)
}
//2、发送语速
HalSend_type1Send_Reply_TTS_speed(Port ,TTS_speed);
HalSend_type1Send_Reply_TTS_speed(Port, FrameSequence, TTS_speed);
return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
}
... ... @@ -2125,7 +2125,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_CurrentPlayTime(int Port, char *ge
#ifdef MEGAPHONE_CONFIG_STATUS_ON
int mode = Megaphone_PlayBackGetMode(Port);
HalSend_type1Send_Reply_CurrentPlayTimeStatus(Port, mode);
HalSend_type1Send_Reply_CurrentPlayTimeStatus(Port, FrameSequence, mode);
#endif
... ... @@ -4902,7 +4902,7 @@ static T_JZsdkReturnCode RecvDeal_InstructInput(int Port, int Receive_mode, unsi
break;
//设置循环间隔
case JZ_INSCODE_5AFRAME_CHECKSTATUS_ADUIO_LOOP_INTERVAL:
case JZ_INSCODE_5AFRAME_ADUIO_PLAY_LOOP_INTERVAL:
RecvDeal_PlayLoopInterval(Port,getbuf);
return 0;
break;
... ...
... ... @@ -9,6 +9,7 @@
#include "Hal_Send/HalSend.h"
#include "./HalSend_type1.h"
//发送主动连接帧
T_JZsdkReturnCode HalSend_type1Send_ConnectFrame(int PortNum)
... ... @@ -585,7 +586,7 @@ T_JZsdkReturnCode HalSend_type1Send_Send_PlayStatus_end(int Uartport)
}
//发送播放状态帧
T_JZsdkReturnCode HalSend_type1Send_Send_PlayStatus(int Uartport ,int num)
T_JZsdkReturnCode HalSend_type1Send_Send_PlayStatus(int Uartport, int FrameSequence ,int num)
{
printf("向");
switch (Uartport)
... ... @@ -611,6 +612,7 @@ T_JZsdkReturnCode HalSend_type1Send_Send_PlayStatus(int Uartport ,int num)
JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_AUDIO_PLAYSTATUS , sendbuf, &send_buf_len);
//2、写入数据
sendbuf[6] = FrameSequence; //帧序列
sendbuf[9] = (char)num;
//3、发送帧
... ... @@ -618,7 +620,7 @@ T_JZsdkReturnCode HalSend_type1Send_Send_PlayStatus(int Uartport ,int num)
}
//回复当前播放的歌曲名字
T_JZsdkReturnCode HalSend_type1Send_Reply_MusicName(int Uartport ,char *music_name, int music_name_len)
T_JZsdkReturnCode HalSend_type1Send_Reply_MusicName(int Uartport , int FrameSequence, char *music_name, int music_name_len)
{
printf("发送当前歌曲名字帧");
unsigned char sendbuf[256];
... ... @@ -628,6 +630,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_MusicName(int Uartport ,char *music_na
JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_AUDIO_PLAYFILENAME , sendbuf, &send_buf_len);
//2、写入数据
sendbuf[6] = FrameSequence; //帧序列
memcpy(&sendbuf[9],music_name,music_name_len);
sendbuf[9+music_name_len]=0x00;
sendbuf[10+music_name_len]=0x23;
... ... @@ -642,7 +645,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_MusicName(int Uartport ,char *music_na
}
//回复当前音量
T_JZsdkReturnCode HalSend_type1Send_Reply_Volume(int Uartport ,int num)
T_JZsdkReturnCode HalSend_type1Send_Reply_Volume(int Uartport, int FrameSequence ,int num)
{
printf("发送当前音量帧\n");
unsigned char sendbuf[256];
... ... @@ -652,6 +655,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_Volume(int Uartport ,int num)
JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_VOLUME, sendbuf, &send_buf_len);
//2、写入数据
sendbuf[6] = FrameSequence; //帧序列
sendbuf[9] = (char)num;
//3、发送帧
... ... @@ -662,7 +666,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_Volume(int Uartport ,int num)
//回复软件版本号
T_JZsdkReturnCode HalSend_type1Send_Reply_SoftVersion(int Uartport ,char majorVersion, char minorVersion, char modifyVersion, char debugVersion)
T_JZsdkReturnCode HalSend_type1Send_Reply_SoftVersion(int Uartport, int FrameSequence, char majorVersion, char minorVersion, char modifyVersion, char debugVersion)
{
printf("发送软件版本号帧\n");
unsigned char sendbuf[256];
... ... @@ -672,6 +676,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_SoftVersion(int Uartport ,char majorVe
JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_SORTWAREVERSION, sendbuf, &send_buf_len);
//2、写入数据
sendbuf[6] = FrameSequence; //帧序列
sendbuf[9] = majorVersion;
sendbuf[10] = minorVersion;
sendbuf[11] = modifyVersion;
... ... @@ -682,7 +687,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_SoftVersion(int Uartport ,char majorVe
}
//发送循环状态
T_JZsdkReturnCode HalSend_type1Send_Reply_LoopPlayStatus(int Uartport ,int status)
T_JZsdkReturnCode HalSend_type1Send_Reply_LoopPlayStatus(int Uartport , int FrameSequence, int status)
{
printf("发送循环状态帧\n");
... ... @@ -693,6 +698,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_LoopPlayStatus(int Uartport ,int statu
JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_AUDIO_PLAYLOOPSTATUS, sendbuf, &send_buf_len);
//2、写入数据
sendbuf[6] = FrameSequence;
sendbuf[9] = status;
//3、发送帧
... ... @@ -701,7 +707,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_LoopPlayStatus(int Uartport ,int statu
}
//发送音色
T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_tone(int Uartport ,int tone)
T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_tone(int Uartport, int FrameSequence, int tone)
{
printf("发送音色帧\n");
... ... @@ -712,6 +718,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_tone(int Uartport ,int tone)
JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_TTS_TONE, sendbuf, &send_buf_len);
//2、写入数据
sendbuf[6] = FrameSequence; //帧序列
sendbuf[9] = tone;
//3、发送帧
... ... @@ -719,7 +726,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_tone(int Uartport ,int tone)
}
//发送语速
T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_speed(int Uartport ,int speed)
T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_speed(int Uartport, int FrameSequence, int speed)
{
printf("发送语速帧\n");
... ... @@ -730,6 +737,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_speed(int Uartport ,int speed)
JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_TTS_SPEED, sendbuf, &send_buf_len);
//2、写入数据
sendbuf[6] = FrameSequence; //帧序列
sendbuf[9] = speed;
//3、发送帧
... ... @@ -737,7 +745,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_speed(int Uartport ,int speed)
}
//发送当前播放时间状态
T_JZsdkReturnCode HalSend_type1Send_Reply_CurrentPlayTimeStatus(int Uartport ,int mode)
T_JZsdkReturnCode HalSend_type1Send_Reply_CurrentPlayTimeStatus(int Uartport, int FrameSequence ,int mode)
{
printf("发送当前播放时间状态帧\n");
... ... @@ -748,6 +756,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_CurrentPlayTimeStatus(int Uartport ,in
JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_CHECKSTATUS_CURRENT_PLAYTIME, sendbuf, &send_buf_len);
//2、写入数据
sendbuf[6] = FrameSequence; //帧序列
sendbuf[9] = mode;
//3、发送帧
... ... @@ -882,7 +891,7 @@ T_JZsdkReturnCode HalSend_type1Send_Send_OpusList_Stop(int Uartport, int FrameSe
****************************************************************************************************************************************************/
//回复当前俯仰云台角度
T_JZsdkReturnCode HalSend_type1Send_Reply_GimbalPitchAngle(int Uartport ,int angle)
T_JZsdkReturnCode HalSend_type1Send_Reply_GimbalPitchAngle(int Uartport, int FrameSequence ,int angle)
{
printf("发送当前俯仰云台角度帧\n");
unsigned char sendbuf[256];
... ... @@ -899,6 +908,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_GimbalPitchAngle(int Uartport ,int ang
angle = -angle;
}
sendbuf[6] = FrameSequence; //帧序列
sendbuf[9] = (char)signal;
sendbuf[10] = (char)(angle >> 8);
sendbuf[11] = (char)(angle & 255);
... ...
... ... @@ -58,9 +58,9 @@ T_JZsdkReturnCode HalSend_type1Send_Send_AudioList_Stop(int Uartport, int FrameS
T_JZsdkReturnCode HalSend_type1Send_Send_PlayStatus_end(int Uartport);
T_JZsdkReturnCode HalSend_type1Send_Send_PlayStatus(int Uartport ,int num);
T_JZsdkReturnCode HalSend_type1Send_Reply_MusicName(int Uartport ,char *music_name, int music_name_len);
T_JZsdkReturnCode HalSend_type1Send_Reply_Volume(int Uartport ,int num);
T_JZsdkReturnCode HalSend_type1Send_Send_PlayStatus(int Uartport, int FrameSequence ,int num);
T_JZsdkReturnCode HalSend_type1Send_Reply_MusicName(int Uartport , int FrameSequence, char *music_name, int music_name_len);
T_JZsdkReturnCode HalSend_type1Send_Reply_Volume(int Uartport, int FrameSequence ,int num);
T_JZsdkReturnCode HalSend_type1Send_OpusDecodeStatus(int Uartport,int value);
T_JZsdkReturnCode HalSend_type1Send_Send_OpusList_Start(int Uartport, int FrameSequence, int music_sum);
... ... @@ -68,7 +68,7 @@ T_JZsdkReturnCode HalSend_type1Send_Send_OpusList_Trans(int Uartport, int FrameS
T_JZsdkReturnCode HalSend_type1Send_Send_OpusList_Stop(int Uartport, int FrameSequence);
T_JZsdkReturnCode HalSend_type1Send_Reply_GimbalPitchAngle(int Uartport ,int angle);
T_JZsdkReturnCode HalSend_type1Send_Reply_GimbalPitchAngle(int Uartport, int FrameSequence ,int angle);
T_JZsdkReturnCode HalSend_type1Send_Set_GimbalPitchAngle(int Uartport ,int angle);
T_JZsdkReturnCode HalSend_type1Send_Reply_GimbalFineTuningPitch(int Uartport, int FrameSequence, int FineTunigPitch);
T_JZsdkReturnCode HalSend_type1Send_Set_GimbalFineTuningPitch(int Uartport, int PitchFineTuning);
... ... @@ -80,12 +80,12 @@ T_JZsdkReturnCode HalSend_type1Send_CheckStatus_GimbalAngle(int Uartport ,int Fr
T_JZsdkReturnCode HalSend_type1Send_SetGimbalRange(int Uartport,int FrameSequence,int value);
T_JZsdkReturnCode HalSend_type1Send_Reply_SoftVersion(int Uartport ,char majorVersion, char minorVersion, char modifyVersion, char debugVersion);
T_JZsdkReturnCode HalSend_type1Send_Reply_LoopPlayStatus(int Uartport ,int status);
T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_tone(int Uartport ,int tone);
T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_speed(int Uartport ,int speed);
T_JZsdkReturnCode HalSend_type1Send_Reply_SoftVersion(int Uartport, int FrameSequence, char majorVersion, char minorVersion, char modifyVersion, char debugVersion);
T_JZsdkReturnCode HalSend_type1Send_Reply_LoopPlayStatus(int Uartport , int FrameSequence, int status);
T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_tone(int Uartport, int FrameSequence, int tone);
T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_speed(int Uartport, int FrameSequence, int speed);
T_JZsdkReturnCode HalSend_type1Send_Reply_CurrentPlayTime(int Uartport ,int time);
T_JZsdkReturnCode HalSend_type1Send_Reply_CurrentPlayTimeStatus(int Uartport ,int mode);
T_JZsdkReturnCode HalSend_type1Send_Reply_CurrentPlayTimeStatus(int Uartport, int FrameSequence ,int mode);
T_JZsdkReturnCode HalSend_type1Send_Set_SearchLightFrequency(int Uartport ,int Frequency);
... ...
... ... @@ -195,6 +195,7 @@ T_JZsdkReturnCode Lighting_Set_SearchLightFrequency(int value)
if (DEVICE_VERSION == JZ_U3 || DEVICE_VERSION == JZ_U3S || DEVICE_VERSION == JZ_U3D || DEVICE_VERSION == JZ_U30)
{
SearchLight_Frequency = value;
return SearchLight_V3S_U3_Set_SearchLightFrequency(value);
}
else if (DEVICE_VERSION == JZ_H1T)
... ...
... ... @@ -162,7 +162,7 @@ static T_JZsdkReturnCode Megaphone_Play(struct MegaphoneInfo *IndexInfo, enum Me
JZSDK_LOG_ERROR("无法进行播放操作,目前正在进行实时语音播放");
return JZ_ERRORCODE_REALTIMEVOICE_HAS_BEEN_ON;
}
//把暂停音乐的标志关了
AudioDeal_PauseAndContinuePlay(JZ_FLAGCODE_OFF);
... ...