1、解决偶发触摸卡问题：将ST触摸芯片的软件复位全部改成硬件复位。
2、解决唤醒误触发指纹识别问题。 3、增加版本号打印和BIN文件版本
This commit is contained in:
“苏飞源”
parent
cc70bbdebe
commit
5f45bdb4e7
|
|
@ -50,7 +50,7 @@
|
|||
<InvalidFlash>1</InvalidFlash>
|
||||
</TargetStatus>
|
||||
<OutputDirectory>.\Objects\</OutputDirectory>
|
||||
<OutputName>WL568_20P_VSN667</OutputName>
|
||||
<OutputName>WL568_20P_VSN667_V100_20230714</OutputName>
|
||||
<CreateExecutable>1</CreateExecutable>
|
||||
<CreateLib>0</CreateLib>
|
||||
<CreateHexFile>1</CreateHexFile>
|
||||
|
|
@ -459,6 +459,11 @@
|
|||
</FileArmAds>
|
||||
</FileOption>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>ap_demo_version.txt</FileName>
|
||||
<FileType>5</FileType>
|
||||
<FilePath>..\..\src\app\demo\ap_demo_version.txt</FilePath>
|
||||
</File>
|
||||
</Files>
|
||||
</Group>
|
||||
<Group>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -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\ap_demo.o --asm_dir=.\Listings\ --list_dir=.\Listings\ --depend=.\objects\ap_demo.d --cpu=Cortex-M0 --apcs=interwork --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.\RTE\_ISP_568 -IC:\Users\ASUS\AppData\Local\Arm\Packs\ARM\CMSIS\5.5.1\CMSIS\Core\Include -IC:\Users\ASUS\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\ap_demo.crf ..\..\src\app\demo\ap_demo.c]
|
||||
; commandline ArmCC [--c99 --list --split_sections --debug -c --asm --interleave --gnu -o.\objects\ap_demo.o --asm_dir=.\Listings\ --list_dir=.\Listings\ --depend=.\objects\ap_demo.d --cpu=Cortex-M0 --apcs=interwork --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.\RTE\_ISP_568 -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\ap_demo.crf ..\..\src\app\demo\ap_demo.c]
|
||||
THUMB
|
||||
|
||||
AREA ||i.Gpio_swire_output||, CODE, READONLY, ALIGN=2
|
||||
|
|
@ -3035,276 +3035,265 @@
|
|||
ap_demo PROC
|
||||
;;;5393 //static uint32_t loop_count=1;
|
||||
;;;5394 void ap_demo(void)
|
||||
000000 b508 PUSH {r3,lr}
|
||||
000000 2100 MOVS r1,#0
|
||||
;;;5395 {
|
||||
;;;5396 hal_gpio_init_output(IO_PAD_TD_LEDPWM, IO_LVL_LOW);
|
||||
000002 2100 MOVS r1,#0
|
||||
000004 200a MOVS r0,#0xa
|
||||
000006 f7fffffe BL hal_gpio_init_output
|
||||
000002 200a MOVS r0,#0xa
|
||||
000004 f7fffffe BL hal_gpio_init_output
|
||||
;;;5397 hal_gpio_init_output(IO_PAD_PWMEN, IO_LVL_LOW);//LED_ON
|
||||
00000a 2100 MOVS r1,#0
|
||||
00000c 2013 MOVS r0,#0x13
|
||||
00000e f7fffffe BL hal_gpio_init_output
|
||||
000008 2100 MOVS r1,#0
|
||||
00000a 2013 MOVS r0,#0x13
|
||||
00000c f7fffffe BL hal_gpio_init_output
|
||||
;;;5398 hal_gpio_init_output(IO_PAD_AP_SWIRE, IO_LVL_LOW);//IO_LVL_LOW
|
||||
000012 2100 MOVS r1,#0
|
||||
000014 2004 MOVS r0,#4
|
||||
000016 f7fffffe BL hal_gpio_init_output
|
||||
000010 2100 MOVS r1,#0
|
||||
000012 2004 MOVS r0,#4
|
||||
000014 f7fffffe BL hal_gpio_init_output
|
||||
;;;5399 hal_gpio_init_output(IO_PAD_ADCIN, IO_LVL_LOW);//IO_LVL_LOW
|
||||
00001a 2100 MOVS r1,#0
|
||||
00001c 2014 MOVS r0,#0x14
|
||||
00001e f7fffffe BL hal_gpio_init_output
|
||||
000018 2100 MOVS r1,#0
|
||||
00001a 2014 MOVS r0,#0x14
|
||||
00001c f7fffffe BL hal_gpio_init_output
|
||||
;;;5400
|
||||
;;;5401 TAU_LOGD("S20+ 568 CSOT667[%s %s]", __DATE__, __TIME__);
|
||||
000022 a032 ADR r0,|L3.236|
|
||||
000024 9000 STR r0,[sp,#0]
|
||||
000026 a334 ADR r3,|L3.248|
|
||||
000028 4a36 LDR r2,|L3.260|
|
||||
00002a a137 ADR r1,|L3.264|
|
||||
00002c a03a ADR r0,|L3.280|
|
||||
00002e f7fffffe BL LOG_printf
|
||||
;;;5402 /* mipi rx初始化 */
|
||||
;;;5403 app_tp_I2C_init();
|
||||
000032 f7fffffe BL app_tp_I2C_init
|
||||
;;;5404 open_mipi_rx();
|
||||
000036 f7fffffe BL open_mipi_rx
|
||||
;;;5405
|
||||
;;;5406 /* mipi tx 初始化*/
|
||||
;;;5407 init_mipi_tx();
|
||||
00003a f7fffffe BL init_mipi_tx
|
||||
;;;5408
|
||||
;;;5409 /* touch 相关模块初始化 */
|
||||
;;;5410 #ifndef DISPLAY_ONLY
|
||||
;;;5411 app_tp_init();
|
||||
00003e f7fffffe BL app_tp_init
|
||||
;;;5412 phone_86_flag=1;
|
||||
000042 4c3e LDR r4,|L3.316|
|
||||
000044 2501 MOVS r5,#1
|
||||
000046 7165 STRB r5,[r4,#5]
|
||||
;;;5413 phone_A6_flag=1;
|
||||
000048 71a5 STRB r5,[r4,#6]
|
||||
;;;5414 phone_start_flag=0;
|
||||
00004a 2600 MOVS r6,#0
|
||||
;;;5415 #endif
|
||||
;;;5416
|
||||
;;;5417 #ifdef ADD_TIMER3_FUNCTION
|
||||
;;;5418 tp_sleep_count=0;
|
||||
00004c 483c LDR r0,|L3.320|
|
||||
00004e 71e6 STRB r6,[r4,#7] ;5414
|
||||
000050 7006 STRB r6,[r0,#0]
|
||||
;;;5419 phone_DisplayOFF_count=1;
|
||||
000052 8265 STRH r5,[r4,#0x12]
|
||||
;;;5420 hal_timer_init(TIMER_NUM3);
|
||||
000054 2003 MOVS r0,#3
|
||||
000056 f7fffffe BL hal_timer_init
|
||||
;;;5421 hal_timer_start(TIMER_NUM3, 10, soft_timer3_cb, NULL);
|
||||
00005a 2300 MOVS r3,#0
|
||||
00005c 4a39 LDR r2,|L3.324|
|
||||
00005e 210a MOVS r1,#0xa
|
||||
000060 2003 MOVS r0,#3
|
||||
000062 f7fffffe BL hal_timer_start
|
||||
000066 f7fffffe BL init_panel
|
||||
00006a 6aa0 LDR r0,[r4,#0x28] ; g_tx_ctrl_handle
|
||||
00006c f7fffffe BL hal_dsi_tx_ctrl_start
|
||||
;;;5422 #endif
|
||||
;;;5423
|
||||
;;;5424 /* 屏初始化 */
|
||||
;;;5425 tx_display_on();
|
||||
;;;5426 start_display_on = false;
|
||||
000070 7026 STRB r6,[r4,#0]
|
||||
;;;5427 panel_display_done = true;
|
||||
000072 7125 STRB r5,[r4,#4]
|
||||
;;;5428
|
||||
;;;5429 hal_gpio_set_ap_reset_int(ENABLE, ap_reset_cb, DETECT_RISING_EDGE);
|
||||
000074 2202 MOVS r2,#2
|
||||
000076 4934 LDR r1,|L3.328|
|
||||
000078 2001 MOVS r0,#1
|
||||
00007a f7fffffe BL hal_gpio_set_ap_reset_int
|
||||
;;;5430 #ifndef DISPLAY_ONLY
|
||||
;;;5431 app_tp_phone_clear_reset_on();
|
||||
00007e f7fffffe BL app_tp_phone_clear_reset_on
|
||||
;;;5432 #ifndef DISABLE_TDDI_I2C_FUNCTION
|
||||
;;;5433 /* 与屏的TP 模块通讯并初始化 */
|
||||
;;;5434 delayMs(50);
|
||||
000082 2032 MOVS r0,#0x32
|
||||
000084 f7fffffe BL delayMs
|
||||
;;;5435 // printf("tp start begin\n");
|
||||
;;;5436 app_tp_transfer_screen_start();
|
||||
000088 f7fffffe BL app_tp_transfer_screen_start
|
||||
;;;5437 // printf("tp start end\n");
|
||||
;;;5438 #endif
|
||||
;;;5401 // TAU_LOGD("S20+ 568 CSOT667[%s %s]", __DATE__, __TIME__);
|
||||
;;;5402 TAU_LOGD("S20+ VSN667 V100 20230714");
|
||||
000020 4a30 LDR r2,|L3.228|
|
||||
000022 a131 ADR r1,|L3.232|
|
||||
000024 a034 ADR r0,|L3.248|
|
||||
000026 f7fffffe BL LOG_printf
|
||||
;;;5403 /* mipi rx初始化 */
|
||||
;;;5404 app_tp_I2C_init();
|
||||
00002a f7fffffe BL app_tp_I2C_init
|
||||
;;;5405 open_mipi_rx();
|
||||
00002e f7fffffe BL open_mipi_rx
|
||||
;;;5406
|
||||
;;;5407 /* mipi tx 初始化*/
|
||||
;;;5408 init_mipi_tx();
|
||||
000032 f7fffffe BL init_mipi_tx
|
||||
;;;5409
|
||||
;;;5410 /* touch 相关模块初始化 */
|
||||
;;;5411 #ifndef DISPLAY_ONLY
|
||||
;;;5412 app_tp_init();
|
||||
000036 f7fffffe BL app_tp_init
|
||||
;;;5413 phone_86_flag=1;
|
||||
00003a 4c39 LDR r4,|L3.288|
|
||||
00003c 2501 MOVS r5,#1
|
||||
00003e 7165 STRB r5,[r4,#5]
|
||||
;;;5414 phone_A6_flag=1;
|
||||
000040 71a5 STRB r5,[r4,#6]
|
||||
;;;5415 phone_start_flag=0;
|
||||
000042 2600 MOVS r6,#0
|
||||
;;;5416 #endif
|
||||
;;;5417
|
||||
;;;5418 #ifdef ADD_TIMER3_FUNCTION
|
||||
;;;5419 tp_sleep_count=0;
|
||||
000044 4837 LDR r0,|L3.292|
|
||||
000046 71e6 STRB r6,[r4,#7] ;5415
|
||||
000048 7006 STRB r6,[r0,#0]
|
||||
;;;5420 phone_DisplayOFF_count=1;
|
||||
00004a 8265 STRH r5,[r4,#0x12]
|
||||
;;;5421 hal_timer_init(TIMER_NUM3);
|
||||
00004c 2003 MOVS r0,#3
|
||||
00004e f7fffffe BL hal_timer_init
|
||||
;;;5422 hal_timer_start(TIMER_NUM3, 10, soft_timer3_cb, NULL);
|
||||
000052 2300 MOVS r3,#0
|
||||
000054 4a34 LDR r2,|L3.296|
|
||||
000056 210a MOVS r1,#0xa
|
||||
000058 2003 MOVS r0,#3
|
||||
00005a f7fffffe BL hal_timer_start
|
||||
00005e f7fffffe BL init_panel
|
||||
000062 6aa0 LDR r0,[r4,#0x28] ; g_tx_ctrl_handle
|
||||
000064 f7fffffe BL hal_dsi_tx_ctrl_start
|
||||
;;;5423 #endif
|
||||
;;;5424
|
||||
;;;5425 /* 屏初始化 */
|
||||
;;;5426 tx_display_on();
|
||||
;;;5427 start_display_on = false;
|
||||
000068 7026 STRB r6,[r4,#0]
|
||||
;;;5428 panel_display_done = true;
|
||||
00006a 7125 STRB r5,[r4,#4]
|
||||
;;;5429
|
||||
;;;5430 hal_gpio_set_ap_reset_int(ENABLE, ap_reset_cb, DETECT_RISING_EDGE);
|
||||
00006c 2202 MOVS r2,#2
|
||||
00006e 492f LDR r1,|L3.300|
|
||||
000070 2001 MOVS r0,#1
|
||||
000072 f7fffffe BL hal_gpio_set_ap_reset_int
|
||||
;;;5431 #ifndef DISPLAY_ONLY
|
||||
;;;5432 app_tp_phone_clear_reset_on();
|
||||
000076 f7fffffe BL app_tp_phone_clear_reset_on
|
||||
;;;5433 #ifndef DISABLE_TDDI_I2C_FUNCTION
|
||||
;;;5434 /* 与屏的TP 模块通讯并初始化 */
|
||||
;;;5435 delayMs(50);
|
||||
00007a 2032 MOVS r0,#0x32
|
||||
00007c f7fffffe BL delayMs
|
||||
;;;5436 // printf("tp start begin\n");
|
||||
;;;5437 app_tp_transfer_screen_start();
|
||||
000080 f7fffffe BL app_tp_transfer_screen_start
|
||||
;;;5438 // printf("tp start end\n");
|
||||
;;;5439 #endif
|
||||
;;;5440 uint32_t heartbeat = 0;
|
||||
;;;5441 while (1)
|
||||
;;;5442 {
|
||||
;;;5443 if(g_mipi_path_off == false){
|
||||
;;;5444 while (hal_dsi_rx_ctrl_dsc_async_handler(g_rx_ctrl_handle));
|
||||
;;;5445
|
||||
;;;5446 #if 0
|
||||
;;;5447 if ((test_count ==1200))
|
||||
;;;5448 {
|
||||
;;;5449 test_count =0;
|
||||
;;;5450 printf(" tp reset\n");
|
||||
;;;5451 ap_tp_st_touch_software_reset();
|
||||
;;;5452 printf(" tp reset ok\n");
|
||||
;;;5453 }
|
||||
;;;5454 #endif
|
||||
;;;5455
|
||||
;;;5456 #if 0//电话熄屏
|
||||
;;;5457 if (phone_off_flag==0)
|
||||
;;;5458 {
|
||||
;;;5459 if(Flag_blacklight_EN)
|
||||
;;;5460 {
|
||||
;;;5461 phone_off_flag =1;
|
||||
;;;5462 hal_dsi_tx_ctrl_write_cmd(0x39, 0, 2, 0x28, 0x00);
|
||||
;;;5463 }
|
||||
;;;5464 }
|
||||
;;;5465 else
|
||||
;;;5466 {
|
||||
;;;5467 if(Flag_blacklight_EN ==0)
|
||||
;;;5468 {
|
||||
;;;5469 phone_off_flag =0;
|
||||
;;;5470 hal_dsi_tx_ctrl_write_cmd(0x39, 0, 2, 0x29, 0x00);
|
||||
;;;5471 }
|
||||
;;;5472 }
|
||||
;;;5473 #endif
|
||||
;;;5474 }
|
||||
;;;5475
|
||||
;;;5476 if(phone_DisplayOFF_flag==1)
|
||||
;;;5477 {
|
||||
;;;5478 if(phone_DisplayOFF_count>800)
|
||||
00008c 2719 MOVS r7,#0x19
|
||||
00008e 017f LSLS r7,r7,#5
|
||||
|L3.144|
|
||||
000090 78a0 LDRB r0,[r4,#2] ;5443 ; g_mipi_path_off
|
||||
000092 2800 CMP r0,#0 ;5443
|
||||
000094 d104 BNE |L3.160|
|
||||
|L3.150|
|
||||
000096 6a60 LDR r0,[r4,#0x24] ;5444 ; g_rx_ctrl_handle
|
||||
000098 f7fffffe BL hal_dsi_rx_ctrl_dsc_async_handler
|
||||
00009c 2800 CMP r0,#0 ;5444
|
||||
00009e d1fa BNE |L3.150|
|
||||
|L3.160|
|
||||
0000a0 7a20 LDRB r0,[r4,#8] ;5476 ; phone_DisplayOFF_flag
|
||||
0000a2 2801 CMP r0,#1 ;5476
|
||||
;;;5479 {
|
||||
;;;5480 phone_DisplayOFF_count=0;
|
||||
;;;5481 phone_start_flag=1;
|
||||
;;;5482 }
|
||||
;;;5483 }
|
||||
;;;5484 else
|
||||
;;;5485 {
|
||||
;;;5486 if(phone_DisplayOFF_count>20)
|
||||
0000a4 8a60 LDRH r0,[r4,#0x12] ; phone_DisplayOFF_count
|
||||
0000a6 d01b BEQ |L3.224|
|
||||
0000a8 2814 CMP r0,#0x14
|
||||
0000aa d905 BLS |L3.184|
|
||||
;;;5487 {
|
||||
;;;5488 phone_DisplayOFF_count=0;
|
||||
0000ac 8266 STRH r6,[r4,#0x12]
|
||||
;;;5489 phone_start_flag=1;
|
||||
0000ae 71e5 STRB r5,[r4,#7]
|
||||
;;;5490 hal_gpio_set_output_data(IO_PAD_AP_INT, IO_LVL_LOW);//必须拉低，否则待机或者双击唤醒2~3s无触摸.jason_su
|
||||
0000b0 2100 MOVS r1,#0
|
||||
0000b2 2002 MOVS r0,#2
|
||||
0000b4 f7fffffe BL hal_gpio_set_output_data
|
||||
|L3.184|
|
||||
;;;5491 }
|
||||
;;;5492 }
|
||||
;;;5493 app_tp_transfer_screen_int();
|
||||
0000b8 f7fffffe BL app_tp_transfer_screen_int
|
||||
;;;5494
|
||||
;;;5495 tp_heartbeat_exec();
|
||||
0000bc f7fffffe BL tp_heartbeat_exec
|
||||
;;;5496 app_tp_calibration_exec();
|
||||
0000c0 f7fffffe BL app_tp_calibration_exec
|
||||
;;;5497 ap_tp_st_touch_scan_point_record_event_exec();
|
||||
0000c4 f7fffffe BL ap_tp_st_touch_scan_point_record_event_exec
|
||||
;;;5498
|
||||
;;;5499 #ifdef USE_FOR_SUMSUNG_S20PLUS
|
||||
;;;5500 if(phone_start_flag==2)
|
||||
0000c8 79e3 LDRB r3,[r4,#7] ; phone_start_flag
|
||||
0000ca 2b02 CMP r3,#2
|
||||
0000cc d1e0 BNE |L3.144|
|
||||
;;;5501 {
|
||||
;;;5502 TAU_LOGD("s20 start init %d", phone_start_flag);
|
||||
0000ce 4a0d LDR r2,|L3.260|
|
||||
0000d0 a10d ADR r1,|L3.264|
|
||||
0000d2 3265 ADDS r2,r2,#0x65
|
||||
0000d4 a01d ADR r0,|L3.332|
|
||||
0000d6 f7fffffe BL LOG_printf
|
||||
;;;5503 S20_Start_init();
|
||||
0000da f7fffffe BL S20_Start_init
|
||||
0000de e7d7 B |L3.144|
|
||||
|L3.224|
|
||||
0000e0 42b8 CMP r0,r7 ;5478
|
||||
0000e2 d9e9 BLS |L3.184|
|
||||
0000e4 8266 STRH r6,[r4,#0x12] ;5480
|
||||
0000e6 71e5 STRB r5,[r4,#7] ;5481
|
||||
0000e8 e7e6 B |L3.184|
|
||||
;;;5504 }
|
||||
;;;5505 #endif
|
||||
;;;5506 /* if(heartbeat < (65536 * 3)){
|
||||
;;;5507 heartbeat ++;
|
||||
;;;5508 }else{
|
||||
;;;5509 printf("hb\n");
|
||||
;;;5510 heartbeat = 0;
|
||||
;;;5511 }
|
||||
;;;5512 */
|
||||
;;;5513 }
|
||||
;;;5514 }
|
||||
;;;5440 #endif
|
||||
;;;5441 uint32_t heartbeat = 0;
|
||||
;;;5442 while (1)
|
||||
;;;5443 {
|
||||
;;;5444 if(g_mipi_path_off == false){
|
||||
;;;5445 while (hal_dsi_rx_ctrl_dsc_async_handler(g_rx_ctrl_handle));
|
||||
;;;5446
|
||||
;;;5447 #if 0
|
||||
;;;5448 if ((test_count ==1200))
|
||||
;;;5449 {
|
||||
;;;5450 test_count =0;
|
||||
;;;5451 printf(" tp reset\n");
|
||||
;;;5452 ap_tp_st_touch_software_reset();
|
||||
;;;5453 printf(" tp reset ok\n");
|
||||
;;;5454 }
|
||||
;;;5455 #endif
|
||||
;;;5456
|
||||
;;;5457 #if 0//电话熄屏
|
||||
;;;5458 if (phone_off_flag==0)
|
||||
;;;5459 {
|
||||
;;;5460 if(Flag_blacklight_EN)
|
||||
;;;5461 {
|
||||
;;;5462 phone_off_flag =1;
|
||||
;;;5463 hal_dsi_tx_ctrl_write_cmd(0x39, 0, 2, 0x28, 0x00);
|
||||
;;;5464 }
|
||||
;;;5465 }
|
||||
;;;5466 else
|
||||
;;;5467 {
|
||||
;;;5468 if(Flag_blacklight_EN ==0)
|
||||
;;;5469 {
|
||||
;;;5470 phone_off_flag =0;
|
||||
;;;5471 hal_dsi_tx_ctrl_write_cmd(0x39, 0, 2, 0x29, 0x00);
|
||||
;;;5472 }
|
||||
;;;5473 }
|
||||
;;;5474 #endif
|
||||
;;;5475 }
|
||||
;;;5476
|
||||
;;;5477 if(phone_DisplayOFF_flag==1)
|
||||
;;;5478 {
|
||||
;;;5479 if(phone_DisplayOFF_count>800)
|
||||
000084 2719 MOVS r7,#0x19
|
||||
000086 017f LSLS r7,r7,#5
|
||||
|L3.136|
|
||||
000088 78a0 LDRB r0,[r4,#2] ;5444 ; g_mipi_path_off
|
||||
00008a 2800 CMP r0,#0 ;5444
|
||||
00008c d104 BNE |L3.152|
|
||||
|L3.142|
|
||||
00008e 6a60 LDR r0,[r4,#0x24] ;5445 ; g_rx_ctrl_handle
|
||||
000090 f7fffffe BL hal_dsi_rx_ctrl_dsc_async_handler
|
||||
000094 2800 CMP r0,#0 ;5445
|
||||
000096 d1fa BNE |L3.142|
|
||||
|L3.152|
|
||||
000098 7a20 LDRB r0,[r4,#8] ;5477 ; phone_DisplayOFF_flag
|
||||
00009a 2801 CMP r0,#1 ;5477
|
||||
;;;5480 {
|
||||
;;;5481 phone_DisplayOFF_count=0;
|
||||
;;;5482 phone_start_flag=1;
|
||||
;;;5483 }
|
||||
;;;5484 }
|
||||
;;;5485 else
|
||||
;;;5486 {
|
||||
;;;5487 if(phone_DisplayOFF_count>20)
|
||||
00009c 8a60 LDRH r0,[r4,#0x12] ; phone_DisplayOFF_count
|
||||
00009e d01b BEQ |L3.216|
|
||||
0000a0 2814 CMP r0,#0x14
|
||||
0000a2 d905 BLS |L3.176|
|
||||
;;;5488 {
|
||||
;;;5489 phone_DisplayOFF_count=0;
|
||||
0000a4 8266 STRH r6,[r4,#0x12]
|
||||
;;;5490 phone_start_flag=1;
|
||||
0000a6 71e5 STRB r5,[r4,#7]
|
||||
;;;5491 hal_gpio_set_output_data(IO_PAD_AP_INT, IO_LVL_LOW);//必须拉低，否则待机或者双击唤醒2~3s无触摸.jason_su
|
||||
0000a8 2100 MOVS r1,#0
|
||||
0000aa 2002 MOVS r0,#2
|
||||
0000ac f7fffffe BL hal_gpio_set_output_data
|
||||
|L3.176|
|
||||
;;;5492 }
|
||||
;;;5493 }
|
||||
;;;5494 app_tp_transfer_screen_int();
|
||||
0000b0 f7fffffe BL app_tp_transfer_screen_int
|
||||
;;;5495
|
||||
;;;5496 tp_heartbeat_exec();
|
||||
0000b4 f7fffffe BL tp_heartbeat_exec
|
||||
;;;5497 app_tp_calibration_exec();
|
||||
0000b8 f7fffffe BL app_tp_calibration_exec
|
||||
;;;5498 ap_tp_st_touch_scan_point_record_event_exec();
|
||||
0000bc f7fffffe BL ap_tp_st_touch_scan_point_record_event_exec
|
||||
;;;5499
|
||||
;;;5500 #ifdef USE_FOR_SUMSUNG_S20PLUS
|
||||
;;;5501 if(phone_start_flag==2)
|
||||
0000c0 79e3 LDRB r3,[r4,#7] ; phone_start_flag
|
||||
0000c2 2b02 CMP r3,#2
|
||||
0000c4 d1e0 BNE |L3.136|
|
||||
;;;5502 {
|
||||
;;;5503 TAU_LOGD("s20 start init %d", phone_start_flag);
|
||||
0000c6 4a07 LDR r2,|L3.228|
|
||||
0000c8 a107 ADR r1,|L3.232|
|
||||
0000ca 3265 ADDS r2,r2,#0x65
|
||||
0000cc a018 ADR r0,|L3.304|
|
||||
0000ce f7fffffe BL LOG_printf
|
||||
;;;5504 S20_Start_init();
|
||||
0000d2 f7fffffe BL S20_Start_init
|
||||
0000d6 e7d7 B |L3.136|
|
||||
|L3.216|
|
||||
0000d8 42b8 CMP r0,r7 ;5479
|
||||
0000da d9e9 BLS |L3.176|
|
||||
0000dc 8266 STRH r6,[r4,#0x12] ;5481
|
||||
0000de 71e5 STRB r5,[r4,#7] ;5482
|
||||
0000e0 e7e6 B |L3.176|
|
||||
;;;5505 }
|
||||
;;;5506 #endif
|
||||
;;;5507 /* if(heartbeat < (65536 * 3)){
|
||||
;;;5508 heartbeat ++;
|
||||
;;;5509 }else{
|
||||
;;;5510 printf("hb\n");
|
||||
;;;5511 heartbeat = 0;
|
||||
;;;5512 }
|
||||
;;;5513 */
|
||||
;;;5514 }
|
||||
;;;5515 }
|
||||
ENDP
|
||||
|
||||
0000ea 0000 DCW 0x0000
|
||||
|L3.236|
|
||||
0000ec 31353a34 DCB "15:41:23",0
|
||||
0000f0 313a3233
|
||||
0000e2 0000 DCW 0x0000
|
||||
|L3.228|
|
||||
DCD 0x0000151a
|
||||
|L3.232|
|
||||
0000e8 5332302b DCB "S20+_NT37701",0
|
||||
0000ec 5f4e5433
|
||||
0000f0 37373031
|
||||
0000f4 00
|
||||
0000f5 00 DCB 0
|
||||
0000f6 00 DCB 0
|
||||
0000f7 00 DCB 0
|
||||
|L3.248|
|
||||
0000f8 4a756c20 DCB "Jul 14 2023",0
|
||||
0000fc 31342032
|
||||
000100 30323300
|
||||
|L3.260|
|
||||
DCD 0x00001519
|
||||
|L3.264|
|
||||
000108 5332302b DCB "S20+_NT37701",0
|
||||
00010c 5f4e5433
|
||||
000110 37373031
|
||||
000114 00
|
||||
000115 00 DCB 0
|
||||
000116 00 DCB 0
|
||||
000117 00 DCB 0
|
||||
|L3.280|
|
||||
000118 5b25735d DCB "[%s] (%04d) S20+ 568 CSOT667[%s %s]",0
|
||||
00011c 20282530
|
||||
000120 34642920
|
||||
000124 5332302b
|
||||
000128 20353638
|
||||
00012c 2043534f
|
||||
000130 54363637
|
||||
000134 5b257320
|
||||
000138 25735d00
|
||||
|L3.316|
|
||||
0000f8 5b25735d DCB "[%s] (%04d) S20+ VSN667 V100 20230714",0
|
||||
0000fc 20282530
|
||||
000100 34642920
|
||||
000104 5332302b
|
||||
000108 2056534e
|
||||
00010c 36363720
|
||||
000110 56313030
|
||||
000114 20323032
|
||||
000118 33303731
|
||||
00011c 3400
|
||||
00011e 00 DCB 0
|
||||
00011f 00 DCB 0
|
||||
|L3.288|
|
||||
DCD ||.data||
|
||||
|L3.320|
|
||||
|L3.292|
|
||||
DCD tp_sleep_count
|
||||
|L3.324|
|
||||
|L3.296|
|
||||
DCD soft_timer3_cb
|
||||
|L3.328|
|
||||
|L3.300|
|
||||
DCD ap_reset_cb
|
||||
|L3.332|
|
||||
00014c 5b25735d DCB "[%s] (%04d) s20 start init %d",0
|
||||
000150 20282530
|
||||
000154 34642920
|
||||
000158 73323020
|
||||
00015c 73746172
|
||||
000160 7420696e
|
||||
000164 69742025
|
||||
000168 6400
|
||||
00016a 00 DCB 0
|
||||
00016b 00 DCB 0
|
||||
|L3.304|
|
||||
000130 5b25735d DCB "[%s] (%04d) s20 start init %d",0
|
||||
000134 20282530
|
||||
000138 34642920
|
||||
00013c 73323020
|
||||
000140 73746172
|
||||
000144 7420696e
|
||||
000148 69742025
|
||||
00014c 6400
|
||||
00014e 00 DCB 0
|
||||
00014f 00 DCB 0
|
||||
|
||||
AREA ||i.ap_get_reg_ca||, CODE, READONLY, ALIGN=2
|
||||
|
||||
|
|
@ -7355,7 +7344,7 @@
|
|||
AREA ||.rev16_text||, CODE
|
||||
THUMB
|
||||
EXPORT |__asm___9_ap_demo_c_b6677fcd____REV16|
|
||||
#line 467 "C:\\Users\\ASUS\\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___9_ap_demo_c_b6677fcd____REV16| PROC
|
||||
#line 468
|
||||
|
||||
|
|
|
|||
|
|
@ -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 --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.\RTE\_ISP_568 -IC:\Users\ASUS\AppData\Local\Arm\Packs\ARM\CMSIS\5.5.1\CMSIS\Core\Include -IC:\Users\ASUS\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\demo\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 --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.\RTE\_ISP_568 -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\demo\app_tp_st_touch.c]
|
||||
THUMB
|
||||
|
||||
AREA ||i.CRC16_2||, CODE, READONLY, ALIGN=2
|
||||
|
|
@ -1256,7 +1256,7 @@
|
|||
AREA ||.rev16_text||, CODE
|
||||
THUMB
|
||||
EXPORT |__asm___17_app_tp_st_touch_c_0c52f749____REV16|
|
||||
#line 467 "C:\\Users\\ASUS\\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_0c52f749____REV16| PROC
|
||||
#line 468
|
||||
|
||||
|
|
|
|||
|
|
@ -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_transfer.o --asm_dir=.\Listings\ --list_dir=.\Listings\ --depend=.\objects\app_tp_transfer.d --cpu=Cortex-M0 --apcs=interwork --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.\RTE\_ISP_568 -IC:\Users\ASUS\AppData\Local\Arm\Packs\ARM\CMSIS\5.5.1\CMSIS\Core\Include -IC:\Users\ASUS\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_transfer.crf ..\..\src\app\demo\app_tp_transfer.c]
|
||||
; commandline ArmCC [--c99 --list --split_sections --debug -c --asm --interleave --gnu -o.\objects\app_tp_transfer.o --asm_dir=.\Listings\ --list_dir=.\Listings\ --depend=.\objects\app_tp_transfer.d --cpu=Cortex-M0 --apcs=interwork --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.\RTE\_ISP_568 -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_transfer.crf ..\..\src\app\demo\app_tp_transfer.c]
|
||||
THUMB
|
||||
|
||||
AREA ||i.S20_Start_init||, CODE, READONLY, ALIGN=2
|
||||
|
|
@ -1260,7 +1260,7 @@
|
|||
AREA ||.rev16_text||, CODE
|
||||
THUMB
|
||||
EXPORT |__asm___17_app_tp_transfer_c_e672c05a____REV16|
|
||||
#line 467 "C:\\Users\\ASUS\\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_transfer_c_e672c05a____REV16| PROC
|
||||
#line 468
|
||||
|
||||
|
|
|
|||
|
|
@ -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 --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.\RTE\_ISP_568 -IC:\Users\ASUS\AppData\Local\Arm\Packs\ARM\CMSIS\5.5.1\CMSIS\Core\Include -IC:\Users\ASUS\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 --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.\RTE\_ISP_568 -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\\ASUS\\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
|
||||
|
||||
|
|
|
|||
|
|
@ -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 --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.\RTE\_ISP_568 -IC:\Users\ASUS\AppData\Local\Arm\Packs\ARM\CMSIS\5.5.1\CMSIS\Core\Include -IC:\Users\ASUS\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 --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.\RTE\_ISP_568 -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
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
AREA ||.rev16_text||, CODE
|
||||
THUMB
|
||||
EXPORT |__asm___6_main_c_main____REV16|
|
||||
#line 467 "C:\\Users\\ASUS\\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
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -5398,7 +5398,8 @@ void ap_demo(void)
|
|||
hal_gpio_init_output(IO_PAD_AP_SWIRE, IO_LVL_LOW);//IO_LVL_LOW
|
||||
hal_gpio_init_output(IO_PAD_ADCIN, IO_LVL_LOW);//IO_LVL_LOW
|
||||
|
||||
TAU_LOGD("S20+ 568 CSOT667[%s %s]", __DATE__, __TIME__);
|
||||
// TAU_LOGD("S20+ 568 CSOT667[%s %s]", __DATE__, __TIME__);
|
||||
TAU_LOGD("S20+ VSN667 V100 20230714");
|
||||
/* mipi rx³õʼ»¯ */
|
||||
app_tp_I2C_init();
|
||||
open_mipi_rx();
|
||||
|
|
@ -5493,8 +5494,8 @@ void ap_demo(void)
|
|||
app_tp_transfer_screen_int();
|
||||
|
||||
tp_heartbeat_exec();
|
||||
app_tp_calibration_exec();
|
||||
ap_tp_st_touch_scan_point_record_event_exec();
|
||||
app_tp_calibration_exec();
|
||||
ap_tp_st_touch_scan_point_record_event_exec();
|
||||
|
||||
#ifdef USE_FOR_SUMSUNG_S20PLUS
|
||||
if(phone_start_flag==2)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
////////////////////////////////////////////////////////////////////////
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
||||
ISP568_S20P_NT37701AH_VSN667_V100_20230714
|
||||
|
||||
|
||||
1、解决偶发触摸卡问题：将ST触摸芯片的软件复位全部改成硬件复位。
|
||||
2、解决唤醒误触发指纹识别问题。
|
||||
3、增加版本号打印和BIN文件版本
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue