正在显示
6 个修改的文件
包含
41 行增加
和
30 行删除
| @@ -270,7 +270,7 @@ static int Comparison_5AFRAME_FirstLevelCode_0x55(char *getdata) | @@ -270,7 +270,7 @@ static int Comparison_5AFRAME_FirstLevelCode_0x55(char *getdata) | ||
| 270 | 270 | ||
| 271 | //设置循环播放间隔 | 271 | //设置循环播放间隔 |
| 272 | case 0x01: | 272 | case 0x01: |
| 273 | - return JZ_INSCODE_5AFRAME_CHECKSTATUS_ADUIO_LOOP_INTERVAL; | 273 | + return JZ_INSCODE_5AFRAME_ADUIO_PLAY_LOOP_INTERVAL; |
| 274 | break; | 274 | break; |
| 275 | 275 | ||
| 276 | default: | 276 | default: |
| @@ -1287,7 +1287,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_volume(int Port, char *getbuf) | @@ -1287,7 +1287,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_volume(int Port, char *getbuf) | ||
| 1287 | //HalSend_type1Send_Reply_Success(Port, FrameSequence); | 1287 | //HalSend_type1Send_Reply_Success(Port, FrameSequence); |
| 1288 | 1288 | ||
| 1289 | //2、发送音量 | 1289 | //2、发送音量 |
| 1290 | - HalSend_type1Send_Reply_Volume(Port, volume); | 1290 | + HalSend_type1Send_Reply_Volume(Port, FrameSequence, volume); |
| 1291 | 1291 | ||
| 1292 | return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; | 1292 | return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; |
| 1293 | } | 1293 | } |
| @@ -1315,7 +1315,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_play(int Port, char *getbuf) | @@ -1315,7 +1315,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_play(int Port, char *getbuf) | ||
| 1315 | //HalSend_type1Send_Reply_Success(Port, FrameSequence); | 1315 | //HalSend_type1Send_Reply_Success(Port, FrameSequence); |
| 1316 | 1316 | ||
| 1317 | //2、发送播放状态 | 1317 | //2、发送播放状态 |
| 1318 | - HalSend_type1Send_Send_PlayStatus(Port, status); | 1318 | + HalSend_type1Send_Send_PlayStatus(Port, FrameSequence, status); |
| 1319 | 1319 | ||
| 1320 | return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; | 1320 | return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; |
| 1321 | } | 1321 | } |
| @@ -1342,7 +1342,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_gimbal(int Port, char *getbuf) | @@ -1342,7 +1342,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_gimbal(int Port, char *getbuf) | ||
| 1342 | UIcontrol_CheckStatus_GimbalAngle(&PitchAngle, &YawAngle); | 1342 | UIcontrol_CheckStatus_GimbalAngle(&PitchAngle, &YawAngle); |
| 1343 | 1343 | ||
| 1344 | //2、发送本地云台值 | 1344 | //2、发送本地云台值 |
| 1345 | - HalSend_type1Send_Reply_GimbalPitchAngle(Port, PitchAngle); | 1345 | + HalSend_type1Send_Reply_GimbalPitchAngle(Port, FrameSequence, PitchAngle); |
| 1346 | 1346 | ||
| 1347 | return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; | 1347 | return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; |
| 1348 | } | 1348 | } |
| @@ -1402,7 +1402,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_PLayFileName(int Port, char *getbu | @@ -1402,7 +1402,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_PLayFileName(int Port, char *getbu | ||
| 1402 | JZSDK_LOG_INFO("当前播放的是%s %d\n",MusicName, MusicName_Len); | 1402 | JZSDK_LOG_INFO("当前播放的是%s %d\n",MusicName, MusicName_Len); |
| 1403 | 1403 | ||
| 1404 | //2、发送名字 | 1404 | //2、发送名字 |
| 1405 | - HalSend_type1Send_Reply_MusicName(Port, MusicName,MusicName_Len); | 1405 | + HalSend_type1Send_Reply_MusicName(Port, FrameSequence, MusicName,MusicName_Len); |
| 1406 | } | 1406 | } |
| 1407 | else | 1407 | else |
| 1408 | { | 1408 | { |
| @@ -1441,7 +1441,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_SoftwareVersion(int Port, char *ge | @@ -1441,7 +1441,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_SoftwareVersion(int Port, char *ge | ||
| 1441 | JZSDK_LOG_INFO("当前的软件版本号为:%2x, %2x, %2x, %2x",majorVersion, MinjorVersion, modifyVersion, debugVersion); | 1441 | JZSDK_LOG_INFO("当前的软件版本号为:%2x, %2x, %2x, %2x",majorVersion, MinjorVersion, modifyVersion, debugVersion); |
| 1442 | 1442 | ||
| 1443 | //2、发送版本号 | 1443 | //2、发送版本号 |
| 1444 | - HalSend_type1Send_Reply_SoftVersion(Port, majorVersion, MinjorVersion, modifyVersion, debugVersion); | 1444 | + HalSend_type1Send_Reply_SoftVersion(Port, FrameSequence, majorVersion, MinjorVersion, modifyVersion, debugVersion); |
| 1445 | 1445 | ||
| 1446 | return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; | 1446 | return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; |
| 1447 | } | 1447 | } |
| @@ -1478,7 +1478,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_LoopPlay(int Port, char *getbuf) | @@ -1478,7 +1478,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_LoopPlay(int Port, char *getbuf) | ||
| 1478 | } | 1478 | } |
| 1479 | 1479 | ||
| 1480 | //2、发送循环状态 | 1480 | //2、发送循环状态 |
| 1481 | - HalSend_type1Send_Reply_LoopPlayStatus(Port ,LoopStatus); | 1481 | + HalSend_type1Send_Reply_LoopPlayStatus(Port, FrameSequence, LoopStatus); |
| 1482 | 1482 | ||
| 1483 | return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; | 1483 | return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; |
| 1484 | } | 1484 | } |
| @@ -1518,7 +1518,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_TTS_tone(int Port, char *getbuf) | @@ -1518,7 +1518,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_TTS_tone(int Port, char *getbuf) | ||
| 1518 | //HalSend_type1Send_Reply_Success(Port, FrameSequence); | 1518 | //HalSend_type1Send_Reply_Success(Port, FrameSequence); |
| 1519 | 1519 | ||
| 1520 | //2、发送音色 | 1520 | //2、发送音色 |
| 1521 | - HalSend_type1Send_Reply_TTS_tone(Port ,TTS_tone); | 1521 | + HalSend_type1Send_Reply_TTS_tone(Port, FrameSequence,TTS_tone); |
| 1522 | 1522 | ||
| 1523 | return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; | 1523 | return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; |
| 1524 | } | 1524 | } |
| @@ -1555,7 +1555,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_TTS_speed(int Port, char *getbuf) | @@ -1555,7 +1555,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_TTS_speed(int Port, char *getbuf) | ||
| 1555 | } | 1555 | } |
| 1556 | 1556 | ||
| 1557 | //2、发送语速 | 1557 | //2、发送语速 |
| 1558 | - HalSend_type1Send_Reply_TTS_speed(Port ,TTS_speed); | 1558 | + HalSend_type1Send_Reply_TTS_speed(Port, FrameSequence, TTS_speed); |
| 1559 | 1559 | ||
| 1560 | return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; | 1560 | return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; |
| 1561 | } | 1561 | } |
| @@ -2125,7 +2125,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_CurrentPlayTime(int Port, char *ge | @@ -2125,7 +2125,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_CurrentPlayTime(int Port, char *ge | ||
| 2125 | #ifdef MEGAPHONE_CONFIG_STATUS_ON | 2125 | #ifdef MEGAPHONE_CONFIG_STATUS_ON |
| 2126 | 2126 | ||
| 2127 | int mode = Megaphone_PlayBackGetMode(Port); | 2127 | int mode = Megaphone_PlayBackGetMode(Port); |
| 2128 | - HalSend_type1Send_Reply_CurrentPlayTimeStatus(Port, mode); | 2128 | + HalSend_type1Send_Reply_CurrentPlayTimeStatus(Port, FrameSequence, mode); |
| 2129 | 2129 | ||
| 2130 | #endif | 2130 | #endif |
| 2131 | 2131 | ||
| @@ -4902,7 +4902,7 @@ static T_JZsdkReturnCode RecvDeal_InstructInput(int Port, int Receive_mode, unsi | @@ -4902,7 +4902,7 @@ static T_JZsdkReturnCode RecvDeal_InstructInput(int Port, int Receive_mode, unsi | ||
| 4902 | break; | 4902 | break; |
| 4903 | 4903 | ||
| 4904 | //设置循环间隔 | 4904 | //设置循环间隔 |
| 4905 | - case JZ_INSCODE_5AFRAME_CHECKSTATUS_ADUIO_LOOP_INTERVAL: | 4905 | + case JZ_INSCODE_5AFRAME_ADUIO_PLAY_LOOP_INTERVAL: |
| 4906 | RecvDeal_PlayLoopInterval(Port,getbuf); | 4906 | RecvDeal_PlayLoopInterval(Port,getbuf); |
| 4907 | return 0; | 4907 | return 0; |
| 4908 | break; | 4908 | break; |
| @@ -9,6 +9,7 @@ | @@ -9,6 +9,7 @@ | ||
| 9 | 9 | ||
| 10 | 10 | ||
| 11 | #include "Hal_Send/HalSend.h" | 11 | #include "Hal_Send/HalSend.h" |
| 12 | +#include "./HalSend_type1.h" | ||
| 12 | 13 | ||
| 13 | //发送主动连接帧 | 14 | //发送主动连接帧 |
| 14 | T_JZsdkReturnCode HalSend_type1Send_ConnectFrame(int PortNum) | 15 | T_JZsdkReturnCode HalSend_type1Send_ConnectFrame(int PortNum) |
| @@ -585,7 +586,7 @@ T_JZsdkReturnCode HalSend_type1Send_Send_PlayStatus_end(int Uartport) | @@ -585,7 +586,7 @@ T_JZsdkReturnCode HalSend_type1Send_Send_PlayStatus_end(int Uartport) | ||
| 585 | } | 586 | } |
| 586 | 587 | ||
| 587 | //发送播放状态帧 | 588 | //发送播放状态帧 |
| 588 | -T_JZsdkReturnCode HalSend_type1Send_Send_PlayStatus(int Uartport ,int num) | 589 | +T_JZsdkReturnCode HalSend_type1Send_Send_PlayStatus(int Uartport, int FrameSequence ,int num) |
| 589 | { | 590 | { |
| 590 | printf("向"); | 591 | printf("向"); |
| 591 | switch (Uartport) | 592 | switch (Uartport) |
| @@ -611,6 +612,7 @@ T_JZsdkReturnCode HalSend_type1Send_Send_PlayStatus(int Uartport ,int num) | @@ -611,6 +612,7 @@ T_JZsdkReturnCode HalSend_type1Send_Send_PlayStatus(int Uartport ,int num) | ||
| 611 | JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_AUDIO_PLAYSTATUS , sendbuf, &send_buf_len); | 612 | JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_AUDIO_PLAYSTATUS , sendbuf, &send_buf_len); |
| 612 | 613 | ||
| 613 | //2、写入数据 | 614 | //2、写入数据 |
| 615 | + sendbuf[6] = FrameSequence; //帧序列 | ||
| 614 | sendbuf[9] = (char)num; | 616 | sendbuf[9] = (char)num; |
| 615 | 617 | ||
| 616 | //3、发送帧 | 618 | //3、发送帧 |
| @@ -618,7 +620,7 @@ T_JZsdkReturnCode HalSend_type1Send_Send_PlayStatus(int Uartport ,int num) | @@ -618,7 +620,7 @@ T_JZsdkReturnCode HalSend_type1Send_Send_PlayStatus(int Uartport ,int num) | ||
| 618 | } | 620 | } |
| 619 | 621 | ||
| 620 | //回复当前播放的歌曲名字 | 622 | //回复当前播放的歌曲名字 |
| 621 | -T_JZsdkReturnCode HalSend_type1Send_Reply_MusicName(int Uartport ,char *music_name, int music_name_len) | 623 | +T_JZsdkReturnCode HalSend_type1Send_Reply_MusicName(int Uartport , int FrameSequence, char *music_name, int music_name_len) |
| 622 | { | 624 | { |
| 623 | printf("发送当前歌曲名字帧"); | 625 | printf("发送当前歌曲名字帧"); |
| 624 | unsigned char sendbuf[256]; | 626 | unsigned char sendbuf[256]; |
| @@ -628,6 +630,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_MusicName(int Uartport ,char *music_na | @@ -628,6 +630,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_MusicName(int Uartport ,char *music_na | ||
| 628 | JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_AUDIO_PLAYFILENAME , sendbuf, &send_buf_len); | 630 | JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_AUDIO_PLAYFILENAME , sendbuf, &send_buf_len); |
| 629 | 631 | ||
| 630 | //2、写入数据 | 632 | //2、写入数据 |
| 633 | + sendbuf[6] = FrameSequence; //帧序列 | ||
| 631 | memcpy(&sendbuf[9],music_name,music_name_len); | 634 | memcpy(&sendbuf[9],music_name,music_name_len); |
| 632 | sendbuf[9+music_name_len]=0x00; | 635 | sendbuf[9+music_name_len]=0x00; |
| 633 | sendbuf[10+music_name_len]=0x23; | 636 | sendbuf[10+music_name_len]=0x23; |
| @@ -642,7 +645,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_MusicName(int Uartport ,char *music_na | @@ -642,7 +645,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_MusicName(int Uartport ,char *music_na | ||
| 642 | } | 645 | } |
| 643 | 646 | ||
| 644 | //回复当前音量 | 647 | //回复当前音量 |
| 645 | -T_JZsdkReturnCode HalSend_type1Send_Reply_Volume(int Uartport ,int num) | 648 | +T_JZsdkReturnCode HalSend_type1Send_Reply_Volume(int Uartport, int FrameSequence ,int num) |
| 646 | { | 649 | { |
| 647 | printf("发送当前音量帧\n"); | 650 | printf("发送当前音量帧\n"); |
| 648 | unsigned char sendbuf[256]; | 651 | unsigned char sendbuf[256]; |
| @@ -652,6 +655,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_Volume(int Uartport ,int num) | @@ -652,6 +655,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_Volume(int Uartport ,int num) | ||
| 652 | JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_VOLUME, sendbuf, &send_buf_len); | 655 | JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_VOLUME, sendbuf, &send_buf_len); |
| 653 | 656 | ||
| 654 | //2、写入数据 | 657 | //2、写入数据 |
| 658 | + sendbuf[6] = FrameSequence; //帧序列 | ||
| 655 | sendbuf[9] = (char)num; | 659 | sendbuf[9] = (char)num; |
| 656 | 660 | ||
| 657 | //3、发送帧 | 661 | //3、发送帧 |
| @@ -662,7 +666,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_Volume(int Uartport ,int num) | @@ -662,7 +666,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_Volume(int Uartport ,int num) | ||
| 662 | 666 | ||
| 663 | 667 | ||
| 664 | //回复软件版本号 | 668 | //回复软件版本号 |
| 665 | -T_JZsdkReturnCode HalSend_type1Send_Reply_SoftVersion(int Uartport ,char majorVersion, char minorVersion, char modifyVersion, char debugVersion) | 669 | +T_JZsdkReturnCode HalSend_type1Send_Reply_SoftVersion(int Uartport, int FrameSequence, char majorVersion, char minorVersion, char modifyVersion, char debugVersion) |
| 666 | { | 670 | { |
| 667 | printf("发送软件版本号帧\n"); | 671 | printf("发送软件版本号帧\n"); |
| 668 | unsigned char sendbuf[256]; | 672 | unsigned char sendbuf[256]; |
| @@ -672,6 +676,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_SoftVersion(int Uartport ,char majorVe | @@ -672,6 +676,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_SoftVersion(int Uartport ,char majorVe | ||
| 672 | JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_SORTWAREVERSION, sendbuf, &send_buf_len); | 676 | JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_SORTWAREVERSION, sendbuf, &send_buf_len); |
| 673 | 677 | ||
| 674 | //2、写入数据 | 678 | //2、写入数据 |
| 679 | + sendbuf[6] = FrameSequence; //帧序列 | ||
| 675 | sendbuf[9] = majorVersion; | 680 | sendbuf[9] = majorVersion; |
| 676 | sendbuf[10] = minorVersion; | 681 | sendbuf[10] = minorVersion; |
| 677 | sendbuf[11] = modifyVersion; | 682 | sendbuf[11] = modifyVersion; |
| @@ -682,7 +687,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_SoftVersion(int Uartport ,char majorVe | @@ -682,7 +687,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_SoftVersion(int Uartport ,char majorVe | ||
| 682 | } | 687 | } |
| 683 | 688 | ||
| 684 | //发送循环状态 | 689 | //发送循环状态 |
| 685 | -T_JZsdkReturnCode HalSend_type1Send_Reply_LoopPlayStatus(int Uartport ,int status) | 690 | +T_JZsdkReturnCode HalSend_type1Send_Reply_LoopPlayStatus(int Uartport , int FrameSequence, int status) |
| 686 | { | 691 | { |
| 687 | printf("发送循环状态帧\n"); | 692 | printf("发送循环状态帧\n"); |
| 688 | 693 | ||
| @@ -693,6 +698,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_LoopPlayStatus(int Uartport ,int statu | @@ -693,6 +698,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_LoopPlayStatus(int Uartport ,int statu | ||
| 693 | JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_AUDIO_PLAYLOOPSTATUS, sendbuf, &send_buf_len); | 698 | JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_AUDIO_PLAYLOOPSTATUS, sendbuf, &send_buf_len); |
| 694 | 699 | ||
| 695 | //2、写入数据 | 700 | //2、写入数据 |
| 701 | + sendbuf[6] = FrameSequence; | ||
| 696 | sendbuf[9] = status; | 702 | sendbuf[9] = status; |
| 697 | 703 | ||
| 698 | //3、发送帧 | 704 | //3、发送帧 |
| @@ -701,7 +707,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_LoopPlayStatus(int Uartport ,int statu | @@ -701,7 +707,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_LoopPlayStatus(int Uartport ,int statu | ||
| 701 | } | 707 | } |
| 702 | 708 | ||
| 703 | //发送音色 | 709 | //发送音色 |
| 704 | -T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_tone(int Uartport ,int tone) | 710 | +T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_tone(int Uartport, int FrameSequence, int tone) |
| 705 | { | 711 | { |
| 706 | printf("发送音色帧\n"); | 712 | printf("发送音色帧\n"); |
| 707 | 713 | ||
| @@ -712,6 +718,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_tone(int Uartport ,int tone) | @@ -712,6 +718,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_tone(int Uartport ,int tone) | ||
| 712 | JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_TTS_TONE, sendbuf, &send_buf_len); | 718 | JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_TTS_TONE, sendbuf, &send_buf_len); |
| 713 | 719 | ||
| 714 | //2、写入数据 | 720 | //2、写入数据 |
| 721 | + sendbuf[6] = FrameSequence; //帧序列 | ||
| 715 | sendbuf[9] = tone; | 722 | sendbuf[9] = tone; |
| 716 | 723 | ||
| 717 | //3、发送帧 | 724 | //3、发送帧 |
| @@ -719,7 +726,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_tone(int Uartport ,int tone) | @@ -719,7 +726,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_tone(int Uartport ,int tone) | ||
| 719 | } | 726 | } |
| 720 | 727 | ||
| 721 | //发送语速 | 728 | //发送语速 |
| 722 | -T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_speed(int Uartport ,int speed) | 729 | +T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_speed(int Uartport, int FrameSequence, int speed) |
| 723 | { | 730 | { |
| 724 | printf("发送语速帧\n"); | 731 | printf("发送语速帧\n"); |
| 725 | 732 | ||
| @@ -730,6 +737,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_speed(int Uartport ,int speed) | @@ -730,6 +737,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_speed(int Uartport ,int speed) | ||
| 730 | JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_TTS_SPEED, sendbuf, &send_buf_len); | 737 | JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_TTS_SPEED, sendbuf, &send_buf_len); |
| 731 | 738 | ||
| 732 | //2、写入数据 | 739 | //2、写入数据 |
| 740 | + sendbuf[6] = FrameSequence; //帧序列 | ||
| 733 | sendbuf[9] = speed; | 741 | sendbuf[9] = speed; |
| 734 | 742 | ||
| 735 | //3、发送帧 | 743 | //3、发送帧 |
| @@ -737,7 +745,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_speed(int Uartport ,int speed) | @@ -737,7 +745,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_speed(int Uartport ,int speed) | ||
| 737 | } | 745 | } |
| 738 | 746 | ||
| 739 | //发送当前播放时间状态 | 747 | //发送当前播放时间状态 |
| 740 | -T_JZsdkReturnCode HalSend_type1Send_Reply_CurrentPlayTimeStatus(int Uartport ,int mode) | 748 | +T_JZsdkReturnCode HalSend_type1Send_Reply_CurrentPlayTimeStatus(int Uartport, int FrameSequence ,int mode) |
| 741 | { | 749 | { |
| 742 | printf("发送当前播放时间状态帧\n"); | 750 | printf("发送当前播放时间状态帧\n"); |
| 743 | 751 | ||
| @@ -748,6 +756,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_CurrentPlayTimeStatus(int Uartport ,in | @@ -748,6 +756,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_CurrentPlayTimeStatus(int Uartport ,in | ||
| 748 | JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_CHECKSTATUS_CURRENT_PLAYTIME, sendbuf, &send_buf_len); | 756 | JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_CHECKSTATUS_CURRENT_PLAYTIME, sendbuf, &send_buf_len); |
| 749 | 757 | ||
| 750 | //2、写入数据 | 758 | //2、写入数据 |
| 759 | + sendbuf[6] = FrameSequence; //帧序列 | ||
| 751 | sendbuf[9] = mode; | 760 | sendbuf[9] = mode; |
| 752 | 761 | ||
| 753 | //3、发送帧 | 762 | //3、发送帧 |
| @@ -882,7 +891,7 @@ T_JZsdkReturnCode HalSend_type1Send_Send_OpusList_Stop(int Uartport, int FrameSe | @@ -882,7 +891,7 @@ T_JZsdkReturnCode HalSend_type1Send_Send_OpusList_Stop(int Uartport, int FrameSe | ||
| 882 | ****************************************************************************************************************************************************/ | 891 | ****************************************************************************************************************************************************/ |
| 883 | 892 | ||
| 884 | //回复当前俯仰云台角度 | 893 | //回复当前俯仰云台角度 |
| 885 | -T_JZsdkReturnCode HalSend_type1Send_Reply_GimbalPitchAngle(int Uartport ,int angle) | 894 | +T_JZsdkReturnCode HalSend_type1Send_Reply_GimbalPitchAngle(int Uartport, int FrameSequence ,int angle) |
| 886 | { | 895 | { |
| 887 | printf("发送当前俯仰云台角度帧\n"); | 896 | printf("发送当前俯仰云台角度帧\n"); |
| 888 | unsigned char sendbuf[256]; | 897 | unsigned char sendbuf[256]; |
| @@ -899,6 +908,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_GimbalPitchAngle(int Uartport ,int ang | @@ -899,6 +908,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_GimbalPitchAngle(int Uartport ,int ang | ||
| 899 | angle = -angle; | 908 | angle = -angle; |
| 900 | } | 909 | } |
| 901 | 910 | ||
| 911 | + sendbuf[6] = FrameSequence; //帧序列 | ||
| 902 | sendbuf[9] = (char)signal; | 912 | sendbuf[9] = (char)signal; |
| 903 | sendbuf[10] = (char)(angle >> 8); | 913 | sendbuf[10] = (char)(angle >> 8); |
| 904 | sendbuf[11] = (char)(angle & 255); | 914 | sendbuf[11] = (char)(angle & 255); |
| @@ -58,9 +58,9 @@ T_JZsdkReturnCode HalSend_type1Send_Send_AudioList_Stop(int Uartport, int FrameS | @@ -58,9 +58,9 @@ T_JZsdkReturnCode HalSend_type1Send_Send_AudioList_Stop(int Uartport, int FrameS | ||
| 58 | 58 | ||
| 59 | 59 | ||
| 60 | T_JZsdkReturnCode HalSend_type1Send_Send_PlayStatus_end(int Uartport); | 60 | T_JZsdkReturnCode HalSend_type1Send_Send_PlayStatus_end(int Uartport); |
| 61 | -T_JZsdkReturnCode HalSend_type1Send_Send_PlayStatus(int Uartport ,int num); | ||
| 62 | -T_JZsdkReturnCode HalSend_type1Send_Reply_MusicName(int Uartport ,char *music_name, int music_name_len); | ||
| 63 | -T_JZsdkReturnCode HalSend_type1Send_Reply_Volume(int Uartport ,int num); | 61 | +T_JZsdkReturnCode HalSend_type1Send_Send_PlayStatus(int Uartport, int FrameSequence ,int num); |
| 62 | +T_JZsdkReturnCode HalSend_type1Send_Reply_MusicName(int Uartport , int FrameSequence, char *music_name, int music_name_len); | ||
| 63 | +T_JZsdkReturnCode HalSend_type1Send_Reply_Volume(int Uartport, int FrameSequence ,int num); | ||
| 64 | T_JZsdkReturnCode HalSend_type1Send_OpusDecodeStatus(int Uartport,int value); | 64 | T_JZsdkReturnCode HalSend_type1Send_OpusDecodeStatus(int Uartport,int value); |
| 65 | 65 | ||
| 66 | T_JZsdkReturnCode HalSend_type1Send_Send_OpusList_Start(int Uartport, int FrameSequence, int music_sum); | 66 | 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 | @@ -68,7 +68,7 @@ T_JZsdkReturnCode HalSend_type1Send_Send_OpusList_Trans(int Uartport, int FrameS | ||
| 68 | T_JZsdkReturnCode HalSend_type1Send_Send_OpusList_Stop(int Uartport, int FrameSequence); | 68 | T_JZsdkReturnCode HalSend_type1Send_Send_OpusList_Stop(int Uartport, int FrameSequence); |
| 69 | 69 | ||
| 70 | 70 | ||
| 71 | -T_JZsdkReturnCode HalSend_type1Send_Reply_GimbalPitchAngle(int Uartport ,int angle); | 71 | +T_JZsdkReturnCode HalSend_type1Send_Reply_GimbalPitchAngle(int Uartport, int FrameSequence ,int angle); |
| 72 | T_JZsdkReturnCode HalSend_type1Send_Set_GimbalPitchAngle(int Uartport ,int angle); | 72 | T_JZsdkReturnCode HalSend_type1Send_Set_GimbalPitchAngle(int Uartport ,int angle); |
| 73 | T_JZsdkReturnCode HalSend_type1Send_Reply_GimbalFineTuningPitch(int Uartport, int FrameSequence, int FineTunigPitch); | 73 | T_JZsdkReturnCode HalSend_type1Send_Reply_GimbalFineTuningPitch(int Uartport, int FrameSequence, int FineTunigPitch); |
| 74 | T_JZsdkReturnCode HalSend_type1Send_Set_GimbalFineTuningPitch(int Uartport, int PitchFineTuning); | 74 | T_JZsdkReturnCode HalSend_type1Send_Set_GimbalFineTuningPitch(int Uartport, int PitchFineTuning); |
| @@ -80,12 +80,12 @@ T_JZsdkReturnCode HalSend_type1Send_CheckStatus_GimbalAngle(int Uartport ,int Fr | @@ -80,12 +80,12 @@ T_JZsdkReturnCode HalSend_type1Send_CheckStatus_GimbalAngle(int Uartport ,int Fr | ||
| 80 | T_JZsdkReturnCode HalSend_type1Send_SetGimbalRange(int Uartport,int FrameSequence,int value); | 80 | T_JZsdkReturnCode HalSend_type1Send_SetGimbalRange(int Uartport,int FrameSequence,int value); |
| 81 | 81 | ||
| 82 | 82 | ||
| 83 | -T_JZsdkReturnCode HalSend_type1Send_Reply_SoftVersion(int Uartport ,char majorVersion, char minorVersion, char modifyVersion, char debugVersion); | ||
| 84 | -T_JZsdkReturnCode HalSend_type1Send_Reply_LoopPlayStatus(int Uartport ,int status); | ||
| 85 | -T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_tone(int Uartport ,int tone); | ||
| 86 | -T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_speed(int Uartport ,int speed); | 83 | +T_JZsdkReturnCode HalSend_type1Send_Reply_SoftVersion(int Uartport, int FrameSequence, char majorVersion, char minorVersion, char modifyVersion, char debugVersion); |
| 84 | +T_JZsdkReturnCode HalSend_type1Send_Reply_LoopPlayStatus(int Uartport , int FrameSequence, int status); | ||
| 85 | +T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_tone(int Uartport, int FrameSequence, int tone); | ||
| 86 | +T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_speed(int Uartport, int FrameSequence, int speed); | ||
| 87 | T_JZsdkReturnCode HalSend_type1Send_Reply_CurrentPlayTime(int Uartport ,int time); | 87 | T_JZsdkReturnCode HalSend_type1Send_Reply_CurrentPlayTime(int Uartport ,int time); |
| 88 | -T_JZsdkReturnCode HalSend_type1Send_Reply_CurrentPlayTimeStatus(int Uartport ,int mode); | 88 | +T_JZsdkReturnCode HalSend_type1Send_Reply_CurrentPlayTimeStatus(int Uartport, int FrameSequence ,int mode); |
| 89 | 89 | ||
| 90 | 90 | ||
| 91 | T_JZsdkReturnCode HalSend_type1Send_Set_SearchLightFrequency(int Uartport ,int Frequency); | 91 | T_JZsdkReturnCode HalSend_type1Send_Set_SearchLightFrequency(int Uartport ,int Frequency); |
| @@ -195,6 +195,7 @@ T_JZsdkReturnCode Lighting_Set_SearchLightFrequency(int value) | @@ -195,6 +195,7 @@ T_JZsdkReturnCode Lighting_Set_SearchLightFrequency(int value) | ||
| 195 | 195 | ||
| 196 | if (DEVICE_VERSION == JZ_U3 || DEVICE_VERSION == JZ_U3S || DEVICE_VERSION == JZ_U3D || DEVICE_VERSION == JZ_U30) | 196 | if (DEVICE_VERSION == JZ_U3 || DEVICE_VERSION == JZ_U3S || DEVICE_VERSION == JZ_U3D || DEVICE_VERSION == JZ_U30) |
| 197 | { | 197 | { |
| 198 | + SearchLight_Frequency = value; | ||
| 198 | return SearchLight_V3S_U3_Set_SearchLightFrequency(value); | 199 | return SearchLight_V3S_U3_Set_SearchLightFrequency(value); |
| 199 | } | 200 | } |
| 200 | else if (DEVICE_VERSION == JZ_H1T) | 201 | else if (DEVICE_VERSION == JZ_H1T) |
| @@ -162,7 +162,7 @@ static T_JZsdkReturnCode Megaphone_Play(struct MegaphoneInfo *IndexInfo, enum Me | @@ -162,7 +162,7 @@ static T_JZsdkReturnCode Megaphone_Play(struct MegaphoneInfo *IndexInfo, enum Me | ||
| 162 | JZSDK_LOG_ERROR("无法进行播放操作,目前正在进行实时语音播放"); | 162 | JZSDK_LOG_ERROR("无法进行播放操作,目前正在进行实时语音播放"); |
| 163 | return JZ_ERRORCODE_REALTIMEVOICE_HAS_BEEN_ON; | 163 | return JZ_ERRORCODE_REALTIMEVOICE_HAS_BEEN_ON; |
| 164 | } | 164 | } |
| 165 | - | 165 | + |
| 166 | //把暂停音乐的标志关了 | 166 | //把暂停音乐的标志关了 |
| 167 | AudioDeal_PauseAndContinuePlay(JZ_FLAGCODE_OFF); | 167 | AudioDeal_PauseAndContinuePlay(JZ_FLAGCODE_OFF); |
| 168 | 168 |
-
请 注册 或 登录 后发表评论