Application.Team
/
SAMSUNG_S21P_FHD_ISP568T_XGD
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、解决机板升级安卓14系统升级为6.1后无触问题。

This commit is contained in:
“苏飞源” 2024-05-27 11:13:30 +08:00
parent c194a1b790
commit d8d99a620f
31 changed files with 33552 additions and 15772 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
project/ISP_568T/ISP_568T.uvprojx
View File

@ -50,7 +50,7 @@
<InvalidFlash>1</InvalidFlash>
</TargetStatus>
<OutputDirectory>.\Objects\</OutputDirectory>
<OutputName>ISP_568T_S21P_20230628</OutputName>
<OutputName>ISP_568T_S21P_20240527</OutputName>
<CreateExecutable>1</CreateExecutable>
<CreateLib>0</CreateLib>
<CreateHexFile>1</CreateHexFile>
@ -408,6 +408,11 @@
<FileType>1</FileType>
<FilePath>..\..\src\app\touch\app_tp_st_touch.c</FilePath>
</File>
<File>
<FileName>demo_version.txt</FileName>
<FileType>5</FileType>
<FilePath>..\..\src\app\s21p\demo_version.txt</FilePath>
</File>
</Files>
</Group>
<Group>

5570
project/ISP_568T/Listings/ISP_568T_S21P_20230817.map Normal file
View File

File diff suppressed because it is too large Load Diff

4627
project/ISP_568T/Listings/ISP_568T_S21P_20230628.map → project/ISP_568T/Listings/ISP_568T_S21P_20230818.map
View File

File diff suppressed because it is too large Load Diff

5571
project/ISP_568T/Listings/ISP_568T_S21P_20230821.map Normal file
View File

File diff suppressed because it is too large Load Diff

5571
project/ISP_568T/Listings/ISP_568T_S21P_20230825.map Normal file
View File

File diff suppressed because it is too large Load Diff

4814
project/ISP_568T/Listings/ISP_568T_S21P_20230511.map → project/ISP_568T/Listings/ISP_568T_S21P_20240527.map
View File

File diff suppressed because it is too large Load Diff

3258
project/ISP_568T/Listings/app_tp_for_custom_s21p.txt
View File

File diff suppressed because it is too large Load Diff

344
project/ISP_568T/Listings/app_tp_st_touch.txt
View File

@ -1,5 +1,5 @@
; generated by Component: ARM Compiler 5.06 update 6 (build 750) Tool: ArmCC [4d3637]
; commandline ArmCC [--c99 --list --split_sections --debug -c --asm --interleave --gnu -o.\objects\app_tp_st_touch.o --asm_dir=.\Listings\ --list_dir=.\Listings\ --depend=.\objects\app_tp_st_touch.d --cpu=Cortex-M0 --apcs=interwork -O1 --diag_suppress=9931 -I..\..\src -I..\..\src\board -I..\..\src\common -I..\..\src\sdk\include -I..\..\src\app\demo -I..\..\src\sdk\include\M0 -I..\..\src\app -I..\..\src\app\module_demo -I..\..\src\app\touch -I..\..\src\app\S8 -I..\..\src\app\S9 -I..\CVWL568 -I..\..\src\app\s21p -I.\RTE\_ISP_568T -IC:\Users\55\AppData\Local\Arm\Packs\ARM\CMSIS\5.5.1\CMSIS\Core\Include -IC:\Users\55\AppData\Local\Arm\Packs\ARM\CMSIS\5.5.1\Device\ARM\ARMCM0\Include -D__MICROLIB -D__UVISION_VERSION=528 -D_RTE_ -DARMCM0 -DISP_568 --omf_browse=.\objects\app_tp_st_touch.crf ..\..\src\app\touch\app_tp_st_touch.c]
; commandline ArmCC [--c99 --list --split_sections --debug -c --asm --interleave --gnu -o.\objects\app_tp_st_touch.o --asm_dir=.\Listings\ --list_dir=.\Listings\ --depend=.\objects\app_tp_st_touch.d --cpu=Cortex-M0 --apcs=interwork -O1 --diag_suppress=9931 -I..\..\src -I..\..\src\board -I..\..\src\common -I..\..\src\sdk\include -I..\..\src\app\demo -I..\..\src\sdk\include\M0 -I..\..\src\app -I..\..\src\app\module_demo -I..\..\src\app\touch -I..\..\src\app\S8 -I..\..\src\app\S9 -I..\CVWL568 -I..\..\src\app\s21p -I.\RTE\_ISP_568T -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.5.1\CMSIS\Core\Include -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.5.1\Device\ARM\ARMCM0\Include -D__MICROLIB -D__UVISION_VERSION=528 -D_RTE_ -DARMCM0 -DISP_568 --omf_browse=.\objects\app_tp_st_touch.crf ..\..\src\app\touch\app_tp_st_touch.c]
THUMB
AREA ||i.CRC16_2||, CODE, READONLY, ALIGN=2
@ -391,6 +391,33 @@
|L4.172|
DCD ||.data||+0xb
AREA ||i.ap_tp_st_touch_error_handler_03||, CODE, READONLY, ALIGN=1
ap_tp_st_touch_error_handler_03 PROC
;;;575
;;;576 void ap_tp_st_touch_error_handler_03(uint8_t* screendata)
000000 b510 PUSH {r4,lr}
;;;577 {
;;;578 // 收到 TP 异常回复 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF
;;;579 if(screendata[0] == 0x03 && screendata[7] == 0x00)
000002 7801 LDRB r1,[r0,#0]
000004 2903 CMP r1,#3
000006 d104 BNE |L5.18|
000008 79c0 LDRB r0,[r0,#7]
00000a 2800 CMP r0,#0
00000c d101 BNE |L5.18|
;;;580 {
;;;581 // ap_tp_st_touch_software_reset();
;;;582 ap_tp_st_touch_hardware_reset();
00000e f7fffffe BL ap_tp_st_touch_hardware_reset
|L5.18|
;;;583 }
;;;584 }
000012 bd10 POP {r4,pc}
;;;585
ENDP
AREA ||i.ap_tp_st_touch_error_handler_F3||, CODE, READONLY, ALIGN=1
ap_tp_st_touch_error_handler_F3 PROC
@ -399,61 +426,58 @@
000000 b510 PUSH {r4,lr}
;;;542 {
;;;543 // 收到 TP 异常回复 0xF3 0x02 0x00 0x00 0x00 0x00 0x00 0x00
;;;544 if(screendata[0] == 0xF3 && screendata[1] == 0x02 && screendata[2] == 0x00)
000002 7801 LDRB r1,[r0,#0]
000004 29f3 CMP r1,#0xf3
000006 d107 BNE |L5.24|
000008 7841 LDRB r1,[r0,#1]
00000a 2902 CMP r1,#2
00000c d104 BNE |L5.24|
00000e 7880 LDRB r0,[r0,#2]
000010 2800 CMP r0,#0
000012 d101 BNE |L5.24|
;;;545 {
;;;546 ap_tp_st_touch_software_reset();
000014 f7fffffe BL ap_tp_st_touch_software_reset
|L5.24|
;;;547 }
;;;548
;;;549 // if(screendata[0] == 0xF3 && screendata[1] == 0x91 && screendata[2] == 0x00)
;;;550 // {
;;;551 // ap_tp_st_touch_software_reset();
;;;552 // }
;;;553 }
000018 bd10 POP {r4,pc}
;;;554
;;;544 // if(screendata[0] == 0xF3 && screendata[1] == 0x02 && screendata[2] == 0x00)
;;;545 if(screendata[0] == 0xF3)
000002 7800 LDRB r0,[r0,#0]
000004 28f3 CMP r0,#0xf3
000006 d101 BNE |L6.12|
;;;546 {
;;;547 // ap_tp_st_touch_software_reset();
;;;548 ap_tp_st_touch_hardware_reset();
000008 f7fffffe BL ap_tp_st_touch_hardware_reset
|L6.12|
;;;549 }
;;;550
;;;551 // if(screendata[0] == 0xF3 && screendata[1] == 0x91 && screendata[2] == 0x00)
;;;552 // {
;;;553 // ap_tp_st_touch_software_reset();
;;;554 // }
;;;555 }
00000c bd10 POP {r4,pc}
;;;556
ENDP
AREA ||i.ap_tp_st_touch_error_handler_FF||, CODE, READONLY, ALIGN=1
ap_tp_st_touch_error_handler_FF PROC
;;;562
;;;563 void ap_tp_st_touch_error_handler_FF(uint8_t* screendata)
;;;564
;;;565 void ap_tp_st_touch_error_handler_FF(uint8_t* screendata)
000000 b510 PUSH {r4,lr}
;;;564 {
;;;565 // ÊÕµ½ TP Òì³£»Ø¸´ 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF
;;;566 if(screendata[1] == 0xFF && screendata[2] == 0xFF && screendata[3] == 0xFF && screendata[4] == 0xFF)
;;;566 {
;;;567 // 收到 TP 异常回复 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF
;;;568 if(screendata[1] == 0xFF && screendata[2] == 0xFF && screendata[3] == 0xFF && screendata[4] == 0xFF)
000002 7841 LDRB r1,[r0,#1]
000004 29ff CMP r1,#0xff
000006 d10a BNE |L6.30|
000006 d10a BNE |L7.30|
000008 7881 LDRB r1,[r0,#2]
00000a 29ff CMP r1,#0xff
00000c d107 BNE |L6.30|
00000c d107 BNE |L7.30|
00000e 78c1 LDRB r1,[r0,#3]
000010 29ff CMP r1,#0xff
000012 d104 BNE |L6.30|
000012 d104 BNE |L7.30|
000014 7900 LDRB r0,[r0,#4]
000016 28ff CMP r0,#0xff
000018 d101 BNE |L6.30|
;;;567 {
;;;568 ap_tp_st_touch_software_reset();
00001a f7fffffe BL ap_tp_st_touch_software_reset
|L6.30|
;;;569 }
;;;570 }
000018 d101 BNE |L7.30|
;;;569 {
;;;570 // ap_tp_st_touch_software_reset();
;;;571 ap_tp_st_touch_hardware_reset();
00001a f7fffffe BL ap_tp_st_touch_hardware_reset
|L7.30|
;;;572 }
;;;573 }
00001e bd10 POP {r4,pc}
;;;571
;;;574
ENDP
@ -466,12 +490,12 @@
;;;59 {
000002 b08d SUB sp,sp,#0x34
;;;60 uint8_t cali_send_buff[6] = {0xFA, 0x20, 0x01, 0x00, 0x00, 0x00};
000004 a024 ADR r0,|L7.152|
000004 a024 ADR r0,|L8.152|
000006 c803 LDM r0,{r0,r1}
000008 910c STR r1,[sp,#0x30]
00000a 900b STR r0,[sp,#0x2c]
;;;61 uint8_t cali_send_buff1[3] = {0xA4, 0x06, 0x01};
00000c a024 ADR r0,|L7.160|
00000c a024 ADR r0,|L8.160|
00000e 6800 LDR r0,[r0,#0]
000010 900a STR r0,[sp,#0x28]
;;;62 uint8_t cali_read_buff[40] = {0};
@ -486,11 +510,11 @@
00001e 2105 MOVS r1,#5
000020 a80b ADD r0,sp,#0x2c
000022 f7fffffe BL app_tp_m_read
|L7.38|
|L8.38|
;;;66 while(!hal_i2c_m_transfer_complate());
000026 f7fffffe BL hal_i2c_m_transfer_complate
00002a 2800 CMP r0,#0
00002c d0fb BEQ |L7.38|
00002c d0fb BEQ |L8.38|
;;;67 delayMs(1);
00002e 2001 MOVS r0,#1
000030 f7fffffe BL delayMs
@ -499,11 +523,11 @@
000034 2103 MOVS r1,#3
000036 a80a ADD r0,sp,#0x28
000038 f7fffffe BL app_tp_m_write
|L7.60|
|L8.60|
;;;70 while(!hal_i2c_m_transfer_complate());
00003c f7fffffe BL hal_i2c_m_transfer_complate
000040 2800 CMP r0,#0
000042 d0fb BEQ |L7.60|
000042 d0fb BEQ |L8.60|
;;;71 delayMs(1);
000044 2001 MOVS r0,#1
000046 f7fffffe BL delayMs
@ -514,11 +538,11 @@
00004e 2105 MOVS r1,#5
000050 a80b ADD r0,sp,#0x2c
000052 f7fffffe BL app_tp_m_read
|L7.86|
|L8.86|
;;;74 while(!hal_i2c_m_transfer_complate());
000056 f7fffffe BL hal_i2c_m_transfer_complate
00005a 2800 CMP r0,#0
00005c d0fb BEQ |L7.86|
00005c d0fb BEQ |L8.86|
;;;75 delayMs(1);
00005e 2001 MOVS r0,#1
000060 f7fffffe BL delayMs
@ -529,32 +553,32 @@
000068 2105 MOVS r1,#5
00006a a80b ADD r0,sp,#0x2c
00006c f7fffffe BL app_tp_m_read
|L7.112|
|L8.112|
;;;78 while(!hal_i2c_m_transfer_complate());
000070 f7fffffe BL hal_i2c_m_transfer_complate
000074 2800 CMP r0,#0
000076 d0fb BEQ |L7.112|
000076 d0fb BEQ |L8.112|
;;;79
;;;80 if((cali_read_buff[20] == 0xFF) && (cali_read_buff[21] == 0xFF))
000078 4668 MOV r0,sp
00007a 7d01 LDRB r1,[r0,#0x14]
;;;81 {
;;;82 s_calibration_correct_flag = ST_TP_CALIBRATION_SUCCESS; // 校准成功
00007c 4809 LDR r0,|L7.164|
00007c 4809 LDR r0,|L8.164|
00007e 29ff CMP r1,#0xff ;80
000080 d103 BNE |L7.138|
000080 d103 BNE |L8.138|
000082 4669 MOV r1,sp ;80
000084 7d49 LDRB r1,[r1,#0x15] ;80
000086 29ff CMP r1,#0xff ;80
000088 d003 BEQ |L7.146|
|L7.138|
000088 d003 BEQ |L8.146|
|L8.138|
;;;83 }
;;;84 else
;;;85 {
;;;86 s_calibration_correct_flag = 0x00; // 校准失败
00008a 2100 MOVS r1,#0
00008c 7041 STRB r1,[r0,#1]
|L7.142|
|L8.142|
;;;87 }
;;;88 /*
;;;89 for(i=0;i<32;i++)
@ -565,22 +589,22 @@
;;;94 }
00008e b00d ADD sp,sp,#0x34
000090 bd00 POP {pc}
|L7.146|
|L8.146|
000092 215a MOVS r1,#0x5a ;82
000094 7041 STRB r1,[r0,#1] ;82
000096 e7fa B |L7.142|
000096 e7fa B |L8.142|
;;;95
ENDP
|L7.152|
|L8.152|
000098 fa200100 DCB 250," ",1,0
00009c 00 DCB 0
00009d 00 DCB 0
00009e 00 DCB 0
00009f 00 DCB 0
|L7.160|
|L8.160|
0000a0 a4060100 DCB 164,6,1,0
|L7.164|
|L8.164|
DCD ||.data||
AREA ||i.ap_tp_st_touch_hardware_reset||, CODE, READONLY, ALIGN=2
@ -593,15 +617,15 @@
;;;415 TAU_LOGD("st_touch_hardware_reset \n");
000002 22ff MOVS r2,#0xff
000004 32a0 ADDS r2,r2,#0xa0
000006 a121 ADR r1,|L8.140|
000008 a022 ADR r0,|L8.148|
000006 a121 ADR r1,|L9.140|
000008 a022 ADR r0,|L9.148|
00000a f7fffffe BL LOG_printf
;;;416 ap_tp_st_touch_simulate_finger_release_event();
00000e f7fffffe BL ap_tp_st_touch_simulate_finger_release_event
;;;417 ap_tp_st_touch_scan_point_init();
000012 f7fffffe BL ap_tp_st_touch_scan_point_init
;;;418 hal_gpio_set_output_data(g_screen_input_rst_pad, IO_LVL_HIGH);
000016 4c29 LDR r4,|L8.188|
000016 4c29 LDR r4,|L9.188|
000018 2101 MOVS r1,#1
00001a 7820 LDRB r0,[r4,#0] ; g_screen_input_rst_pad
00001c f7fffffe BL hal_gpio_set_output_data
@ -625,39 +649,39 @@
;;;424
;;;425 app_tp_m_write(st_touch_tp_tuning_clearfifo, sizeof(st_touch_tp_tuning_clearfifo));//0xA4,0x00,0x01}
000042 2103 MOVS r1,#3
000044 481e LDR r0,|L8.192|
000044 481e LDR r0,|L9.192|
000046 f7fffffe BL app_tp_m_write
|L8.74|
|L9.74|
;;;426 while(!hal_i2c_m_transfer_complate());
00004a f7fffffe BL hal_i2c_m_transfer_complate
00004e 2800 CMP r0,#0
000050 d0fb BEQ |L8.74|
000050 d0fb BEQ |L9.74|
;;;427 delayMs(5);
000052 2005 MOVS r0,#5
000054 f7fffffe BL delayMs
;;;428 app_tp_m_write(st_touch_init_sensor_off, sizeof(st_touch_init_sensor_off));//0xA0,0x00,0x00
000058 4819 LDR r0,|L8.192|
000058 4819 LDR r0,|L9.192|
00005a 2103 MOVS r1,#3
00005c 3818 SUBS r0,r0,#0x18
00005e f7fffffe BL app_tp_m_write
|L8.98|
|L9.98|
;;;429 while(!hal_i2c_m_transfer_complate());
000062 f7fffffe BL hal_i2c_m_transfer_complate
000066 2800 CMP r0,#0
000068 d0fb BEQ |L8.98|
000068 d0fb BEQ |L9.98|
;;;430 delayMs(5);
00006a 2005 MOVS r0,#5
00006c f7fffffe BL delayMs
;;;431 app_tp_m_write(st_touch_init_sensor_on, sizeof(st_touch_init_sensor_on));//0xA0,0x00,0x01
000070 4813 LDR r0,|L8.192|
000070 4813 LDR r0,|L9.192|
000072 2103 MOVS r1,#3
000074 3815 SUBS r0,r0,#0x15
000076 f7fffffe BL app_tp_m_write
|L8.122|
|L9.122|
;;;432 while(!hal_i2c_m_transfer_complate());
00007a f7fffffe BL hal_i2c_m_transfer_complate
00007e 2800 CMP r0,#0
000080 d0fb BEQ |L8.122|
000080 d0fb BEQ |L9.122|
;;;433 delayMs(5);
000082 2005 MOVS r0,#5
000084 f7fffffe BL delayMs
@ -667,10 +691,10 @@
ENDP
00008a 0000 DCW 0x0000
|L8.140|
|L9.140|
00008c 7461755f DCB "tau_log",0
000090 6c6f6700
|L8.148|
|L9.148|
000094 5b25735d DCB "[%s] (%04d) st_touch_hardware_reset \n",0
000098 20282530
00009c 34642920
@ -683,9 +707,9 @@
0000b8 0a00
0000ba 00 DCB 0
0000bb 00 DCB 0
|L8.188|
|L9.188|
DCD g_screen_input_rst_pad
|L8.192|
|L9.192|
DCD ||.data||+0x1a
AREA ||i.ap_tp_st_touch_scan_point_init||, CODE, READONLY, ALIGN=2
@ -699,14 +723,14 @@
;;;340
;;;341 for(i = 0; i < ST_TP_SCAN_POINT_NUMBER_MAX; i++)
;;;342 tp_scan_data.tp_point_buffer[i] = 0;
000002 4a05 LDR r2,|L9.24|
000002 4a05 LDR r2,|L10.24|
000004 2100 MOVS r1,#0 ;341
|L9.6|
|L10.6|
000006 5411 STRB r1,[r2,r0]
000008 1c40 ADDS r0,r0,#1 ;341
00000a b2c0 UXTB r0,r0 ;341
00000c 2806 CMP r0,#6 ;341
00000e d3fa BCC |L9.6|
00000e d3fa BCC |L10.6|
;;;343 tp_scan_data.tp_point_up_error_flag = 0;
000010 71d1 STRB r1,[r2,#7]
;;;344 tp_scan_data.tp_read_point_counter = 0;
@ -718,7 +742,7 @@
;;;347
ENDP
|L9.24|
|L10.24|
DCD ||.bss||
AREA ||i.ap_tp_st_touch_scan_point_record_event||, CODE, READONLY, ALIGN=2
@ -744,9 +768,9 @@
;;;456 for(j = 0; j < ST_TP_SCAN_POINT_NUMBER_MAX; j++)
;;;457 {
;;;458 if(tp_scan_data.tp_point_buffer[j] == eventid)
000008 4e23 LDR r6,|L10.152|
00000a e041 B |L10.144|
|L10.12|
000008 4e23 LDR r6,|L11.152|
00000a e041 B |L11.144|
|L11.12|
00000c 5c44 LDRB r4,[r0,r1] ;450
00000e 1842 ADDS r2,r0,r1 ;451
000010 7852 LDRB r2,[r2,#1] ;451
@ -755,43 +779,43 @@
000016 1dc9 ADDS r1,r1,#7 ;452
000018 b2cf UXTB r7,r1 ;452
00001a 2c13 CMP r4,#0x13 ;454
00001c d113 BNE |L10.70|
00001c d113 BNE |L11.70|
00001e 2200 MOVS r2,#0 ;456
|L10.32|
|L11.32|
000020 5cb1 LDRB r1,[r6,r2]
000022 4299 CMP r1,r3
000024 d101 BNE |L10.42|
000024 d101 BNE |L11.42|
;;;459 {
;;;460 flag = 1;
000026 2501 MOVS r5,#1
;;;461 break;
000028 e003 B |L10.50|
|L10.42|
000028 e003 B |L11.50|
|L11.42|
00002a 1c52 ADDS r2,r2,#1 ;456
00002c b2d2 UXTB r2,r2 ;456
00002e 2a06 CMP r2,#6 ;456
000030 d3f6 BCC |L10.32|
|L10.50|
000030 d3f6 BCC |L11.32|
|L11.50|
;;;462 }
;;;463 }
;;;464
;;;465 if(flag == 0) // 轮询没有该ID，需要保存
000032 2d00 CMP r5,#0
000034 d107 BNE |L10.70|
000034 d107 BNE |L11.70|
;;;466 {
;;;467 for(j = 0; j < ST_TP_SCAN_POINT_NUMBER_MAX; j++) //寻找空位
000036 2200 MOVS r2,#0
|L10.56|
|L11.56|
;;;468 {
;;;469 if(tp_scan_data.tp_point_buffer[j] == 0x00)
000038 5cb1 LDRB r1,[r6,r2]
00003a 2900 CMP r1,#0
00003c d006 BEQ |L10.76|
00003c d006 BEQ |L11.76|
00003e 1c52 ADDS r2,r2,#1 ;467
000040 b2d2 UXTB r2,r2 ;467
000042 2a06 CMP r2,#6 ;467
000044 d3f8 BCC |L10.56|
|L10.70|
000044 d3f8 BCC |L11.56|
|L11.70|
;;;470 {
;;;471 tp_scan_data.tp_point_buffer[j] = eventid;
;;;472 tp_scan_data.tp_read_point_counter++;
@ -804,27 +828,27 @@
;;;479
;;;480 if(eventdata == 0x33 && (tp_scan_data.tp_read_point_counter > 0)) // 释放事件
000046 2c33 CMP r4,#0x33
000048 d005 BEQ |L10.86|
00004a e019 B |L10.128|
|L10.76|
000048 d005 BEQ |L11.86|
00004a e019 B |L11.128|
|L11.76|
00004c 54b3 STRB r3,[r6,r2] ;471
00004e 79b2 LDRB r2,[r6,#6] ;472 ; tp_scan_data
000050 1c52 ADDS r2,r2,#1 ;472
000052 71b2 STRB r2,[r6,#6] ;472
000054 e7f7 B |L10.70|
|L10.86|
000054 e7f7 B |L11.70|
|L11.86|
000056 79b2 LDRB r2,[r6,#6] ; tp_scan_data
000058 2a00 CMP r2,#0
00005a d011 BEQ |L10.128|
00005a d011 BEQ |L11.128|
;;;481 {
;;;482 for(j = 0; j < ST_TP_SCAN_POINT_NUMBER_MAX; j++)
00005c 2200 MOVS r2,#0
|L10.94|
|L11.94|
;;;483 {
;;;484 if(tp_scan_data.tp_point_buffer[j] == eventid) // 有该事件需要释放
00005e 5cb1 LDRB r1,[r6,r2]
000060 4299 CMP r1,r3
000062 d105 BNE |L10.112|
000062 d105 BNE |L11.112|
;;;485 {
;;;486 tp_scan_data.tp_point_buffer[j] = 0;
000064 2300 MOVS r3,#0
@ -834,13 +858,13 @@
00006a 1e52 SUBS r2,r2,#1
00006c 71b2 STRB r2,[r6,#6]
;;;488 break;
00006e e003 B |L10.120|
|L10.112|
00006e e003 B |L11.120|
|L11.112|
000070 1c52 ADDS r2,r2,#1 ;482
000072 b2d2 UXTB r2,r2 ;482
000074 2a06 CMP r2,#6 ;482
000076 d3f2 BCC |L10.94|
|L10.120|
000076 d3f2 BCC |L11.94|
|L11.120|
;;;489 }
;;;490 }
;;;491
@ -850,12 +874,12 @@
;;;493 tp_scan_data.tp_point_error_time_counter = 0;
00007c 2100 MOVS r1,#0
00007e 60b1 STR r1,[r6,#8] ; tp_scan_data
|L10.128|
|L11.128|
;;;494 }
;;;495
;;;496 if(eventdata == 0x23) // 移动MOVE事件
000080 2c23 CMP r4,#0x23
000082 d103 BNE |L10.140|
000082 d103 BNE |L11.140|
;;;497 {
;;;498 tp_scan_data.tp_point_up_error_flag = 1;
000084 2101 MOVS r1,#1
@ -863,12 +887,12 @@
;;;499 tp_scan_data.tp_point_error_time_counter = 0;
000088 2100 MOVS r1,#0
00008a 60b1 STR r1,[r6,#8] ; tp_scan_data
|L10.140|
|L11.140|
00008c 1c7f ADDS r7,r7,#1 ;448
00008e b2f9 UXTB r1,r7 ;448
|L10.144|
|L11.144|
000090 4561 CMP r1,r12 ;448
000092 d3bb BCC |L10.12|
000092 d3bb BCC |L11.12|
;;;500 }
;;;501 }
;;;502 }
@ -877,7 +901,7 @@
ENDP
000096 0000 DCW 0x0000
|L10.152|
|L11.152|
DCD ||.bss||
AREA ||i.ap_tp_st_touch_scan_point_record_event_exec||, CODE, READONLY, ALIGN=2
@ -888,21 +912,21 @@
000000 b510 PUSH {r4,lr}
;;;513 {
;;;514 if(tp_scan_data.tp_point_up_error_flag == 1)
000002 490a LDR r1,|L11.44|
000002 490a LDR r1,|L12.44|
000004 79c8 LDRB r0,[r1,#7] ; tp_scan_data
000006 2801 CMP r0,#1
000008 d105 BNE |L11.22|
000008 d105 BNE |L12.22|
;;;515 {
;;;516 if(tp_scan_data.tp_point_error_time_counter < (65536 / 10)) // 65536*3 = 900ms 65536/10 = 30ms
00000a 4a09 LDR r2,|L11.48|
00000a 4a09 LDR r2,|L12.48|
00000c 6888 LDR r0,[r1,#8] ; tp_scan_data
00000e 4290 CMP r0,r2
000010 d202 BCS |L11.24|
000010 d202 BCS |L12.24|
;;;517 {
;;;518 tp_scan_data.tp_point_error_time_counter ++;
000012 1c40 ADDS r0,r0,#1
000014 6088 STR r0,[r1,#8] ; tp_scan_data
|L11.22|
|L12.22|
;;;519 }
;;;520 else // 没有收到move 或者release 时间超时
;;;521 {
@ -917,22 +941,22 @@
;;;530 }
;;;531 }
000016 bd10 POP {r4,pc}
|L11.24|
|L12.24|
000018 7988 LDRB r0,[r1,#6] ;522 ; tp_scan_data
00001a 2800 CMP r0,#0 ;522
00001c d003 BEQ |L11.38|
00001c d003 BEQ |L12.38|
00001e 2000 MOVS r0,#0 ;525
000020 7188 STRB r0,[r1,#6] ;525
000022 f7fffffe BL ap_tp_st_touch_simulate_finger_release_event
|L11.38|
|L12.38|
000026 f7fffffe BL ap_tp_st_touch_scan_point_init
00002a bd10 POP {r4,pc}
;;;532
ENDP
|L11.44|
|L12.44|
DCD ||.bss||
|L11.48|
|L12.48|
DCD 0x00001999
AREA ||i.ap_tp_st_touch_simulate_finger_release_event||, CODE, READONLY, ALIGN=2
@ -943,14 +967,14 @@
000000 b51c PUSH {r2-r4,lr}
;;;358 {
;;;359 uint8_t i, temp = 0, ap_tp_release_buf[8] = {0x33, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
000002 a00a ADR r0,|L12.44|
000002 a00a ADR r0,|L13.44|
000004 c803 LDM r0,{r0,r1}
000006 9101 STR r1,[sp,#4]
000008 9000 STR r0,[sp,#0]
;;;360
;;;361 for(i = 0; i < 5; i++)
00000a 2400 MOVS r4,#0
|L12.12|
|L13.12|
;;;362 {
;;;363 temp = i;
;;;364 ap_tp_release_buf[1] = (temp << 4) | 0x01;
@ -970,14 +994,14 @@
000022 1c64 ADDS r4,r4,#1 ;361
000024 b2e4 UXTB r4,r4 ;361
000026 2c05 CMP r4,#5 ;361
000028 d3f0 BCC |L12.12|
000028 d3f0 BCC |L13.12|
;;;369 }
;;;370 }
00002a bd1c POP {r2-r4,pc}
;;;371
ENDP
|L12.44|
|L13.44|
00002c 330100 DCB "3",1,0
00002f 00 DCB 0
000030 00 DCB 0
@ -995,8 +1019,8 @@
;;;382 TAU_LOGD("st_touch_software_reset \n");
000002 22ff MOVS r2,#0xff
000004 327f ADDS r2,r2,#0x7f
000006 a11c ADR r1,|L13.120|
000008 a01d ADR r0,|L13.128|
000006 a11c ADR r1,|L14.120|
000008 a01d ADR r0,|L14.128|
00000a f7fffffe BL LOG_printf
;;;383 ap_tp_st_touch_simulate_finger_release_event();
00000e f7fffffe BL ap_tp_st_touch_simulate_finger_release_event
@ -1005,55 +1029,55 @@
;;;385
;;;386 app_tp_m_write(st_touch_tp_tuning_clkreset, sizeof(st_touch_tp_tuning_clkreset)); // clk reset
000016 2103 MOVS r1,#3
000018 4823 LDR r0,|L13.168|
000018 4823 LDR r0,|L14.168|
00001a f7fffffe BL app_tp_m_write
|L13.30|
|L14.30|
;;;387 while(!hal_i2c_m_transfer_complate());
00001e f7fffffe BL hal_i2c_m_transfer_complate
000022 2800 CMP r0,#0
000024 d0fb BEQ |L13.30|
000024 d0fb BEQ |L14.30|
;;;388 delayMs(5);
000026 2005 MOVS r0,#5
000028 f7fffffe BL delayMs
;;;389
;;;390 app_tp_m_write(st_touch_tp_tuning_reset, sizeof(st_touch_tp_tuning_reset)); // System Reset A4 00 00
00002c 481e LDR r0,|L13.168|
00002c 481e LDR r0,|L14.168|
00002e 2103 MOVS r1,#3
000030 3815 SUBS r0,r0,#0x15
000032 f7fffffe BL app_tp_m_write
|L13.54|
|L14.54|
;;;391 while(!hal_i2c_m_transfer_complate());
000036 f7fffffe BL hal_i2c_m_transfer_complate
00003a 2800 CMP r0,#0
00003c d0fb BEQ |L13.54|
00003c d0fb BEQ |L14.54|
;;;392 delayMs(5);
00003e 2005 MOVS r0,#5
000040 f7fffffe BL delayMs
;;;393
;;;394 app_tp_m_write(st_touch_tp_tuning_clearfifo, sizeof(st_touch_tp_tuning_clearfifo));//0xA4,0x00,0x01
000044 4818 LDR r0,|L13.168|
000044 4818 LDR r0,|L14.168|
000046 2103 MOVS r1,#3
000048 1ec0 SUBS r0,r0,#3
00004a f7fffffe BL app_tp_m_write
|L13.78|
|L14.78|
;;;395 while(!hal_i2c_m_transfer_complate());
00004e f7fffffe BL hal_i2c_m_transfer_complate
000052 2800 CMP r0,#0
000054 d0fb BEQ |L13.78|
000054 d0fb BEQ |L14.78|
;;;396 delayMs(5);
000056 2005 MOVS r0,#5
000058 f7fffffe BL delayMs
;;;397
;;;398 app_tp_m_write(st_touch_init_sensor_on, sizeof(st_touch_init_sensor_on));//0xA0,0x00,0x01
00005c 4812 LDR r0,|L13.168|
00005c 4812 LDR r0,|L14.168|
00005e 2103 MOVS r1,#3
000060 3818 SUBS r0,r0,#0x18
000062 f7fffffe BL app_tp_m_write
|L13.102|
|L14.102|
;;;399 while(!hal_i2c_m_transfer_complate());
000066 f7fffffe BL hal_i2c_m_transfer_complate
00006a 2800 CMP r0,#0
00006c d0fb BEQ |L13.102|
00006c d0fb BEQ |L14.102|
;;;400 delayMs(5);
00006e 2005 MOVS r0,#5
000070 f7fffffe BL delayMs
@ -1065,10 +1089,10 @@
ENDP
000076 0000 DCW 0x0000
|L13.120|
|L14.120|
000078 7461755f DCB "tau_log",0
00007c 6c6f6700
|L13.128|
|L14.128|
000080 5b25735d DCB "[%s] (%04d) st_touch_software_reset \n",0
000084 20282530
000088 34642920
@ -1081,7 +1105,7 @@
0000a4 0a00
0000a6 00 DCB 0
0000a7 00 DCB 0
|L13.168|
|L14.168|
DCD ||.data||+0x1d
AREA ||i.app_tp_calibration_exec||, CODE, READONLY, ALIGN=2
@ -1095,10 +1119,10 @@
000002 2400 MOVS r4,#0
;;;305
;;;306 if(s_calibration_flag)
000004 4d12 LDR r5,|L14.80|
000004 4d12 LDR r5,|L15.80|
000006 7828 LDRB r0,[r5,#0] ; s_calibration_flag
000008 2800 CMP r0,#0
00000a d018 BEQ |L14.62|
00000a d018 BEQ |L15.62|
;;;307 {
;;;308 s_calibration_flag = false;
00000c 2000 MOVS r0,#0
@ -1120,46 +1144,46 @@
000012 27ff MOVS r7,#0xff
000014 0176 LSLS r6,r6,#5 ;312
000016 3742 ADDS r7,r7,#0x42
|L14.24|
|L15.24|
000018 f7fffffe BL ap_tp_st_touch_calibration
00001c 4630 MOV r0,r6 ;312
00001e f7fffffe BL delayMs
000022 f7fffffe BL ap_tp_st_touch_get_calibration_success_mark
000026 7868 LDRB r0,[r5,#1] ;314 ; s_calibration_correct_flag
000028 285a CMP r0,#0x5a ;314
00002a d009 BEQ |L14.64|
00002a d009 BEQ |L15.64|
00002c 463a MOV r2,r7
00002e a109 ADR r1,|L14.84|
000030 a00a ADR r0,|L14.92|
00002e a109 ADR r1,|L15.84|
000030 a00a ADR r0,|L15.92|
000032 f7fffffe BL LOG_printf
000036 1c64 ADDS r4,r4,#1 ;309
000038 b2e4 UXTB r4,r4 ;309
00003a 2c03 CMP r4,#3 ;309
00003c d3ec BCC |L14.24|
|L14.62|
00003c d3ec BCC |L15.24|
|L15.62|
;;;322 }
;;;323 }
;;;324
;;;325 }
;;;326 }
00003e bdf8 POP {r3-r7,pc}
|L14.64|
|L15.64|
000040 22ff MOVS r2,#0xff ;316
000042 323d ADDS r2,r2,#0x3d ;316
000044 a103 ADR r1,|L14.84|
000046 a00e ADR r0,|L14.128|
000044 a103 ADR r1,|L15.84|
000046 a00e ADR r0,|L15.128|
000048 f7fffffe BL LOG_printf
00004c bdf8 POP {r3-r7,pc}
;;;327
ENDP
00004e 0000 DCW 0x0000
|L14.80|
|L15.80|
DCD ||.data||
|L14.84|
|L15.84|
000054 7461755f DCB "tau_log",0
000058 6c6f6700
|L14.92|
|L15.92|
00005c 5b25735d DCB "[%s] (%04d) calibration failure \n",0
000060 20282530
000064 34642920
@ -1171,7 +1195,7 @@
00007c 0a00
00007e 00 DCB 0
00007f 00 DCB 0
|L14.128|
|L15.128|
000080 5b25735d DCB "[%s] (%04d) calibration successful \n",0
000084 20282530
000088 34642920
@ -1245,7 +1269,7 @@
AREA ||.rev16_text||, CODE
THUMB
EXPORT |__asm___17_app_tp_st_touch_c_377841ef____REV16|
#line 467 "C:\\Users\\55\\AppData\\Local\\Arm\\Packs\\ARM\\CMSIS\\5.5.1\\CMSIS\\Core\\Include\\cmsis_armcc.h"
#line 467 "C:\\Keil_v5\\ARM\\PACK\\ARM\\CMSIS\\5.5.1\\CMSIS\\Core\\Include\\cmsis_armcc.h"
|__asm___17_app_tp_st_touch_c_377841ef____REV16| PROC
#line 468

1158
project/ISP_568T/Listings/app_tp_transfer.txt
View File

File diff suppressed because it is too large Load Diff

4
project/ISP_568T/Listings/board.txt
View File

@ -1,5 +1,5 @@
; generated by Component: ARM Compiler 5.06 update 6 (build 750) Tool: ArmCC [4d3637]
; commandline ArmCC [--c99 --list --split_sections --debug -c --asm --interleave --gnu -o.\objects\board.o --asm_dir=.\Listings\ --list_dir=.\Listings\ --depend=.\objects\board.d --cpu=Cortex-M0 --apcs=interwork -O1 --diag_suppress=9931 -I..\..\src -I..\..\src\board -I..\..\src\common -I..\..\src\sdk\include -I..\..\src\app\demo -I..\..\src\sdk\include\M0 -I..\..\src\app -I..\..\src\app\module_demo -I..\..\src\app\touch -I..\..\src\app\S8 -I..\..\src\app\S9 -I..\CVWL568 -I..\..\src\app\s21p -I.\RTE\_ISP_568T -IC:\Users\55\AppData\Local\Arm\Packs\ARM\CMSIS\5.5.1\CMSIS\Core\Include -IC:\Users\55\AppData\Local\Arm\Packs\ARM\CMSIS\5.5.1\Device\ARM\ARMCM0\Include -D__MICROLIB -D__UVISION_VERSION=528 -D_RTE_ -DARMCM0 -DISP_568 --omf_browse=.\objects\board.crf ..\..\src\board\board.c]
; commandline ArmCC [--c99 --list --split_sections --debug -c --asm --interleave --gnu -o.\objects\board.o --asm_dir=.\Listings\ --list_dir=.\Listings\ --depend=.\objects\board.d --cpu=Cortex-M0 --apcs=interwork -O1 --diag_suppress=9931 -I..\..\src -I..\..\src\board -I..\..\src\common -I..\..\src\sdk\include -I..\..\src\app\demo -I..\..\src\sdk\include\M0 -I..\..\src\app -I..\..\src\app\module_demo -I..\..\src\app\touch -I..\..\src\app\S8 -I..\..\src\app\S9 -I..\CVWL568 -I..\..\src\app\s21p -I.\RTE\_ISP_568T -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.5.1\CMSIS\Core\Include -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.5.1\Device\ARM\ARMCM0\Include -D__MICROLIB -D__UVISION_VERSION=528 -D_RTE_ -DARMCM0 -DISP_568 --omf_browse=.\objects\board.crf ..\..\src\board\board.c]
THUMB
AREA ||i.board_Init||, CODE, READONLY, ALIGN=2
@ -42,7 +42,7 @@
AREA ||.rev16_text||, CODE
THUMB
EXPORT |__asm___7_board_c_bcd01269____REV16|
#line 467 "C:\\Users\\55\\AppData\\Local\\Arm\\Packs\\ARM\\CMSIS\\5.5.1\\CMSIS\\Core\\Include\\cmsis_armcc.h"
#line 467 "C:\\Keil_v5\\ARM\\PACK\\ARM\\CMSIS\\5.5.1\\CMSIS\\Core\\Include\\cmsis_armcc.h"
|__asm___7_board_c_bcd01269____REV16| PROC
#line 468

4
project/ISP_568T/Listings/main.txt
View File

@ -1,5 +1,5 @@
; generated by Component: ARM Compiler 5.06 update 6 (build 750) Tool: ArmCC [4d3637]
; commandline ArmCC [--c99 --list --split_sections --debug -c --asm --interleave --gnu -o.\objects\main.o --asm_dir=.\Listings\ --list_dir=.\Listings\ --depend=.\objects\main.d --cpu=Cortex-M0 --apcs=interwork -O1 --diag_suppress=9931 -I..\..\src -I..\..\src\board -I..\..\src\common -I..\..\src\sdk\include -I..\..\src\app\demo -I..\..\src\sdk\include\M0 -I..\..\src\app -I..\..\src\app\module_demo -I..\..\src\app\touch -I..\..\src\app\S8 -I..\..\src\app\S9 -I..\CVWL568 -I..\..\src\app\s21p -I.\RTE\_ISP_568T -IC:\Users\55\AppData\Local\Arm\Packs\ARM\CMSIS\5.5.1\CMSIS\Core\Include -IC:\Users\55\AppData\Local\Arm\Packs\ARM\CMSIS\5.5.1\Device\ARM\ARMCM0\Include -D__MICROLIB -D__UVISION_VERSION=528 -D_RTE_ -DARMCM0 -DISP_568 --omf_browse=.\objects\main.crf ..\..\src\app\main.c]
; commandline ArmCC [--c99 --list --split_sections --debug -c --asm --interleave --gnu -o.\objects\main.o --asm_dir=.\Listings\ --list_dir=.\Listings\ --depend=.\objects\main.d --cpu=Cortex-M0 --apcs=interwork -O1 --diag_suppress=9931 -I..\..\src -I..\..\src\board -I..\..\src\common -I..\..\src\sdk\include -I..\..\src\app\demo -I..\..\src\sdk\include\M0 -I..\..\src\app -I..\..\src\app\module_demo -I..\..\src\app\touch -I..\..\src\app\S8 -I..\..\src\app\S9 -I..\CVWL568 -I..\..\src\app\s21p -I.\RTE\_ISP_568T -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.5.1\CMSIS\Core\Include -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.5.1\Device\ARM\ARMCM0\Include -D__MICROLIB -D__UVISION_VERSION=528 -D_RTE_ -DARMCM0 -DISP_568 --omf_browse=.\objects\main.crf ..\..\src\app\main.c]
THUMB
AREA ||i.main||, CODE, READONLY, ALIGN=1
@ -73,7 +73,7 @@
AREA ||.rev16_text||, CODE
THUMB
EXPORT |__asm___6_main_c_main____REV16|
#line 467 "C:\\Users\\55\\AppData\\Local\\Arm\\Packs\\ARM\\CMSIS\\5.5.1\\CMSIS\\Core\\Include\\cmsis_armcc.h"
#line 467 "C:\\Keil_v5\\ARM\\PACK\\ARM\\CMSIS\\5.5.1\\CMSIS\\Core\\Include\\cmsis_armcc.h"
|__asm___6_main_c_main____REV16| PROC
#line 468

16525
project/ISP_568T/Listings/s21p_demo.txt
View File

File diff suppressed because it is too large Load Diff

BIN
project/ISP_568T/Objects/ISP_568T_S21P_20230511.bin
View File

Binary file not shown.

BIN
project/ISP_568T/Objects/ISP_568T_S21P_20230517.bin
View File

Binary file not shown.

BIN
project/ISP_568T/Objects/ISP_568T_S21P_20230628.bin
View File

Binary file not shown.

BIN
project/ISP_568T/Objects/ISP_568T_S21P_20230817.bin Normal file
View File

Binary file not shown.

BIN
project/ISP_568T/Objects/ISP_568T_S21P_20230818.bin Normal file
View File

Binary file not shown.

BIN
project/ISP_568T/Objects/ISP_568T_S21P_20230821.bin Normal file
View File

Binary file not shown.

BIN
project/ISP_568T/Objects/ISP_568T_S21P_20230823-0.295-0.315 ——700.bin Normal file
View File

Binary file not shown.

BIN
project/ISP_568T/Objects/ISP_568T_S21P_20230823_550.bin Normal file
View File

Binary file not shown.

BIN
project/ISP_568T/Objects/ISP_568T_S21P_20230823_600.bin Normal file
View File

Binary file not shown.

BIN
project/ISP_568T/Objects/ISP_568T_S21P_20230823_650.bin Normal file
View File

Binary file not shown.

BIN
project/ISP_568T/Objects/ISP_568T_S21P_20230825.bin Normal file
View File

Binary file not shown.

BIN
project/ISP_568T/Objects/ISP_568T_S21P_20240527.bin Normal file
View File

Binary file not shown.

1603
src/app/s21p/S21P_demo.c
View File

File diff suppressed because it is too large Load Diff

66
src/app/s21p/app_tp_for_custom_s21p.c
View File

@ -154,11 +154,14 @@ typedef struct
uint8_t reg_60_11[16]; // FTS_REG_FW_VER
uint8_t reg_60_12[16]; // FTS_REG_FW_VER
uint8_t reg_60_13[16]; // FTS_REG_FW_VER
uint8_t reg_60_14[16]; // FTS_REG_FW_VER
uint8_t reg_60_1_0[16]; // FTS_REG_FW_VER
uint8_t reg_60_1_1[16]; // FTS_REG_FW_VER
uint8_t reg_60_1_2[16]; // FTS_REG_FW_VER
uint8_t reg_61_0[16]; // FTS_REG_FW_VER
uint8_t reg_61_1[16]; // FTS_REG_FW_VER
uint8_t reg_61_2[16]; // FTS_REG_FW_VER
uint8_t reg_61_3[16]; // FTS_REG_FW_VER
uint8_t reg_22[5]; // FTS_REG_FW_VER
uint8_t reg_21[1]; // FTS_REG_FW_VER
@ -189,7 +192,7 @@ SAMSUNG_s21p_str SAMSUNG_s21p =
.D60_count = 0x00,
.D85_count = 0x00,
.D92_count = 0x00,
.reg_60_0 = { 0x09, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
.reg_60_0 = { 0x09, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
.reg_60_1 = { 0x1D, 0x61, 0x02, 0x02, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
.reg_60_2 = { 0x1D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
.reg_60_3 = { 0x1D, 0x6F, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
@ -203,6 +206,7 @@ SAMSUNG_s21p_str SAMSUNG_s21p =
.reg_60_11 = { 0x1D, 0x61, 0x03, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
.reg_60_12 = { 0x1D, 0x6B, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
.reg_60_13 = { 0x1D, 0x6F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
.reg_60_14 = { 0x1D, 0x61, 0x05, 0x02, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
.reg_60_1_0 = { 0x1D, 0x61, 0x02, 0x02, 0x05, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
.reg_60_1_1 = { 0x1D, 0x6B, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
@ -211,12 +215,15 @@ SAMSUNG_s21p_str SAMSUNG_s21p =
.reg_61_0 = { 0x1D, 0x20, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
.reg_61_1 = { 0x1D, 0x61, 0x06, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
.reg_61_2 = { 0x1D, 0x6B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
.reg_61_3 = { 0x1D, 0x59, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
.reg_22 = { 0x53, 0x45, 0x37, 0x92, 0x00},
.reg_21 = { 0x80},
.reg_55 = { 0x20},
.reg_af = { 0x00, 0x03, 0x01, 0x00},
.reg_af = { 0x00, 0x02, 0x01, 0x02},
.reg_f1 = { 0x05, 0x05, 0x00, 0xA2},
.reg_a5 = { 0x28, 0x19, 0x01, 0x30},
.reg_a5 = { 0x28, 0x19, 0x01, 0x31},
.reg_a3 = { 0x28, 0x19, 0x01, 0x00},
.reg_a4 = { 0x28, 0x19, 0x01, 0x02},
.reg_52 = { 0xAC, 0x37, 0x71},
@ -294,6 +301,10 @@ uint8_t g_screen_tp_reg_43_software_reset_flag = false;
bool g_screen_tp_init_start = false;
bool g_screen_tp_init_restart = false;
bool g_tp_sleep_in = false;
bool g_ap_tp_init_done = false;
uint8_t g_ap_tp_init_E4 = false; // false 无 1 E4 00 2 E4 01
uint8_t g_tp_wakeup = false;
uint8_t g_tp_sleep_delay_count = 0;
@ -521,6 +532,7 @@ uint8_t app_tp_screen_analysis_int(uint8_t transfer_now, uint8_t *rxbuffer, size
{
uint8_t touch_number = 0;
uint8_t ii = 0,ss = 0;
uint8_t touch_event_flag = 0; // 触摸事件统计
phone_reg_coord_BUF_NUM = data_size/8;
@ -545,7 +557,8 @@ uint8_t app_tp_screen_analysis_int(uint8_t transfer_now, uint8_t *rxbuffer, size
Touch.Event_Single_Flag = 1;
// phone_reg_coord_BUF_NUM = 0;
// TAU_LOGD("TP [%d]\n", g_tp_sleep_in);
// TAU_LOGD("TP [%d]\n", g_tp_sleep_in);
// TAU_LOGD("TP [%d]\n", g_ap_tp_init_done);
if (g_tp_sleep_in == false)
{
@ -560,6 +573,10 @@ uint8_t app_tp_screen_analysis_int(uint8_t transfer_now, uint8_t *rxbuffer, size
if (touch_id >= Touch_MAX_Point)continue; //判断手指编号是否超出范围
touch_event_id = phone_reg_coord_back_BUF[ss][0] >> 4;//触摸事件
if(touch_event_id > 0 && touch_event_id < 4) // bit4-bit7：0x1:按下事件;0x2:移动事件;0x3:松开事件;
{
touch_event_flag++;
}
// if((touch_event_id == 0x01)||(touch_event_id == 0x02)) // 按下事件 // 移动事件
// {
//
@ -613,7 +630,7 @@ uint8_t app_tp_screen_analysis_int(uint8_t transfer_now, uint8_t *rxbuffer, size
s1++;
}
SAMSUNG_s21p.Touch_ON[0] = 1;
if(g_ap_tp_init_done && touch_event_flag > 0) // 有触摸事件才报点
hal_gpio_set_output_data(g_phone_output_int_pad, IO_LVL_LOW); //拉低TP中断脚,通知AP读取TP数据
Touch.Event_Single_Flag = 0;
}
@ -701,6 +718,11 @@ void app_tp_phone_analysis_data(uint8_t *rxbuffer, size_t rxbuffer_size, const u
{
*txbuffer = SAMSUNG_s21p.reg_60_5;
*txbuffer_size = sizeof(SAMSUNG_s21p.reg_60_5);
if(g_ap_tp_init_E4)
{
g_ap_tp_init_E4 = 0;
hal_gpio_set_output_data(g_phone_output_int_pad, IO_LVL_HIGH);
}
}
else if (SAMSUNG_s21p.D60_count == 6)
{
@ -755,6 +777,12 @@ void app_tp_phone_analysis_data(uint8_t *rxbuffer, size_t rxbuffer_size, const u
*txbuffer = SAMSUNG_s21p.reg_60_13;
*txbuffer_size = sizeof(SAMSUNG_s21p.reg_60_13);
SAMSUNG_s21p.D60_count = 1;
}
else if (SAMSUNG_s21p.D60_count == 15)
{
*txbuffer = SAMSUNG_s21p.reg_60_14;
*txbuffer_size = sizeof(SAMSUNG_s21p.reg_60_14);
SAMSUNG_s21p.D60_count = 1;
}
}
}
@ -769,11 +797,25 @@ void app_tp_phone_analysis_data(uint8_t *rxbuffer, size_t rxbuffer_size, const u
*txbuffer_size = sizeof(phone_reg_coord_back_X61) - 16;
}
else
{
hal_gpio_set_output_data(g_phone_output_int_pad, IO_LVL_HIGH);
if(g_ap_tp_init_E4 == 1)
{
*txbuffer = SAMSUNG_s21p.reg_61_3;
*txbuffer_size = sizeof(SAMSUNG_s21p.reg_61_3);
}
else if(g_ap_tp_init_E4 == 2)
{
*txbuffer = SAMSUNG_s21p.reg_61_2;
*txbuffer_size = sizeof(SAMSUNG_s21p.reg_61_2);
}
else
{
*txbuffer = SAMSUNG_s21p.reg_61_0;
*txbuffer_size = sizeof(SAMSUNG_s21p.reg_61_0);
}
}
}
break;
case 0x22:
{
@ -938,12 +980,22 @@ void app_tp_phone_analysis_data(uint8_t *rxbuffer, size_t rxbuffer_size, const u
case 0xE4:
{
// g_tp_sleep_in = false; // 退出息屏状态
g_ap_tp_init_done = true;
if (rxbuffer_size == 2)
{
if(rxbuffer[1] == 0x00)
SAMSUNG_s21p.D60_count = 7;
{
g_ap_tp_init_E4 = 1;
SAMSUNG_s21p.D60_count = 0;
hal_gpio_set_output_data(g_phone_output_int_pad, IO_LVL_LOW);
}
else if(rxbuffer[1] == 0x01)
SAMSUNG_s21p.D60_count = 8;
{
g_ap_tp_init_E4 = 2;
SAMSUNG_s21p.D60_count = 15;
hal_gpio_set_output_data(g_phone_output_int_pad, IO_LVL_LOW);
}
}
else
{

39
src/app/s21p/demo_version.txt
View File

@ -16,6 +16,45 @@
CX_ISP568_S20P_NT37701AH_VSN667_20230316; 创信项目
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
ISP568T_S21P_3511_20240527
1、机板升级到安卓14.6.1后无触。
/////////////////////////////////////////////////////////////////////////////////
ISP568T_S21P_3511_20230824
1、更新gamma.
/////////////////////////////////////////////////////////////////////////////////
ISP568T_S21P_3511_20230818
1、更新gamma.
/////////////////////////////////////////////////////////////////////////////////
ISP568T_S21P_3511_20230815
1、解决部分基板唤醒120hz卡顿问题：复位后需要重置 frame_rate 数值。使得可以切换帧率
2、解决部分基板开机丢失第一个logo问题。
/////////////////////////////////////////////////////////////////////////////////
ISP568T_S21P_3511_20230707
1、解决部分基板开机有触，唤醒无触问题
/////////////////////////////////////////////////////////////////////////////////
ISP568T_S21P_3511_20230508

20
src/app/touch/app_tp_st_touch.c
View File

@ -541,9 +541,11 @@ void ap_tp_st_touch_scan_point_record_event_exec(void)
void ap_tp_st_touch_error_handler_F3(uint8_t* screendata)
{
// 收到 TP 异常回复 0xF3 0x02 0x00 0x00 0x00 0x00 0x00 0x00
if(screendata[0] == 0xF3 && screendata[1] == 0x02 && screendata[2] == 0x00)
// if(screendata[0] == 0xF3 && screendata[1] == 0x02 && screendata[2] == 0x00)
if(screendata[0] == 0xF3)
{
ap_tp_st_touch_software_reset();
// ap_tp_st_touch_software_reset();
ap_tp_st_touch_hardware_reset();
}
// if(screendata[0] == 0xF3 && screendata[1] == 0x91 && screendata[2] == 0x00)
@ -565,7 +567,19 @@ void ap_tp_st_touch_error_handler_FF(uint8_t* screendata)
// 收到 TP 异常回复 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF
if(screendata[1] == 0xFF && screendata[2] == 0xFF && screendata[3] == 0xFF && screendata[4] == 0xFF)
{
ap_tp_st_touch_software_reset();
// ap_tp_st_touch_software_reset();
ap_tp_st_touch_hardware_reset();
}
}
void ap_tp_st_touch_error_handler_03(uint8_t* screendata)
{
// ÊÕµ½ TP Òì³£»Ø¸´ 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF
if(screendata[0] == 0x03 && screendata[7] == 0x00)
{
// ap_tp_st_touch_software_reset();
ap_tp_st_touch_hardware_reset();
}
}

1
src/app/touch/app_tp_st_touch.h
View File

@ -165,6 +165,7 @@ void ap_tp_st_touch_error_handler_F3(uint8_t* screendata);
void ap_tp_st_touch_error_handler_FF(uint8_t* screendata);
void ap_tp_st_touch_error_handler_03(uint8_t* screendata);
#endif

41
src/app/touch/app_tp_transfer.c
View File

@ -126,11 +126,19 @@ void app_tp_screen_init(void)
hal_gpio_init_output(g_screen_input_rst_pad, IO_LVL_HIGH);
delayUs(200);
hal_gpio_set_output_data(g_screen_input_rst_pad, IO_LVL_LOW);
delayUs(200);
// delayUs(200);
delayMs(2);
hal_gpio_set_output_data(g_screen_input_rst_pad, IO_LVL_HIGH);
delayUs(400);
}
void app_tp_I2C_init(void)
{
hal_i2c_s_init(CHIP_I2C_ADDRESS, CHIP_I2C_ADDR_BITS);
hal_i2c_s_set_transfer(app_tp_i2cs_callback);
hal_i2c_s_nonblocking_read(s_phone_read_buffer, BUFFER_SIZE_MAX); //<2F><><EFBFBD><EFBFBD><EFBFBD>ý<EFBFBD><C3BD><EFBFBD> buffer
}
/**************************************************************************
* @name : app_tp_init
* @brief : 初始化通信相关
@ -151,9 +159,9 @@ void app_tp_init(void)
#endif
#if PHONE_SLAVE_TRANSFER_I2C
hal_i2c_s_init(CHIP_I2C_ADDRESS, CHIP_I2C_ADDR_BITS);
hal_i2c_s_set_transfer(app_tp_i2cs_callback);
hal_i2c_s_nonblocking_read(s_phone_read_buffer, BUFFER_SIZE_MAX); //先配置接收 buffer
// hal_i2c_s_init(CHIP_I2C_ADDRESS, CHIP_I2C_ADDR_BITS);
// hal_i2c_s_set_transfer(app_tp_i2cs_callback);
// hal_i2c_s_nonblocking_read(s_phone_read_buffer, BUFFER_SIZE_MAX); //先配置接收 buffer
#elif PHONE_SLAVE_TRANSFER_SPI
hal_spi_slave_init(PHONE_SPI_CPHA, PHONE_SPI_CPOL, true); // 初始化spi以及dma
hal_spi_slave_register_callback(app_tp_spis_callback); // 注册回调
@ -394,6 +402,7 @@ static void app_tp_transfer_screen_const(void)
if (!screen_reg_start_data[s_screen_const_transfer_count].read_flag) //当前通信不需要读回，直接写
{
app_tp_m_write(screen_reg_start_data[s_screen_const_transfer_count].buffer, screen_reg_start_data[s_screen_const_transfer_count].txbuffer_size);
// delayMs(5);
}
else //当前通信需要读回，先写再读
{
@ -425,11 +434,19 @@ static void app_tp_transfer_screen_const(void)
* @return :
* @retval :
**************************************************************************/
void app_tp_transfer_screen_start(void)
void app_tp_transfer_screen_start_init(void)
{
s_screen_init_complate = false;
s_screen_const_transfer_count = 0;
app_tp_screen_init();
}
void app_tp_transfer_screen_start(void)
{
// s_screen_init_complate = false;
// s_screen_const_transfer_count = 0;
// app_tp_screen_init();
// delayMs(10);
app_tp_transfer_screen_const();
}
@ -451,6 +468,13 @@ void app_tp_transfer_screen_restart(void)
}
void ap_tp_st_touch_get_status(void)
{
app_tp_m_read(screen_reg_int_data[0].buffer, 1, s_screen_read_buffer, 8);
while(!hal_i2c_m_transfer_complate());
}
/**************************************************************************
* @name : app_tp_transfer_screen_int
* @brief : 接收screen中断后，按照flow读写screen，即报点协议转换
@ -518,9 +542,10 @@ void app_tp_transfer_screen_int(void)
}
}
*/
// ap_tp_st_touch_error_handler_F3(s_screen_read_buffer);
// ap_tp_st_touch_error_handler_FF(s_screen_read_buffer);
// ap_tp_st_touch_scan_point_record_event(s_screen_read_buffer, len + 8);
ap_tp_st_touch_error_handler_F3(s_screen_read_buffer);
ap_tp_st_touch_error_handler_FF(s_screen_read_buffer);
ap_tp_st_touch_error_handler_03(s_screen_read_buffer);
ap_tp_st_touch_scan_point_record_event(s_screen_read_buffer, len + 8);
#else

3
src/app/touch/app_tp_transfer.h
View File

@ -188,6 +188,9 @@ bool app_tp_enter_sleep_on(void);
void app_tp_m_write(const uint8_t *txbuffer, size_t buffer_size);
void app_tp_m_read(const uint8_t *cmd, size_t cmd_size, uint8_t *data_buffer, size_t data_size);
void app_tp_I2C_init(void);
void ap_tp_st_touch_get_status(void);
void app_tp_transfer_screen_start_init(void);
#endif