Index: BNEP/user/main.c =================================================================== --- /YC3121_demo/ModuleDemo/BlueTooth/BNEP/user/main.c (revision 730) +++ /YC3121_demo/ModuleDemo/BlueTooth/BNEP/user/main.c (working copy) @@ -28,12 +28,9 @@ #include "yc_bt.h" #include "yc_systick.h" #include "yc_qspi.h" -#include "yc_exti.h" #include "yc_ipc.h" #include "board_config.h" - - /* Private typedef -----------------------------------------------------------*/ /* Private define ------------------------------------------------------------*/ #define IPC_UART UART0 @@ -68,7 +65,7 @@ #endif #define IFLASH_NVRAM_ADDR 0x1000000+((512-4)*1024) -#define NVRAM_LEN 0xaa//每组Nvram长度为34bytes,最多可存储5组配对信息 +#define NVRAM_LEN 170//Nvram 长度170bytes,每组Nvram长度为34bytes,最多可存储5组配对信息 //#define SPP_FLOWCONTROL uint16_t ble_send_handle=0x2a; uint8_t bt_cod[3] = {0x24,0x04,0x04}; @@ -226,7 +223,7 @@ MyPrintf("bt version=%x\n",BT_GetVersion()); qspi_flash_read(IFLASH_NVRAM_ADDR,NvramData,NVRAM_LEN); - if(NvramData[0] == 0xff) + if(NvramData[34*0] > 0x05||NvramData[34*1] > 0x05||NvramData[34*2] > 0x05||NvramData[34*3] > 0x05||NvramData[34*4] > 0x05) { memset(NvramData,0x00,NVRAM_LEN); } @@ -461,7 +458,8 @@ uint8_t bt_master_name[MAX_BT_MASTER_NAME_LEN]; void BT_Progress() { - switch(BT_GetEventOpcode()) + int eventCmd= BT_GetEventOpcode(); + switch(eventCmd) { case DNS_RSP: { @@ -720,7 +718,7 @@ if(BT_SetSppFlowcontrol(1) != TRUE) MyPrintf("set Flowcontrol failed\n"); #endif } - else MyPrintf("read bt data error"); + else MyPrintf("read bt data error\r\n"); } break; @@ -743,7 +741,7 @@ for(int i=0;i0) + if(PairingDataLen==2) { pairing_status |=PairingData[0]; pairing_status |=(PairingData[1]<<8); @@ -911,7 +909,7 @@ break; } } - else MyPrintf("read PAIRING_STATE error"); + else MyPrintf("read PAIRING_STATE data error\r\n"); } break; @@ -955,7 +953,26 @@ } break; + case -1: + //no event + break; + default: + { + MyPrintf("unknown event:%02x\r\n",eventCmd); + uint8_t unknownData[MAX_BLUETOOTH_DATA_LEN]; + int unknownDataLen=0; + unknownDataLen=BT_ReadBTData(unknownData); + if(unknownDataLen>0) + { + MyPrintf("datalen:%d\r\n",unknownDataLen); + for(int i=0;i0 0 - - - - main - 1 - 0 - 0 - 0 - 2 + 1 3 1 0 0 0 - ..\..\user\main.c - main.c + ..\..\..\..\..\Librarier\core\bt_code.c + bt_code.c 0 0 + + + + main + 1 + 0 + 0 + 0 2 4 @@ -251,8 +251,8 @@ 0 0 0 - ..\..\user\bt_code.c - bt_code.c + ..\..\user\main.c + main.c 0 0 Index: BT&BLE/prj/MDK/YC3121_Keil.uvprojx =================================================================== --- /YC3121_demo/ModuleDemo/BlueTooth/BT&BLE/prj/MDK/YC3121_Keil.uvprojx (revision 730) +++ /YC3121_demo/ModuleDemo/BlueTooth/BT&BLE/prj/MDK/YC3121_Keil.uvprojx (working copy) @@ -199,7 +199,7 @@ 0 0 0 - 0 + 1 0 0 0 @@ -274,8 +274,8 @@ 1 - 0x0 - 0x40000 + 0x1000000 + 0x80000 1 @@ -299,8 +299,8 @@ 0 - 0x20000000 - 0x20000 + 0x20000 + 0x10000 0 @@ -321,7 +321,7 @@ 0 0 0 - 2 + 1 0 0 1 @@ -392,6 +392,11 @@ 1 ..\..\..\..\..\Librarier\core\system.c + + bt_code.c + 1 + ..\..\..\..\..\Librarier\core\bt_code.c + @@ -402,11 +407,6 @@ 1 ..\..\user\main.c - - bt_code.c - 1 - ..\..\user\bt_code.c - Index: BT&BLE/user/main.c =================================================================== --- /YC3121_demo/ModuleDemo/BlueTooth/BT&BLE/user/main.c (revision 730) +++ /YC3121_demo/ModuleDemo/BlueTooth/BT&BLE/user/main.c (working copy) @@ -28,11 +28,13 @@ #include "yc_bt.h" #include "yc_systick.h" #include "yc_qspi.h" +#include "yc_ipc.h" +#include "board_config.h" /* Private typedef -----------------------------------------------------------*/ /* Private define ------------------------------------------------------------*/ -#define uartBaud 115200 -#define PRINT_UART UART0 +#define IPC_UART UART0 +//#define UART_TO_IPC /* Private macro -------------------------------------------------------------*/ /* Private variables ---------------------------------------------------------*/ @@ -61,9 +63,8 @@ uint8_t ble_Characteristic_uuid_flow_ctrl[] = {0x18,0x10,0x18,0x03,0xa6,0x28,0x5e,0xd8,0xec,0x91,0x1c,0x48,0xa3,0xac,0x43,0x53,0x53,0x49,0x01,0x00}; - -#define IFLASH_NVRAM_ADDR 0x1000000+0x40000 -#define NVRAM_LEN 170//Nvram 长度170bytes,每个设备信息34个字节. +#define IFLASH_NVRAM_ADDR 0x1000000+((512-4)*1024) +#define NVRAM_LEN 170//Nvram 长度170bytes,每组Nvram长度为34bytes,最多可存储5组配对信息 //#define SPP_FLOWCONTROL uint16_t ble_send_handle=0x2a; uint8_t bt_cod[3] = {0x24,0x04,0x04}; @@ -72,14 +73,27 @@ //write flash uint8_t ReserveNV(uint8_t* nvram); +extern tick SystickCount; +#ifdef UART_TO_IPC +HCI_TypeDef HCI_Tx; +HCI_TypeDef HCI_Rx; +uint8_t ipc_tx_buf[256]; +uint8_t ipc_rx_buf[256]; +#endif -extern tick SystickCount;; void BT_IRQHandler() { - //MyPrintf("BT_IRQHandler\n"); while(IPC_have_data()) { + #ifdef UART_TO_IPC + if(TRUE==IPC_ReadBtData(&HCI_Rx)) + { + UART_SendBuf(IPC_UART,(uint8_t*)&HCI_Rx,3); + UART_SendBuf(IPC_UART,HCI_Rx.p_data,HCI_Rx.DataLen); + } + #else BT_ParseBTData(); + #endif } BT_CONFIG &= (~(1<=TICK_MAX_VALUE) SystickCount=0; } @@ -111,26 +126,30 @@ */ int main(void) { - uint8_t bt_name[17] = "YC3121demo"; - uint8_t bt_addr[6] = {0x00,0x00,0x00,0x33,0x22,0x11}; + uint8_t bt_name[15] = "YC3121bt"; + uint8_t bt_addr[6] = {0x00,0x00,0x00,0x33,0x22,0x10}; uint8_t chip_id[6]={0}; uint16_t temp_handle; int UARTCMD = 0; uint8_t getbtstatus = 0; int i = 0; + #ifdef UART_TO_IPC + HCI_Tx.p_data=ipc_tx_buf; + HCI_Rx.p_data=ipc_rx_buf; + #endif UART_Configuration(); - - SysTick_Config(CPU_MHZ/1000); + MyPrintf("bt ble demo\n"); + SysTick_Config(CPU_MHZ/100); BT_Init(); enable_intr(INTR_BT); read_chipid(chip_id); - array2hex(chip_id+3,3,bt_name+10); - bt_name[16]='\0'; + array2hex(chip_id,3,bt_name+8); + bt_name[14]='\0'; memcpy(bt_addr,chip_id,3); - MyPrintf("bt ble demo\n"); + #ifndef UART_TO_IPC if(BT_SetBleName(bt_name,sizeof(bt_name)-1)==TRUE) MyPrintf("SetBleName_suc ble name:%s\n",bt_name); else @@ -198,11 +217,11 @@ MyPrintf("bt version=%x\n",BT_GetVersion()); - - memset(NvramData,0xff,NVRAM_LEN); qspi_flash_read(IFLASH_NVRAM_ADDR,NvramData,NVRAM_LEN); - //nvram 包含5个设备信息 - + if(NvramData[34*0] > 0x05||NvramData[34*1] > 0x05||NvramData[34*2] > 0x05||NvramData[34*3] > 0x05||NvramData[34*4] > 0x05) + { + memset(NvramData,0x00,NVRAM_LEN); + } i=0; if(BT_SetNVRAM(NvramData,NVRAM_LEN) == TRUE) { @@ -213,10 +232,30 @@ } else MyPrintf("set nvram failed\n"); + #endif while (1) { + //uart cmd to ipc + #ifdef UART_TO_IPC + if(UART_IsRXFIFONotEmpty(IPC_UART)) + { + HCI_Tx.type = UART_ReceiveData(IPC_UART); + while(!UART_IsRXFIFONotEmpty(IPC_UART)); + HCI_Tx.opcode = UART_ReceiveData(IPC_UART); + while(!UART_IsRXFIFONotEmpty(IPC_UART)); + HCI_Tx.DataLen = UART_ReceiveData(IPC_UART); + i=0; + while(i0) + { + MyPrintf("datalen:%d\r\n",unknownDataLen); + for(int i=0;i