From 4e6058168fdccb4bf5eec93134dc58ed9d5f4e53 Mon Sep 17 00:00:00 2001
From: Alex xu <sh_xu@tkplusemi.com>
Date: Thu, 9 Jan 2025 18:55:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=86=85=E5=AE=B9=EF=BC=9A?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=92=8C=E7=8E=84=E6=81=92=E8=80=B3=E6=9C=BA?=
 =?UTF-8?q?=E8=8A=AF=E7=89=87=E5=8F=8C=E5=90=91=E9=80=9A=E8=AE=AF=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=8C=E9=80=9A=E8=AE=AF=E6=B3=A2=E7=89=B9=E7=8E=87?=
 =?UTF-8?q?=E4=B8=BA=EF=BC=9A9600bps=EF=BC=8CCRC16=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E5=92=8C=E4=B8=BA=EF=BC=9ACRC-16-CCITT-FALSE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...0109_1524.bin => 8837_EVB_250109_1854.bin} | Bin
 ...0109_1524.hex => 8837_EVB_250109_1854.hex} |   0
 ...n => 8837_EVB_250109_1854_B28A_010102.bin} | Bin
 Project/SY8837_Demo.uvgui.GH                  |   6 +++---
 SY8837_Demo.si4project/SY8837_Demo.sip_sym    | Bin 351512 -> 351512 bytes
 UsrInc/uart/uart.h                            |  12 ++++++++++--
 UsrSrc/vox/vox_module.c                       |   8 ++++----
 7 files changed, 17 insertions(+), 9 deletions(-)
 rename Out/{8837_EVB_250109_1524.bin => 8837_EVB_250109_1854.bin} (100%)
 rename Out/{8837_EVB_250109_1524.hex => 8837_EVB_250109_1854.hex} (100%)
 rename Out/{8837_EVB_250109_1524_B28A_010102.bin => 8837_EVB_250109_1854_B28A_010102.bin} (100%)

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 @@
         <PaneID>0</PaneID>
       </Doc>
       <Doc>
-        <Name>E:\todaywork\20241202_tp3410\SY8837_Demo\UsrInc\inc\config.h</Name>
+        <Name>\todaywork\20241202_tp3410\SY8837_Demo\UsrInc\inc\config.h</Name>
         <ColumnNumber>16</ColumnNumber>
         <TopLine>183</TopLine>
         <CurrentLine>205</CurrentLine>
@@ -3677,7 +3677,7 @@
         <PaneID>0</PaneID>
       </Doc>
       <Doc>
-        <Name>E:\todaywork\20241202_tp3410\SY8837_Demo\UsrInc\charger\charger_module.h</Name>
+        <Name>..\UsrInc\charger\charger_module.h</Name>
         <ColumnNumber>7</ColumnNumber>
         <TopLine>46</TopLine>
         <CurrentLine>75</CurrentLine>
@@ -3686,7 +3686,7 @@
         <PaneID>0</PaneID>
       </Doc>
       <Doc>
-        <Name>E:\todaywork\20241202_tp3410\SY8837_Demo\UsrInc\vox\vox_module.h</Name>
+        <Name>..\UsrInc\vox\vox_module.h</Name>
         <ColumnNumber>18</ColumnNumber>
         <TopLine>459</TopLine>
         <CurrentLine>490</CurrentLine>
diff --git a/SY8837_Demo.si4project/SY8837_Demo.sip_sym b/SY8837_Demo.si4project/SY8837_Demo.sip_sym
index 31b34883f2cdedf8828caff443b389fc6f656f0b..89e5624df3b795822b9eb41162d7db73a060e908 100644
GIT binary patch
delta 396
zcmX|7&r1SP5PomxkxLk?=t4+=!5*Shf(K8rK_CgjLLweIbdC-lI!iwwJw!+^9FKw*
z!43t&l0<X~3W8Fza?SKl2=W|Fx^(#F&3xbR&BrS>^io6Dbq`}n#>CSUV@<*%p?<kA
z;PNY=9SX%33XdLPW<&8{tpy2bo)|of%{J&Vc(#-q<vBsIM|rT;aVyLXd|u{WTx>%G
zt1Yn5d?0SF4F%jw{HfGQGa~T(3RJYV6%}`1pe(f;G2>;7#R!y%#pHh2kI@bkd@D5S
zg#Q=29jM^&KryiVO2!xSWSo2><J%vBJ3Y`a;80QDNvu0y;5BtJ6P}!iyC>pub>zoP
zmzFd~nP@3jOQFw!N^zP`=(J0x@s4QBgxq!dx^dd%*y^}PR@OHJ(3s_#ZGONS$6=7d
cRr^pl?TccQhj8<gvfS5<oHhVk8wfS~3lMjEi2wiq

delta 389
zcmXYrKS)AR6vpp)_m)Bmx9ovPgVGy9i4-Cn9NzGT8j1(GCE?hpdqh;GL4$CI<0v@P
z&=LqQq`@_aFwA_~9~~PToEoC@q~YTn_<ra6POYWaTDq?L7|Svyo@N<)CM7h+nzykL
zsP9F2Dl|uEkUpPzBrAf&5`=JJU&~<9<^p92qIhrtW_eNplIBb*+}^^%0vOmyLI78~
zd>zdS*f>7X3|#8+Dvl$bOPlH>L@>Y@i<9UL7RTZXZ>YkZz{7hk)mchnx<@C++aQ8E
z5gVlG#6gcYFrT8R`YT0MuMEug3C#;ay-<tfg<3d2<RSFCWXdoIm06W|<MO&PeFAeo
z)MHH~76#;3_dww08U$d+yJ}#~<p#P#Dro--{ObS1mv02y%hWVS4QbMJVk`_H$9(4&
gsN}A|c9Tc(`h!?gr$=+2-u3`SS&q0PN5X&f2fr+N<^TWy

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)
 				{