rb_peng/SY883x_For_Clients_langxun-J8
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更改内容：1、按键处理函数中增加倒数进休眠重新计时标志；2、更改UART波特率计算公式，采用11.0592M主频；更改UART传输为8-bit UART Mode 1 REN Disable。

Browse Source
This commit is contained in:
Alex xu 2024-09-11 14:33:28 +08:00
parent 05092cd722
commit 520b223a8d
12 changed files with 79 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Out/SY883X_EVB_mcu_2024_09_09_153809.bin → Out/SY883X_EVB_mcu_2024_09_11_142613.bin
View File

Binary file not shown.

48
Out/SY883X_EVB_mcu_2024_09_09_153809.hex → Out/SY883X_EVB_mcu_2024_09_11_142613.hex
View File

@ -1,7 +1,7 @@
:030000000204A84F :030000000204A84F
:1004A800758E3075D20078FFE4F6D8FD7581540258 :1004A800758E3075D20078FFE4F6D8FD7581540258
:0204B80004F549 :0204B80004F549
:0F0A28001205BAD2AED2BE12092912053A80F4D5 :0F0A2A001205BAD2AED2BE12092912053A80F4D3
:04041300024F000094 :04041300024F000094
:0208E500AD075D :0208E500AD075D
:1008E700E4FCFBFAF527F52875FE2975FF8BEDC4A7 :1008E700E4FCFBFAF527F52875FE2975FF8BEDC4A7
@ -48,9 +48,9 @@
:0300460035D21E92 :0300460035D21E92
:010049002294 :010049002294
:0E042400C112C110C10FC111015200015100DF :0E042400C112C110C10FC111015200015100DF
:1009CE00E5E220E117785106E6C394324012E5E2E3 :1009CE00E5E220E119785106E6C39432400DE5E2E6
:1009DE0020E10DD20F087603E418F622E47851F6E2 :1009DE0020E108D20F087603E418F6D21E22E4783E
:0109EE0022E6 :0309EE0051F6229D
:0D000E00EF146006047005D28422D2832214 :0D000E00EF146006047005D28422D2832214
:0D07F200EF146006047005C28422C2832249 :0D07F200EF146006047005C28422C2832249
:10063800E4FE74382EF8E66067743C2EF9743E2E9A :10063800E4FE74382EF8E66067743C2EF9743E2E9A
@ -63,10 +63,10 @@
:0B06A800743E2EF8060EEE6402708710 :0B06A800743E2EF8060EEE6402708710
:0106B3002224 :0106B3002224
:0504320001360AC11EA5 :0504320001360AC11EA5
:100A0700E5E620E706200803301E04C21EC322D3F2 :100A0900E5E620E706200803301E04C21EC322D3F0
:010A170022BC :010A190022BA
:1005BA0075FE8043FF3075FE0153FFFCD2DF43878F :1005BA0075FE8043FF3075FE0153FFFCD2DF43878F
:1005CA008075BA0375AAD97598D0D299D298D2AC47 :1005CA008075BA0375AADC759840D299D298D2ACD4
:1005DA0075B7C375FE6A53FFE043FF047589017559 :1005DA0075B7C375FE6A53FFE043FF047589017559
:1005EA008CFC758A17D2A9D28C438910758DFF7538 :1005EA008CFC758A17D2A9D28C438910758DFF7538
:1005FA008B9BD2ABD28E75FE0675FF1C75FE0375FA :1005FA008B9BD2ABD28E75FE0675FF1C75FE0375FA
@ -75,15 +75,15 @@
:0E062A00AF75F21C75F3C075E80C43B31022D7 :0E062A00AF75F21C75F3C075E80C43B31022D7
:03000300020006F2 :03000300020006F2
:0100060032C7 :0100060032C7
:03004B00020A4D59 :03004B00020A4F57
:060A4D0075EB3CD21E32E5 :060A4F0075EB3CD21E32E3
:0F0437000B440000000000000000000000C11B8B :0F0437000B440000000000000000000000C11B8B
:0607CE008B2B8A2C892D03 :0607CE008B2B8A2C892D03
:1007D400E4FEEEC39F5016201AFD782BE475F00159 :1007D400E4FEEEC39F5016201AFD782BE475F00159
:0D07E40012022B120144D21AF5990E80E585 :0D07E40012022B120144D21AF5990E80E585
:0107F10022E5 :0107F10022E5
:03002300020A3797 :03002300020A3995
:0F0A3700309904C299C21A309804C298D21E3264 :0F0A3900309904C299C21A309804C298D21E3262
:05044600013700C11F99 :05044600013700C11F99
:10035300300141E537C39402500261DFE537C394AE :10035300300141E537C39402500261DFE537C394AE
:100363005550190537301C0A78387601E408F6C26F :100363005550190537301C0A78387601E408F6C26F
@ -100,31 +100,31 @@
:10053A00300921C209120968784FA60608A60712CF :10053A00300921C209120968784FA60608A60712CF
:10054A0000261209CE12080012071F1202681203AF :10054A0000261209CE12080012071F1202681203AF
:10055A0053120778300B58C20BE536D39400400982 :10055A0053120778300B58C20BE536D39400400982
:10056A001536301E4AC21E8043120A07503E75FED7 :10056A001536301E4AC21E8043120A09503E75FED5
:10057A002443FF3CC2ACC2B9C2A9C2AB53B7CFE451 :10057A002443FF3CC2ACC2B9C2A9C2AB53B7CFE451
:10058A00F5B575FE2953FF7F75FE4FF5FF75FE80A1 :10058A00F5B575FE2953FF7F75FE4FF5FF75FE80A1
:10059A0053FFCF43870275FE8043FF3075FE4F75C8 :10059A0053FFCF43870275FE8043FF3075FE4F75C8
:1005AA00FF10D2ACD2B9D2A9D2AB800075360A22DA :1005AA00FF10D2ACD2B9D2A9D2AB800075360A22DA
:070A460000000000000000A9 :070A480000000000000000A7
:10044B00C108C101011E00011D00C103C107C10686 :10044B00C108C101011E00011D00C103C107C10686
:0E045B00C102011F00C100C105011C00C10447 :0E045B00C102011F00C100C105011C00C10447
:100A1800D282EF700753B7CF43B7302253B7CF22F4 :100A1A00D282EF700753B7CF43B7302253B7CF22F2
:10026800E5E8540C6013051FE51FC39402400AE437 :10026800E5E8540C6013051FE51FC39402400AE437
:10027800F51F75E80CFF020A1830183F301633D204 :10027800F51F75E80CFF020A1A30183F301633D202
:1002880082201C0DE5B5700475B50122E4FF120A41 :1002880082201C0DE5B5700475B50122E4FF120A41
:1002980018E534700CD203C218D208C206F51D80C6 :100298001AE534700CD203C218D208C206F51D80C4
:1002A8001AC203E4F51DD206C200C218C204F51F23 :1002A8001AC203E4F51DD206C200C218C204F51F23
:1002B80080097F01120A18C208C218300668E51DB5 :1002B80080097F01120A1AC208C218300668E51DB3
:1002C800C394055003051D22E51EC39405500BC2B7 :1002C800C394055003051D22E51EC39405500BC2B7
:1002D80082E4F5B5051ED205804C30050DC205D265 :1002D80082E4F5B5051ED205804C30050DC205D265
:1002E80082C2087F01120A18800B200008D200E59C :1002E80082C2087F01120A1A800B200008D200E59A
:1002F800E354A0F51C30002EE5E354A0651C600B08 :1002F800E354A0F51C30002EE5E354A0651C600B08
:10030800D201E4F537E5E354A0F51C300F18E51FDA :10030800D201E4F537E5E354A0F51C300F18E51FDA
:10031800C3940A500CE51F20E003120852051F8001 :10031800C3940A500CE51F20E003120852051F8001
:1003280005C20FE4F51F300321E5E354AC64AC606B :1003280005C20FE4F51F300321E5E354AC64AC606B
:1003380003301C16E51DC394325003051D22E4F555 :1003380003301C16E51DC394325003051D22E4F555
:0B034800B57F01120A18C208C2822211 :0B034800B57F01120A1AC208C282220F
:1008520078247C007D007BFF7A0A79467E007F0740 :1008520078247C007D007BFF7A0A79487E007F073E
:1008620012011E7524557525AA752602752706756F :1008620012011E7524557525AA752602752706756F
:1008720028DD7529BAC282E4F5FE43FF0275FE0E39 :1008720028DD7529BAC282E4F5FE43FF0275FE0E39
:1008820043FF04FB7A0079247F071207CE75FE0E20 :1008820043FF04FB7A0079247F071207CE75FE0E20
@ -145,9 +145,9 @@
:10093900E4F531D20D052EE52EC394644005E4F5A6 :10093900E4F531D20D052EE52EC394644005E4F5A6
:100949002ED209052FE52FC394FA4012E4F52FD2D0 :100949002ED209052FE52FC394FA4012E4F52FD2D0
:0F0959000A0530E53094044005E4F530D20B2256 :0F0959000A0530E53094044005E4F530D20B2256
:03000B000209EFF8 :03000B000209F1F6
:1009EF00C0E0C0D074FC258CF58C7417258AF58A6D :1009F100C0E0C0D074FC258CF58C7417258AF58A6B
:0809FF00753301D0D0D0E032C5 :080A0100753301D0D0D0E032C2
:03001B0002089E3A :03001B0002089E3A
:10089E00C0E0C0F0C083C082C0D075D000C000C020 :10089E00C0E0C0F0C083C082C0D075D000C000C020
:1008AE0001C002C003C004C005C006C007C28F1538 :1008AE0001C002C003C004C005C006C007C28F1538
@ -155,7 +155,7 @@
:1008CE00D005D004D003D002D001D000D0D0D08239 :1008CE00D005D004D003D002D001D000D0D0D08239
:0708DE00D083D0F0D0E0321E :0708DE00D083D0F0D0E0321E
:030BFD00010101F2 :030BFD00010101F2
:1004BA00020A28E493A3F8E493A34003F68001F226 :1004BA00020A2AE493A3F8E493A34003F68001F224
:1004CA0008DFF48029E493A3F85407240CC8C33343 :1004CA0008DFF48029E493A3F85407240CC8C33343
:1004DA00C4540F4420C8834004F456800146F6DF12 :1004DA00C4540F4420C8834004F456800146F6DF12
:1004EA00E4800B0102040810204080900413E47E8B :1004EA00E4800B0102040810204080900413E47E8B

BIN
Out/SY883X_EVB_mcu_2024_09_09_153809_crc(c586)_V010101.bin → Out/SY883X_EVB_mcu_2024_09_11_142613_crc(a85c)_V010101.bin
View File

Binary file not shown.

33
Project/TP3102_Demo.uvgui.GH
View File

File diff suppressed because one or more lines are too long

17
TP3310_Demo.si4project/TP3310_Demo.SearchResults
View File

@ -1,5 +1,12 @@
---- P0_PU Matches (4 in 3 files) ---- ---- Enter_Sleep_Cnt_Restart_Flag Matches (11 in 7 files) ----
reg3310.h (UsrInc\inc) line 15 : #define P0_PU 0x00 Hall_Handler in hall.c (UsrSrc\hall) : Enter_Sleep_Cnt_Restart_Flag = 1;
System_Init in system.c (UsrSrc\system) : SFRADDR = P0_PU; Key_Handler in key.c (UsrSrc\key) : Enter_Sleep_Cnt_Restart_Flag = 1;
Vox_TX_Machine in vox_module.c (UsrSrc\vox) : SFRADDR = P0_PU; sleep.c (UsrSrc\sleep) line 36 : bit Enter_Sleep_Cnt_Restart_Flag = 0;
Vox_TX_Machine in vox_module.c (UsrSrc\vox) : SFRADDR = P0_PU; Check_Require_Sleep in sleep.c (UsrSrc\sleep) : if( ( CHIP_STA4 & 0x80 ) || ( ON == Vox_Vout_Enable ) || Enter_Sleep_Cnt_Restart_Flag ) /*VBUS Power Good存在、有中断、耳机处于充电状态情况下，Boost重载输出，系统不进休眠模式。 */
Check_Require_Sleep in sleep.c (UsrSrc\sleep) : Enter_Sleep_Cnt_Restart_Flag = 0;
sleep.h (UsrInc\sleep) line 37 : extern bit Enter_Sleep_Cnt_Restart_Flag;
EX2_isr in system.c (UsrSrc\system) : Enter_Sleep_Cnt_Restart_Flag = 1;
system.c (UsrSrc\system) line 268 : Enter_Sleep_Cnt_Restart_Flag = 1;
uart0_Interrupt in uart.c (UsrSrc\uart) : Enter_Sleep_Cnt_Restart_Flag = 1;
UserAPP in userapp.c (UsrSrc\userapp) : if( Enter_Sleep_Cnt_Restart_Flag )
UserAPP in userapp.c (UsrSrc\userapp) : Enter_Sleep_Cnt_Restart_Flag = 0;

BIN
TP3310_Demo.si4project/TP3310_Demo.sip_sym
View File

Binary file not shown.

BIN
TP3310_Demo.si4project/TP3310_Demo.siwork
View File

Binary file not shown.

2
UsrInc/uart/uart.h
View File

@ -29,7 +29,7 @@
Macro definitions Macro definitions
\******************************************************************************/ \******************************************************************************/
#define Baud_Rate0 9600//9600//19200//38400//93750 #define Baud_Rate0 9600//9600//19200//38400//93750
#define S0REL_VALUE (1024-375000/Baud_Rate0) #define S0REL_VALUE (1024-345600/Baud_Rate0)
#if UART0_ENABLE #if UART0_ENABLE

5
UsrSrc/hall/hall.c
View File

@ -93,7 +93,12 @@ uint8_t Hall_Sta_bk = 0xff;
LED_On_Timer = 0; LED_On_Timer = 0;
Vox_TX_Timer = 0; Vox_TX_Timer = 0;
Hall_Sta_bk = Hall_Sta; Hall_Sta_bk = Hall_Sta;
#if SLEEP_ENABLE
Enter_Sleep_Cnt_Restart_Flag = 1; Enter_Sleep_Cnt_Restart_Flag = 1;
#endif
} }
} }

8
UsrSrc/key/key.c
View File

@ -82,7 +82,7 @@ idata uint8_t Key_Press_Debounce = 0;
#else #else
if( (CHIP_STA0 & 0x02) == 0 ) //CHIP_STA0 的bit1为Key的状态值：0：按下； if( !(CHIP_STA0 & 0x02) ) //CHIP_STA0 的bit1为Key的状态值：0：按下；
{ {
Key_Press_Debounce++; Key_Press_Debounce++;
if( Key_Press_Debounce >= KEY_PRESS_CNT ) if( Key_Press_Debounce >= KEY_PRESS_CNT )
@ -94,6 +94,12 @@ idata uint8_t Key_Press_Debounce = 0;
Key_Press_Debounce = 0; Key_Press_Debounce = 0;
} }
} }
#if SLEEP_ENABLE
Enter_Sleep_Cnt_Restart_Flag = 1;
#endif
} }
else else
{ {

4
UsrSrc/system/system.c
View File

@ -66,7 +66,7 @@
*/ */
void System_Init(void) void System_Init(void)
{ {
SFRADDR = PMU_CTL0; //芯片硬件需求，固定 ; Key Enable,Hall Enable SFRADDR = PMU_CTL0; //芯片硬件需求，固定
SFRDATA |= 0x30; SFRDATA |= 0x30;
/*test*/ /*test*/
@ -88,7 +88,7 @@ void System_Init(void)
S0RELH = HIBYTE(S0REL_VALUE); S0RELH = HIBYTE(S0REL_VALUE);
S0RELL = LOBYTE(S0REL_VALUE);//s0rel=1023, baudrate = fclk/32 = 187.5k S0RELL = LOBYTE(S0REL_VALUE);//s0rel=1023, baudrate = fclk/32 = 187.5k
S0CON = 0xD0; //SCON: MODE 3, 9-bit UART, RI enable, EVEN Parity S0CON = 0x40; //SCON: MODE 1, 8-bit UART, REN disable
TI0 = 1; TI0 = 1;
RI0 = 1; RI0 = 1;

14
UsrSrc/vox/vox_module.c
View File

@ -235,14 +235,14 @@ void Vox_Det_Machine(void)
/* 发送开盖指令*/ /* 发送开盖指令*/
if( Cover_Open_Flag ) /*开盖后，5V持续500ms后0V持续500ms，Vox转入adt模式，等待耳机出入盒，并显示相应的灯效。*/ if( Cover_Open_Flag ) /*开盖后，5V持续500ms后0V持续500ms，Vox转入adt模式，等待耳机出入盒，并显示相应的灯效。*/
{ {
if( Vox_Vol_Hold_Timer < VOX_VOUT_5V_DEBOUNCE ) //开盖后5V 500ms。 if( Vox_Vol_Hold_Timer < VOX_VOUT_5V_DEBOUNCE ) //开盖后5V 500ms。
{ {
Vox_Vol_Hold_Timer++; Vox_Vol_Hold_Timer++;
return; return;
} }
if( Vox_TX_Timer < VOX_VOUT_5V_DEBOUNCE ) //转0V 500ms if( Vox_TX_Timer < VOX_VOUT_5V_DEBOUNCE ) //转0V 500ms
{ {
COM_CTRL = OFF; COM_CTRL = OFF;
@ -254,7 +254,7 @@ void Vox_Det_Machine(void)
} }
else else
{ {
if( Pattern_TX_Over_Flag ) //转adt模式，用于后续识别耳机出入仓检测 if( Pattern_TX_Over_Flag ) //转adt模式，用于后续识别耳机出入仓检测
{ {
Pattern_TX_Over_Flag = 0; Pattern_TX_Over_Flag = 0;
@ -270,14 +270,14 @@ void Vox_Det_Machine(void)
{ {
Get_CHIP_STA1_Flag = 1; Get_CHIP_STA1_Flag = 1;
CHIP_STA1_BK = CHIP_STA1 & 0xA0; //获取耳机loadon状态 CHIP_STA1_BK = CHIP_STA1 & 0xA0; //获取耳机loadon状态
} }
} }
if( Get_CHIP_STA1_Flag ) if( Get_CHIP_STA1_Flag )
{ {
/*耳机出入盒判断*/ /*耳机出入盒判断*/
if( CHIP_STA1_BK != (CHIP_STA1 & 0xA0) ) //查询耳机loadon状态，loadon状态改变，则说明有耳机出入盒。 if( CHIP_STA1_BK != (CHIP_STA1 & 0xA0) ) //查询耳机loadon状态，loadon状态改变，则说明有耳机出入盒。
{ {
Earphone_Chg_Flag = 1; Earphone_Chg_Flag = 1;
@ -362,9 +362,9 @@ void Vox_Det_Machine(void)
#endif #endif
if( ( (CHIP_STA1 & 0xAC) == 0xAC ) || F_batlevel_low ) //耳机充满或盒子低电，则关闭Vout输出通路，关闭Boost。 if( ( (CHIP_STA1 & 0xAC) == 0xAC ) || F_batlevel_low ) //耳机充满或盒子低电，则关闭Vout输出通路，关闭Boost。
{ {
if( Vox_Vol_Hold_Timer < VOX_VOUT_5V_LEAST_CNT ) //重载转轻载延时5s后关闭Boost输出。 if( Vox_Vol_Hold_Timer < VOX_VOUT_5V_LEAST_CNT ) //重载转轻载延时5s后关闭Boost输出。
{ {
Vox_Vol_Hold_Timer++; Vox_Vol_Hold_Timer++;