diff --git a/Out/8837_EVB_250109_1524.bin b/Out/8837_EVB_250109_1854.bin similarity index 100% rename from Out/8837_EVB_250109_1524.bin rename to Out/8837_EVB_250109_1854.bin diff --git a/Out/8837_EVB_250109_1524.hex b/Out/8837_EVB_250109_1854.hex similarity index 100% rename from Out/8837_EVB_250109_1524.hex rename to Out/8837_EVB_250109_1854.hex diff --git a/Out/8837_EVB_250109_1524_B28A_010102.bin b/Out/8837_EVB_250109_1854_B28A_010102.bin similarity index 100% rename from Out/8837_EVB_250109_1524_B28A_010102.bin rename to Out/8837_EVB_250109_1854_B28A_010102.bin diff --git a/Project/SY8837_Demo.uvgui.GH b/Project/SY8837_Demo.uvgui.GH index 9d7032d..74a2f16 100644 --- a/Project/SY8837_Demo.uvgui.GH +++ b/Project/SY8837_Demo.uvgui.GH @@ -3668,7 +3668,7 @@ 0 - E:\todaywork\20241202_tp3410\SY8837_Demo\UsrInc\inc\config.h + \todaywork\20241202_tp3410\SY8837_Demo\UsrInc\inc\config.h 16 183 205 @@ -3677,7 +3677,7 @@ 0 - E:\todaywork\20241202_tp3410\SY8837_Demo\UsrInc\charger\charger_module.h + ..\UsrInc\charger\charger_module.h 7 46 75 @@ -3686,7 +3686,7 @@ 0 - E:\todaywork\20241202_tp3410\SY8837_Demo\UsrInc\vox\vox_module.h + ..\UsrInc\vox\vox_module.h 18 459 490 diff --git a/SY8837_Demo.si4project/SY8837_Demo.sip_sym b/SY8837_Demo.si4project/SY8837_Demo.sip_sym index 31b3488..89e5624 100644 Binary files a/SY8837_Demo.si4project/SY8837_Demo.sip_sym and b/SY8837_Demo.si4project/SY8837_Demo.sip_sym differ diff --git a/UsrInc/uart/uart.h b/UsrInc/uart/uart.h index e85d75e..244af1b 100644 --- a/UsrInc/uart/uart.h +++ b/UsrInc/uart/uart.h @@ -28,10 +28,18 @@ /******************************************************************************\ Macro definitions \******************************************************************************/ -#define Baud_Rate0 115200//9600//19200//38400//93750 +/* Log Debug 接口。 */ +#define Baud_Rate0 115200//19200//38400//93750 + #define S0REL_VALUE (1024-345600/Baud_Rate0) -#define Baud_Rate1 9600//19200//38400//93750 +/* 双向通讯接口。 */ +#if XUANHENG +#define Baud_Rate1 9600//9600//19200//38400//93750 +#else +#define Baud_Rate1 9600//9600//19200//38400//93750 +#endif + #define S1REL_VALUE (1024-345600/Baud_Rate1) #define UART_REC_ENABLE_Pos (4U) diff --git a/UsrSrc/vox/vox_module.c b/UsrSrc/vox/vox_module.c index 9f213f5..7aa4cbb 100644 --- a/UsrSrc/vox/vox_module.c +++ b/UsrSrc/vox/vox_module.c @@ -1516,7 +1516,7 @@ void Vox_Follow_Chg( g_Vox_Fllow_Chg_Cfg *n_Vox_Fllow_Chg ) ******************************************************************************* * u16 CalCheckCrc16(u8 * pucFrame, u16 usLen) * - * Description : 校验和的计算 + * Description : 校验和的计算(CRC-16-CCITT-FALSE) * * * Arguments : u8 *pucFrame: 数据存放地址 @@ -1531,7 +1531,7 @@ void Vox_Follow_Chg( g_Vox_Fllow_Chg_Cfg *n_Vox_Fllow_Chg ) uint16_t CalCheckCrc16(uint8_t *pucFrame, unsigned int usLen) { - uint16_t wCRCin = 0x0000; + uint16_t wCRCin = 0xFFFF; uint16_t wCPoly = 0x1021; uint8_t wChar = 0; unsigned int i; @@ -1908,10 +1908,10 @@ void HandleTxCommand(VOX_BES_COMMAND_E TxCommand, e_Vox_Chan nVox_Chn_Select) 4、D4(1Byte)耳机静默升级,充电盒默认发0x00 */ tx_pData[7] = HW_VER << 4; - tx_pData[7] = FW_VER >> 8; + tx_pData[7] |= FW_VER >> 8; tx_pData[8] = FW_VER; - tx_pData[9] = ( ( ChgStatus & CHG_STA_ING ) << 6 ) | bat_level; + tx_pData[9] = ( ( ChgStatus & CHG_STA_ING ) << 6 ) | ( 5 * bat_level ); if(nVox_Chn_Select == VOL_CHAN) {