diff --git a/project/ISP_368/ISP_368.uvprojx b/project/ISP_368/ISP_368.uvprojx
index a3716f2..e6ecd14 100644
--- a/project/ISP_368/ISP_368.uvprojx
+++ b/project/ISP_368/ISP_368.uvprojx
@@ -50,7 +50,7 @@
1
.\Objects\
- ISP368_N10Lite_CSOT667
+ ISP368_N10Lite_CSOT667_V100_20230714
1
0
1
@@ -459,6 +459,11 @@
1
..\..\src\app\demo\app_tp_st_touch.c
+
+ ap_demo_version.txt
+ 5
+ ..\..\src\app\demo\ap_demo_version.txt
+
diff --git a/project/ISP_368/Listings/ap_demo.txt b/project/ISP_368/Listings/ap_demo.txt
index 482a17c..6d1c395 100644
--- a/project/ISP_368/Listings/ap_demo.txt
+++ b/project/ISP_368/Listings/ap_demo.txt
@@ -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..\CVWL368 -I.\RTE\_ISP_368 -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_368 --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..\CVWL368 -I.\RTE\_ISP_368 -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_368 --omf_browse=.\objects\ap_demo.crf ..\..\src\app\demo\ap_demo.c]
THUMB
AREA ||i.Gpio_swire_output||, CODE, READONLY, ALIGN=1
@@ -417,458 +417,448 @@
AREA ||i.ap_demo||, CODE, READONLY, ALIGN=2
ap_demo PROC
-;;;2447
-;;;2448 void ap_demo(void)
+;;;2448
+;;;2449 void ap_demo(void)
000000 b51c PUSH {r2-r4,lr}
-;;;2449 {
-;;;2450 hal_gpio_init_output(IO_PAD_TD_TPRSTN, IO_LVL_HIGH);
+;;;2450 {
+;;;2451 hal_gpio_init_output(IO_PAD_TD_TPRSTN, IO_LVL_HIGH);
000002 2101 MOVS r1,#1
000004 2008 MOVS r0,#8
000006 f7fffffe BL hal_gpio_init_output
-;;;2451 hal_gpio_init_output(IO_PAD_AP_SWIRE, IO_LVL_LOW);
+;;;2452 hal_gpio_init_output(IO_PAD_AP_SWIRE, IO_LVL_LOW);
00000a 2100 MOVS r1,#0
00000c 2004 MOVS r0,#4
00000e f7fffffe BL hal_gpio_init_output
-;;;2452 hal_gpio_init_output(IO_PAD_PWMEN, IO_LVL_LOW); //AP_SWIRE
+;;;2453 hal_gpio_init_output(IO_PAD_PWMEN, IO_LVL_LOW); //AP_SWIRE
000012 2100 MOVS r1,#0
000014 2013 MOVS r0,#0x13
000016 f7fffffe BL hal_gpio_init_output
-;;;2453 hal_gpio_init_output(IO_PAD_ADCIN, IO_LVL_LOW); //SWIRE
+;;;2454 hal_gpio_init_output(IO_PAD_ADCIN, IO_LVL_LOW); //SWIRE
00001a 2100 MOVS r1,#0
00001c 2014 MOVS r0,#0x14
00001e f7fffffe BL hal_gpio_init_output
-;;;2454
-;;;2455 TAU_LOGD("N10Lite CSOT667 [%s %s]", __DATE__, __TIME__);
-000022 a070 ADR r0,|L3.484|
-000024 9000 STR r0,[sp,#0]
-000026 a372 ADR r3,|L3.496|
-000028 4a74 LDR r2,|L3.508|
-00002a a175 ADR r1,|L3.512|
-00002c a078 ADR r0,|L3.528|
-00002e f7fffffe BL LOG_printf
-;;;2456 /* mipi rx初始化 */
-;;;2457 open_mipi_rx();
-000032 f7fffffe BL open_mipi_rx
-;;;2458 delayMs(20);
-000036 2014 MOVS r0,#0x14
-000038 f7fffffe BL delayMs
-;;;2459
-;;;2460 // hal_gpio_set_output_data(IO_PAD_PWMEN, IO_LVL_HIGH); //LED_ON
+;;;2455
+;;;2456 // TAU_LOGD("N10Lite CSOT667 [%s %s]", __DATE__, __TIME__);
+;;;2457 TAU_LOGD("N10Lite V100 20230714");
+000022 4a6e LDR r2,|L3.476|
+000024 a16e ADR r1,|L3.480|
+000026 a072 ADR r0,|L3.496|
+000028 f7fffffe BL LOG_printf
+;;;2458 /* mipi rx初始化 */
+;;;2459 open_mipi_rx();
+00002c f7fffffe BL open_mipi_rx
+;;;2460 delayMs(20);
+000030 2014 MOVS r0,#0x14
+000032 f7fffffe BL delayMs
;;;2461
-;;;2462 app_tp_I2C_init();
-00003c f7fffffe BL app_tp_I2C_init
-;;;2463 // soft_te_timer_init();
-;;;2464
-;;;2465 /* mipi tx 初始化*/
-;;;2466 init_mipi_tx();
-000040 f7fffffe BL init_mipi_tx
-;;;2467
-;;;2468 app_tp_init();
-000044 f7fffffe BL app_tp_init
-;;;2469 #ifdef ADD_TIMER3_FUNCTION
-;;;2470 tp_sleep_count=0;
-000048 487a LDR r0,|L3.564|
-00004a 2400 MOVS r4,#0
-00004c 7004 STRB r4,[r0,#0]
-;;;2471 tp_sleep_clk_count = 0;
-00004e 487a LDR r0,|L3.568|
-;;;2472 phone_DisplayOFF_count=1;
-000050 4e7a LDR r6,|L3.572|
-000052 7004 STRB r4,[r0,#0] ;2471
-000054 2501 MOVS r5,#1
-000056 81f5 STRH r5,[r6,#0xe]
-;;;2473 hal_timer_init(TIMER_NUM3);
-000058 2003 MOVS r0,#3
-00005a f7fffffe BL hal_timer_init
-;;;2474 hal_timer_start(TIMER_NUM3, 10, soft_timer3_cb, NULL);
-00005e 2300 MOVS r3,#0
-000060 4a77 LDR r2,|L3.576|
-000062 210a MOVS r1,#0xa
-000064 2003 MOVS r0,#3
-000066 f7fffffe BL hal_timer_start
-;;;2475 #endif
-;;;2476
-;;;2477 while (1)
-;;;2478 {
-;;;2479 if (start_display_on == true )
-;;;2480 {
-;;;2481 tx_display_on();
-;;;2482 start_display_on = false;
-;;;2483
-;;;2484 #ifndef DISABLE_TDDI_I2C_FUNCTION
-;;;2485 /* 与屏的TP 模块通讯并初始化 */
-;;;2486 app_tp_transfer_screen_start();
-;;;2487 #endif
-;;;2488 #if ENABLE_TP_WAKE_UP
-;;;2489 hal_gpio_set_ap_reset_int(ENABLE, ap_reset_cb, DETECT_RISING_EDGE);
-;;;2490 #endif
-;;;2491 }
-;;;2492
-;;;2493 #if 1//电话熄屏
-;;;2494 if (phone_off_flag==0)
-;;;2495 {
-;;;2496 if(Flag_blacklight_EN)
-00006a 4f76 LDR r7,|L3.580|
- |L3.108|
-00006c 7830 LDRB r0,[r6,#0] ;2479 ; start_display_on
-00006e 2800 CMP r0,#0 ;2479
-000070 d01f BEQ |L3.178|
-000072 f7fffffe BL init_panel
-000076 4a61 LDR r2,|L3.508|
-000078 4973 LDR r1,|L3.584|
-00007a 3a4f SUBS r2,r2,#0x4f ;2479
-00007c a073 ADR r0,|L3.588|
-00007e f7fffffe BL LOG_printf
-000082 70b5 STRB r5,[r6,#2] ;2479
-000084 69f0 LDR r0,[r6,#0x1c] ;2479 ; g_tx_ctrl_handle
-000086 f7fffffe BL hal_dsi_tx_ctrl_start
-00008a 2014 MOVS r0,#0x14 ;2479
-00008c f7fffffe BL delayMs
-000090 2329 MOVS r3,#0x29 ;2479
-000092 2201 MOVS r2,#1 ;2479
-000094 2100 MOVS r1,#0 ;2479
-000096 2005 MOVS r0,#5 ;2479
-000098 f7fffffe BL hal_dsi_tx_ctrl_write_cmd
-00009c 200a MOVS r0,#0xa ;2479
-00009e f7fffffe BL delayMs
-0000a2 7034 STRB r4,[r6,#0] ;2482
-0000a4 f7fffffe BL app_tp_transfer_screen_start
-0000a8 2202 MOVS r2,#2 ;2489
-0000aa 496e LDR r1,|L3.612|
-0000ac 2001 MOVS r0,#1 ;2489
-0000ae f7fffffe BL hal_gpio_set_ap_reset_int
- |L3.178|
-0000b2 79f0 LDRB r0,[r6,#7] ;2494 ; phone_off_flag
-0000b4 2800 CMP r0,#0 ;2494
-;;;2497 {
-;;;2498 phone_off_flag =1;
-;;;2499 hal_dsi_tx_ctrl_write_cmd(0x39, 0, 2, 0x28, 0x00);
-;;;2500 TAU_LOGD("Phone off 28");
-;;;2501 }
-;;;2502 }
-;;;2503 else
-;;;2504 {
-;;;2505 if(Flag_blacklight_EN ==0)
-0000b6 7838 LDRB r0,[r7,#0] ; Flag_blacklight_EN
-0000b8 d002 BEQ |L3.192|
-0000ba 2800 CMP r0,#0
-0000bc d00f BEQ |L3.222|
-0000be e01c B |L3.250|
- |L3.192|
-0000c0 2800 CMP r0,#0 ;2496
-0000c2 d01a BEQ |L3.250|
-0000c4 71f5 STRB r5,[r6,#7] ;2498
-0000c6 2328 MOVS r3,#0x28 ;2499
-0000c8 2202 MOVS r2,#2 ;2499
-0000ca 2100 MOVS r1,#0 ;2499
-0000cc 2039 MOVS r0,#0x39 ;2499
-0000ce 9400 STR r4,[sp,#0] ;2499
-0000d0 f7fffffe BL hal_dsi_tx_ctrl_write_cmd
-0000d4 4a49 LDR r2,|L3.508|
-0000d6 a14a ADR r1,|L3.512|
-0000d8 322d ADDS r2,r2,#0x2d ;2500
-0000da a063 ADR r0,|L3.616|
-0000dc e00b B |L3.246|
- |L3.222|
-;;;2506 {
-;;;2507 phone_off_flag =0;
-0000de 71f4 STRB r4,[r6,#7]
-;;;2508 hal_dsi_tx_ctrl_write_cmd(0x39, 0, 2, 0x29, 0x00);
-0000e0 2329 MOVS r3,#0x29
-0000e2 2202 MOVS r2,#2
-0000e4 2100 MOVS r1,#0
-0000e6 2039 MOVS r0,#0x39
-0000e8 9400 STR r4,[sp,#0]
-0000ea f7fffffe BL hal_dsi_tx_ctrl_write_cmd
-;;;2509 TAU_LOGD("Phone off 29");
-0000ee 4a43 LDR r2,|L3.508|
-0000f0 a143 ADR r1,|L3.512|
-0000f2 3236 ADDS r2,r2,#0x36
-0000f4 a063 ADR r0,|L3.644|
- |L3.246|
-0000f6 f7fffffe BL LOG_printf
- |L3.250|
-;;;2510 }
-;;;2511 }
-;;;2512 #endif
-;;;2513 if(phone_DisplayOFF_flag==1)
-0000fa 7a70 LDRB r0,[r6,#9] ; phone_DisplayOFF_flag
-0000fc 2801 CMP r0,#1
-;;;2514 {
-;;;2515 if(phone_DisplayOFF_count>2200)
-;;;2516 {
-;;;2517 phone_DisplayOFF_count=0;
-;;;2518 phone_start_flag=1;
-;;;2519 }
-;;;2520 }
-;;;2521 else
-;;;2522 {
-;;;2523 if(phone_DisplayOFF_count>30)
-0000fe 89f0 LDRH r0,[r6,#0xe] ; phone_DisplayOFF_count
-000100 d019 BEQ |L3.310|
-000102 281e CMP r0,#0x1e
-000104 d905 BLS |L3.274|
-;;;2524 {
-;;;2525 phone_DisplayOFF_count=0;
-000106 81f4 STRH r4,[r6,#0xe]
-;;;2526 phone_start_flag=1;
-000108 7235 STRB r5,[r6,#8]
-;;;2527 hal_gpio_set_output_data(IO_PAD_AP_INT, IO_LVL_LOW);//必须拉低，否则待机或者双击唤醒2~3s无触摸.jason_su
-00010a 2100 MOVS r1,#0
-00010c 2002 MOVS r0,#2
-00010e f7fffffe BL hal_gpio_set_output_data
- |L3.274|
-;;;2528 }
-;;;2529 }
-;;;2530
-;;;2531
-;;;2532 if (BL_ADJ_flag)
-000112 79b0 LDRB r0,[r6,#6] ; BL_ADJ_flag
+;;;2462 // hal_gpio_set_output_data(IO_PAD_PWMEN, IO_LVL_HIGH); //LED_ON
+;;;2463
+;;;2464 app_tp_I2C_init();
+000036 f7fffffe BL app_tp_I2C_init
+;;;2465 // soft_te_timer_init();
+;;;2466
+;;;2467 /* mipi tx 初始化*/
+;;;2468 init_mipi_tx();
+00003a f7fffffe BL init_mipi_tx
+;;;2469
+;;;2470 app_tp_init();
+00003e f7fffffe BL app_tp_init
+;;;2471 #ifdef ADD_TIMER3_FUNCTION
+;;;2472 tp_sleep_count=0;
+000042 4874 LDR r0,|L3.532|
+000044 2400 MOVS r4,#0
+000046 7004 STRB r4,[r0,#0]
+;;;2473 tp_sleep_clk_count = 0;
+000048 4873 LDR r0,|L3.536|
+;;;2474 phone_DisplayOFF_count=1;
+00004a 4e74 LDR r6,|L3.540|
+00004c 7004 STRB r4,[r0,#0] ;2473
+00004e 2501 MOVS r5,#1
+000050 81f5 STRH r5,[r6,#0xe]
+;;;2475 hal_timer_init(TIMER_NUM3);
+000052 2003 MOVS r0,#3
+000054 f7fffffe BL hal_timer_init
+;;;2476 hal_timer_start(TIMER_NUM3, 10, soft_timer3_cb, NULL);
+000058 2300 MOVS r3,#0
+00005a 4a71 LDR r2,|L3.544|
+00005c 210a MOVS r1,#0xa
+00005e 2003 MOVS r0,#3
+000060 f7fffffe BL hal_timer_start
+;;;2477 #endif
+;;;2478
+;;;2479 while (1)
+;;;2480 {
+;;;2481 if (start_display_on == true )
+;;;2482 {
+;;;2483 tx_display_on();
+;;;2484 start_display_on = false;
+;;;2485
+;;;2486 #ifndef DISABLE_TDDI_I2C_FUNCTION
+;;;2487 /* 与屏的TP 模块通讯并初始化 */
+;;;2488 app_tp_transfer_screen_start();
+;;;2489 #endif
+;;;2490 #if ENABLE_TP_WAKE_UP
+;;;2491 hal_gpio_set_ap_reset_int(ENABLE, ap_reset_cb, DETECT_RISING_EDGE);
+;;;2492 #endif
+;;;2493 }
+;;;2494
+;;;2495 #if 1//电话熄屏
+;;;2496 if (phone_off_flag==0)
+;;;2497 {
+;;;2498 if(Flag_blacklight_EN)
+000064 4f6f LDR r7,|L3.548|
+ |L3.102|
+000066 7830 LDRB r0,[r6,#0] ;2481 ; start_display_on
+000068 2800 CMP r0,#0 ;2481
+00006a d01f BEQ |L3.172|
+00006c f7fffffe BL init_panel
+000070 4a5a LDR r2,|L3.476|
+000072 496d LDR r1,|L3.552|
+000074 3a51 SUBS r2,r2,#0x51 ;2481
+000076 a06d ADR r0,|L3.556|
+000078 f7fffffe BL LOG_printf
+00007c 70b5 STRB r5,[r6,#2] ;2481
+00007e 69f0 LDR r0,[r6,#0x1c] ;2481 ; g_tx_ctrl_handle
+000080 f7fffffe BL hal_dsi_tx_ctrl_start
+000084 2014 MOVS r0,#0x14 ;2481
+000086 f7fffffe BL delayMs
+00008a 2329 MOVS r3,#0x29 ;2481
+00008c 2201 MOVS r2,#1 ;2481
+00008e 2100 MOVS r1,#0 ;2481
+000090 2005 MOVS r0,#5 ;2481
+000092 f7fffffe BL hal_dsi_tx_ctrl_write_cmd
+000096 200a MOVS r0,#0xa ;2481
+000098 f7fffffe BL delayMs
+00009c 7034 STRB r4,[r6,#0] ;2484
+00009e f7fffffe BL app_tp_transfer_screen_start
+0000a2 2202 MOVS r2,#2 ;2491
+0000a4 4967 LDR r1,|L3.580|
+0000a6 2001 MOVS r0,#1 ;2491
+0000a8 f7fffffe BL hal_gpio_set_ap_reset_int
+ |L3.172|
+0000ac 79f0 LDRB r0,[r6,#7] ;2496 ; phone_off_flag
+0000ae 2800 CMP r0,#0 ;2496
+;;;2499 {
+;;;2500 phone_off_flag =1;
+;;;2501 hal_dsi_tx_ctrl_write_cmd(0x39, 0, 2, 0x28, 0x00);
+;;;2502 TAU_LOGD("Phone off 28");
+;;;2503 }
+;;;2504 }
+;;;2505 else
+;;;2506 {
+;;;2507 if(Flag_blacklight_EN ==0)
+0000b0 7838 LDRB r0,[r7,#0] ; Flag_blacklight_EN
+0000b2 d002 BEQ |L3.186|
+0000b4 2800 CMP r0,#0
+0000b6 d00f BEQ |L3.216|
+0000b8 e01c B |L3.244|
+ |L3.186|
+0000ba 2800 CMP r0,#0 ;2498
+0000bc d01a BEQ |L3.244|
+0000be 71f5 STRB r5,[r6,#7] ;2500
+0000c0 2328 MOVS r3,#0x28 ;2501
+0000c2 2202 MOVS r2,#2 ;2501
+0000c4 2100 MOVS r1,#0 ;2501
+0000c6 2039 MOVS r0,#0x39 ;2501
+0000c8 9400 STR r4,[sp,#0] ;2501
+0000ca f7fffffe BL hal_dsi_tx_ctrl_write_cmd
+0000ce 4a43 LDR r2,|L3.476|
+0000d0 a143 ADR r1,|L3.480|
+0000d2 322d ADDS r2,r2,#0x2d ;2502
+0000d4 a05c ADR r0,|L3.584|
+0000d6 e00b B |L3.240|
+ |L3.216|
+;;;2508 {
+;;;2509 phone_off_flag =0;
+0000d8 71f4 STRB r4,[r6,#7]
+;;;2510 hal_dsi_tx_ctrl_write_cmd(0x39, 0, 2, 0x29, 0x00);
+0000da 2329 MOVS r3,#0x29
+0000dc 2202 MOVS r2,#2
+0000de 2100 MOVS r1,#0
+0000e0 2039 MOVS r0,#0x39
+0000e2 9400 STR r4,[sp,#0]
+0000e4 f7fffffe BL hal_dsi_tx_ctrl_write_cmd
+;;;2511 TAU_LOGD("Phone off 29");
+0000e8 4a3c LDR r2,|L3.476|
+0000ea a13d ADR r1,|L3.480|
+0000ec 3236 ADDS r2,r2,#0x36
+0000ee a05d ADR r0,|L3.612|
+ |L3.240|
+0000f0 f7fffffe BL LOG_printf
+ |L3.244|
+;;;2512 }
+;;;2513 }
+;;;2514 #endif
+;;;2515 if(phone_DisplayOFF_flag==1)
+0000f4 7a70 LDRB r0,[r6,#9] ; phone_DisplayOFF_flag
+0000f6 2801 CMP r0,#1
+;;;2516 {
+;;;2517 if(phone_DisplayOFF_count>2200)
+;;;2518 {
+;;;2519 phone_DisplayOFF_count=0;
+;;;2520 phone_start_flag=1;
+;;;2521 }
+;;;2522 }
+;;;2523 else
+;;;2524 {
+;;;2525 if(phone_DisplayOFF_count>30)
+0000f8 89f0 LDRH r0,[r6,#0xe] ; phone_DisplayOFF_count
+0000fa d019 BEQ |L3.304|
+0000fc 281e CMP r0,#0x1e
+0000fe d905 BLS |L3.268|
+;;;2526 {
+;;;2527 phone_DisplayOFF_count=0;
+000100 81f4 STRH r4,[r6,#0xe]
+;;;2528 phone_start_flag=1;
+000102 7235 STRB r5,[r6,#8]
+;;;2529 hal_gpio_set_output_data(IO_PAD_AP_INT, IO_LVL_LOW);//必须拉低，否则待机或者双击唤醒2~3s无触摸.jason_su
+000104 2100 MOVS r1,#0
+000106 2002 MOVS r0,#2
+000108 f7fffffe BL hal_gpio_set_output_data
+ |L3.268|
+;;;2530 }
+;;;2531 }
+;;;2532
+;;;2533
+;;;2534 if (BL_ADJ_flag)
+00010c 79b0 LDRB r0,[r6,#6] ; BL_ADJ_flag
+00010e 2800 CMP r0,#0
+000110 d02e BEQ |L3.368|
+;;;2535 {
+;;;2536 if(hbm_mode) //高亮延时
+000112 7ab0 LDRB r0,[r6,#0xa] ; hbm_mode
000114 2800 CMP r0,#0
-000116 d02f BEQ |L3.376|
-;;;2533 {
-;;;2534 if(hbm_mode) //高亮延时
-000118 7ab0 LDRB r0,[r6,#0xa] ; hbm_mode
-00011a 2800 CMP r0,#0
-00011c d015 BEQ |L3.330|
-;;;2535 {
-;;;2536 if (enter_hbm_mode_cnt <41)
-00011e 7930 LDRB r0,[r6,#4] ; enter_hbm_mode_cnt
-000120 2829 CMP r0,#0x29
-000122 d229 BCS |L3.376|
-000124 1c40 ADDS r0,r0,#1
-;;;2537 {
-;;;2538 enter_hbm_mode_cnt++;
-000126 7130 STRB r0,[r6,#4]
-;;;2539 delayMs(1);
-000128 2001 MOVS r0,#1
-00012a f7fffffe BL delayMs
-;;;2540 if (enter_hbm_mode_cnt ==40)
-00012e 7930 LDRB r0,[r6,#4] ; enter_hbm_mode_cnt
-000130 2828 CMP r0,#0x28
-000132 d007 BEQ |L3.324|
-000134 e020 B |L3.376|
- |L3.310|
-000136 4931 LDR r1,|L3.508|
-000138 39ff SUBS r1,r1,#0xff ;2515
-00013a 4288 CMP r0,r1 ;2515
-00013c d9e9 BLS |L3.274|
-00013e 81f4 STRH r4,[r6,#0xe] ;2517
-000140 7235 STRB r5,[r6,#8] ;2518
-000142 e7e6 B |L3.274|
- |L3.324|
-;;;2541 {
-;;;2542 hal_dsi_tx_ctrl_write_cmd(0x39, 0, 3, 0x51, 0x07, 0xFF);
-000144 21ff MOVS r1,#0xff
-000146 2007 MOVS r0,#7
-;;;2543 BL_ADJ_flag=false;
-000148 e00d B |L3.358|
- |L3.330|
-;;;2544 }
-;;;2545 }
-;;;2546 }
-;;;2547 else
-;;;2548 {
-;;;2549 if (exit_hbm_mode_cnt < 3) //7
-00014a 7970 LDRB r0,[r6,#5] ; exit_hbm_mode_cnt
-00014c 2803 CMP r0,#3
-00014e d213 BCS |L3.376|
-000150 1c40 ADDS r0,r0,#1
-;;;2550 {
-;;;2551 exit_hbm_mode_cnt++;
-000152 7170 STRB r0,[r6,#5]
-;;;2552 delayMs(1);
-000154 2001 MOVS r0,#1
-000156 f7fffffe BL delayMs
-;;;2553 if (exit_hbm_mode_cnt==2)
-00015a 7970 LDRB r0,[r6,#5] ; exit_hbm_mode_cnt
-00015c 2802 CMP r0,#2
-00015e d10b BNE |L3.376|
-;;;2554 {
-;;;2555 hal_dsi_tx_ctrl_write_cmd(0x39, 0, 3, 0x51, rd_51_val2>>8, rd_51_val2&0xFF);
-000160 8a30 LDRH r0,[r6,#0x10] ; rd_51_val2
-000162 b2c1 UXTB r1,r0
-000164 0a00 LSRS r0,r0,#8
- |L3.358|
-000166 9101 STR r1,[sp,#4]
-000168 9000 STR r0,[sp,#0]
-00016a 2351 MOVS r3,#0x51
-00016c 2203 MOVS r2,#3
-00016e 2100 MOVS r1,#0
-000170 2039 MOVS r0,#0x39
-000172 f7fffffe BL hal_dsi_tx_ctrl_write_cmd
-;;;2556 BL_ADJ_flag=false;
-000176 71b4 STRB r4,[r6,#6]
- |L3.376|
-;;;2557 }
-;;;2558 }
-;;;2559 }
-;;;2560 }
-;;;2561
-;;;2562
-;;;2563
-;;;2564 #ifndef DISABLE_TDDI_I2C_FUNCTION
-;;;2565 /* 等待屏 TP 中断上报做TP 协议转换 */
-;;;2566 app_tp_transfer_screen_int();
-000178 f7fffffe BL app_tp_transfer_screen_int
-;;;2567 #endif
-;;;2568 tp_heartbeat_exec();
-00017c f7fffffe BL tp_heartbeat_exec
-;;;2569 app_tp_calibration_exec();
-000180 f7fffffe BL app_tp_calibration_exec
-;;;2570 ap_tp_st_touch_scan_point_record_event_exec();
-000184 f7fffffe BL ap_tp_st_touch_scan_point_record_event_exec
- |L3.392|
-;;;2571
-;;;2572 while (hal_dsi_rx_ctrl_dsc_async_handler(g_rx_ctrl_handle));
-000188 69b0 LDR r0,[r6,#0x18] ; g_rx_ctrl_handle
-00018a f7fffffe BL hal_dsi_rx_ctrl_dsc_async_handler
-00018e 2800 CMP r0,#0
-000190 d1fa BNE |L3.392|
-;;;2573
-;;;2574 #if ENABLE_TP_WAKE_UP
-;;;2575 if (g_need_enter_sleep_mode)
-000192 7af0 LDRB r0,[r6,#0xb] ; g_need_enter_sleep_mode
-000194 2800 CMP r0,#0
-000196 d100 BNE |L3.410|
-000198 e768 B |L3.108|
- |L3.410|
-;;;2576 {
-;;;2577 tp_sleep_in=1;
-00019a 4841 LDR r0,|L3.672|
-00019c 7005 STRB r5,[r0,#0]
-;;;2578 // hal_gpio_set_output_data(IO_PAD_TD_LEDPWM, IO_LVL_HIGH);
-;;;2579
-;;;2580 /* FIXME stop more model */
-;;;2581 hal_dsi_tx_ctrl_stop(g_tx_ctrl_handle);
-00019e 69f0 LDR r0,[r6,#0x1c] ; g_tx_ctrl_handle
-0001a0 f7fffffe BL hal_dsi_tx_ctrl_stop
-;;;2582 hal_dsi_tx_ctrl_deinit(g_tx_ctrl_handle);
-0001a4 69f0 LDR r0,[r6,#0x1c] ; g_tx_ctrl_handle
-0001a6 f7fffffe BL hal_dsi_tx_ctrl_deinit
-;;;2583 hal_dsi_rx_ctrl_stop(g_rx_ctrl_handle);
-0001aa 69b0 LDR r0,[r6,#0x18] ; g_rx_ctrl_handle
-0001ac f7fffffe BL hal_dsi_rx_ctrl_stop
-;;;2584 hal_dsi_rx_ctrl_deinit(g_rx_ctrl_handle);
-0001b0 69b0 LDR r0,[r6,#0x18] ; g_rx_ctrl_handle
-0001b2 f7fffffe BL hal_dsi_rx_ctrl_deinit
-;;;2585
-;;;2586 hal_swire_open(DISABLE);
-0001b6 2000 MOVS r0,#0
-0001b8 f7fffffe BL hal_swire_open
-;;;2587 hal_swire_deinit();
-0001bc f7fffffe BL hal_swire_deinit
-;;;2588 hal_timer_stop(SWIRE_TIMER);
-0001c0 2001 MOVS r0,#1
-0001c2 f7fffffe BL hal_timer_stop
-;;;2589 hal_timer_deinit(SWIRE_TIMER);
-0001c6 2001 MOVS r0,#1
-0001c8 f7fffffe BL hal_timer_deinit
-;;;2590
-;;;2591 hal_system_set_vcc(false);
-0001cc 2000 MOVS r0,#0
-0001ce f7fffffe BL hal_system_set_vcc
-;;;2592 TAU_LOGD("disable video path\n");
-0001d2 2251 MOVS r2,#0x51
-0001d4 0152 LSLS r2,r2,#5
-0001d6 a10a ADR r1,|L3.512|
-0001d8 a032 ADR r0,|L3.676|
-0001da f7fffffe BL LOG_printf
-;;;2593 g_need_enter_sleep_mode = false;
-0001de 72f4 STRB r4,[r6,#0xb]
-0001e0 e744 B |L3.108|
-;;;2594 }
-;;;2595 #endif
-;;;2596 }
-;;;2597 }
-;;;2598
+000116 d014 BEQ |L3.322|
+;;;2537 {
+;;;2538 if (enter_hbm_mode_cnt <41)
+000118 7930 LDRB r0,[r6,#4] ; enter_hbm_mode_cnt
+00011a 2829 CMP r0,#0x29
+00011c d228 BCS |L3.368|
+00011e 1c40 ADDS r0,r0,#1
+;;;2539 {
+;;;2540 enter_hbm_mode_cnt++;
+000120 7130 STRB r0,[r6,#4]
+;;;2541 delayMs(1);
+000122 2001 MOVS r0,#1
+000124 f7fffffe BL delayMs
+;;;2542 if (enter_hbm_mode_cnt ==40)
+000128 7930 LDRB r0,[r6,#4] ; enter_hbm_mode_cnt
+00012a 2828 CMP r0,#0x28
+00012c d006 BEQ |L3.316|
+00012e e01f B |L3.368|
+ |L3.304|
+000130 4953 LDR r1,|L3.640|
+000132 4288 CMP r0,r1 ;2517
+000134 d9ea BLS |L3.268|
+000136 81f4 STRH r4,[r6,#0xe] ;2519
+000138 7235 STRB r5,[r6,#8] ;2520
+00013a e7e7 B |L3.268|
+ |L3.316|
+;;;2543 {
+;;;2544 hal_dsi_tx_ctrl_write_cmd(0x39, 0, 3, 0x51, 0x07, 0xFF);
+00013c 21ff MOVS r1,#0xff
+00013e 2007 MOVS r0,#7
+;;;2545 BL_ADJ_flag=false;
+000140 e00d B |L3.350|
+ |L3.322|
+;;;2546 }
+;;;2547 }
+;;;2548 }
+;;;2549 else
+;;;2550 {
+;;;2551 if (exit_hbm_mode_cnt < 3) //7
+000142 7970 LDRB r0,[r6,#5] ; exit_hbm_mode_cnt
+000144 2803 CMP r0,#3
+000146 d213 BCS |L3.368|
+000148 1c40 ADDS r0,r0,#1
+;;;2552 {
+;;;2553 exit_hbm_mode_cnt++;
+00014a 7170 STRB r0,[r6,#5]
+;;;2554 delayMs(1);
+00014c 2001 MOVS r0,#1
+00014e f7fffffe BL delayMs
+;;;2555 if (exit_hbm_mode_cnt==2)
+000152 7970 LDRB r0,[r6,#5] ; exit_hbm_mode_cnt
+000154 2802 CMP r0,#2
+000156 d10b BNE |L3.368|
+;;;2556 {
+;;;2557 hal_dsi_tx_ctrl_write_cmd(0x39, 0, 3, 0x51, rd_51_val2>>8, rd_51_val2&0xFF);
+000158 8a30 LDRH r0,[r6,#0x10] ; rd_51_val2
+00015a b2c1 UXTB r1,r0
+00015c 0a00 LSRS r0,r0,#8
+ |L3.350|
+00015e 9101 STR r1,[sp,#4]
+000160 9000 STR r0,[sp,#0]
+000162 2351 MOVS r3,#0x51
+000164 2203 MOVS r2,#3
+000166 2100 MOVS r1,#0
+000168 2039 MOVS r0,#0x39
+00016a f7fffffe BL hal_dsi_tx_ctrl_write_cmd
+;;;2558 BL_ADJ_flag=false;
+00016e 71b4 STRB r4,[r6,#6]
+ |L3.368|
+;;;2559 }
+;;;2560 }
+;;;2561 }
+;;;2562 }
+;;;2563
+;;;2564
+;;;2565
+;;;2566 #ifndef DISABLE_TDDI_I2C_FUNCTION
+;;;2567 /* 等待屏 TP 中断上报做TP 协议转换 */
+;;;2568 app_tp_transfer_screen_int();
+000170 f7fffffe BL app_tp_transfer_screen_int
+;;;2569 #endif
+;;;2570 tp_heartbeat_exec();
+000174 f7fffffe BL tp_heartbeat_exec
+;;;2571 app_tp_calibration_exec();
+000178 f7fffffe BL app_tp_calibration_exec
+;;;2572 ap_tp_st_touch_scan_point_record_event_exec();
+00017c f7fffffe BL ap_tp_st_touch_scan_point_record_event_exec
+ |L3.384|
+;;;2573
+;;;2574 while (hal_dsi_rx_ctrl_dsc_async_handler(g_rx_ctrl_handle));
+000180 69b0 LDR r0,[r6,#0x18] ; g_rx_ctrl_handle
+000182 f7fffffe BL hal_dsi_rx_ctrl_dsc_async_handler
+000186 2800 CMP r0,#0
+000188 d1fa BNE |L3.384|
+;;;2575
+;;;2576 #if ENABLE_TP_WAKE_UP
+;;;2577 if (g_need_enter_sleep_mode)
+00018a 7af0 LDRB r0,[r6,#0xb] ; g_need_enter_sleep_mode
+00018c 2800 CMP r0,#0
+00018e d100 BNE |L3.402|
+000190 e769 B |L3.102|
+ |L3.402|
+;;;2578 {
+;;;2579 tp_sleep_in=1;
+000192 483c LDR r0,|L3.644|
+000194 7005 STRB r5,[r0,#0]
+;;;2580 // hal_gpio_set_output_data(IO_PAD_TD_LEDPWM, IO_LVL_HIGH);
+;;;2581
+;;;2582 /* FIXME stop more model */
+;;;2583 hal_dsi_tx_ctrl_stop(g_tx_ctrl_handle);
+000196 69f0 LDR r0,[r6,#0x1c] ; g_tx_ctrl_handle
+000198 f7fffffe BL hal_dsi_tx_ctrl_stop
+;;;2584 hal_dsi_tx_ctrl_deinit(g_tx_ctrl_handle);
+00019c 69f0 LDR r0,[r6,#0x1c] ; g_tx_ctrl_handle
+00019e f7fffffe BL hal_dsi_tx_ctrl_deinit
+;;;2585 hal_dsi_rx_ctrl_stop(g_rx_ctrl_handle);
+0001a2 69b0 LDR r0,[r6,#0x18] ; g_rx_ctrl_handle
+0001a4 f7fffffe BL hal_dsi_rx_ctrl_stop
+;;;2586 hal_dsi_rx_ctrl_deinit(g_rx_ctrl_handle);
+0001a8 69b0 LDR r0,[r6,#0x18] ; g_rx_ctrl_handle
+0001aa f7fffffe BL hal_dsi_rx_ctrl_deinit
+;;;2587
+;;;2588 hal_swire_open(DISABLE);
+0001ae 2000 MOVS r0,#0
+0001b0 f7fffffe BL hal_swire_open
+;;;2589 hal_swire_deinit();
+0001b4 f7fffffe BL hal_swire_deinit
+;;;2590 hal_timer_stop(SWIRE_TIMER);
+0001b8 2001 MOVS r0,#1
+0001ba f7fffffe BL hal_timer_stop
+;;;2591 hal_timer_deinit(SWIRE_TIMER);
+0001be 2001 MOVS r0,#1
+0001c0 f7fffffe BL hal_timer_deinit
+;;;2592
+;;;2593 hal_system_set_vcc(false);
+0001c4 2000 MOVS r0,#0
+0001c6 f7fffffe BL hal_system_set_vcc
+;;;2594 TAU_LOGD("disable video path\n");
+0001ca 4a04 LDR r2,|L3.476|
+0001cc a104 ADR r1,|L3.480|
+0001ce 3289 ADDS r2,r2,#0x89
+0001d0 a02d ADR r0,|L3.648|
+0001d2 f7fffffe BL LOG_printf
+;;;2595 g_need_enter_sleep_mode = false;
+0001d6 72f4 STRB r4,[r6,#0xb]
+0001d8 e745 B |L3.102|
+;;;2596 }
+;;;2597 #endif
+;;;2598 }
+;;;2599 }
+;;;2600
ENDP
-0001e2 0000 DCW 0x0000
- |L3.484|
-0001e4 31313a33 DCB "11:39:01",0
-0001e8 393a3031
-0001ec 00
-0001ed 00 DCB 0
-0001ee 00 DCB 0
-0001ef 00 DCB 0
+0001da 0000 DCW 0x0000
+ |L3.476|
+ DCD 0x00000999
+ |L3.480|
+0001e0 4e31304c DCB "N10Lite_NT37701",0
+0001e4 6974655f
+0001e8 4e543337
+0001ec 37303100
|L3.496|
-0001f0 4a756c20 DCB "Jul 6 2023",0
-0001f4 20362032
-0001f8 30323300
- |L3.508|
- DCD 0x00000997
- |L3.512|
-000200 4e31304c DCB "N10Lite_NT37701",0
-000204 6974655f
-000208 4e543337
-00020c 37303100
- |L3.528|
-000210 5b25735d DCB "[%s] (%04d) N10Lite CSOT667 [%s %s]",0
-000214 20282530
-000218 34642920
-00021c 4e31304c
-000220 69746520
-000224 43534f54
-000228 36363720
-00022c 5b257320
-000230 25735d00
- |L3.564|
+0001f0 5b25735d DCB "[%s] (%04d) N10Lite V100 20230714",0
+0001f4 20282530
+0001f8 34642920
+0001fc 4e31304c
+000200 69746520
+000204 56313030
+000208 20323032
+00020c 33303731
+000210 3400
+000212 00 DCB 0
+000213 00 DCB 0
+ |L3.532|
DCD tp_sleep_count
- |L3.568|
+ |L3.536|
DCD tp_sleep_clk_count
- |L3.572|
+ |L3.540|
DCD ||.data||
- |L3.576|
+ |L3.544|
DCD soft_timer3_cb
- |L3.580|
+ |L3.548|
DCD Flag_blacklight_EN
- |L3.584|
+ |L3.552|
DCD ||i.init_panel||+0xc8
- |L3.588|
-00024c 5b25735d DCB "[%s] (%04d) init code",0
-000250 20282530
-000254 34642920
-000258 696e6974
-00025c 20636f64
-000260 6500
+ |L3.556|
+00022c 5b25735d DCB "[%s] (%04d) init code",0
+000230 20282530
+000234 34642920
+000238 696e6974
+00023c 20636f64
+000240 6500
+000242 00 DCB 0
+000243 00 DCB 0
+ |L3.580|
+ DCD ap_reset_cb
+ |L3.584|
+000248 5b25735d DCB "[%s] (%04d) Phone off 28",0
+00024c 20282530
+000250 34642920
+000254 50686f6e
+000258 65206f66
+00025c 66203238
+000260 00
+000261 00 DCB 0
000262 00 DCB 0
000263 00 DCB 0
|L3.612|
- DCD ap_reset_cb
- |L3.616|
-000268 5b25735d DCB "[%s] (%04d) Phone off 28",0
-00026c 20282530
-000270 34642920
-000274 50686f6e
-000278 65206f66
-00027c 66203238
-000280 00
-000281 00 DCB 0
-000282 00 DCB 0
-000283 00 DCB 0
+000264 5b25735d DCB "[%s] (%04d) Phone off 29",0
+000268 20282530
+00026c 34642920
+000270 50686f6e
+000274 65206f66
+000278 66203239
+00027c 00
+00027d 00 DCB 0
+00027e 00 DCB 0
+00027f 00 DCB 0
+ |L3.640|
+ DCD 0x00000898
|L3.644|
-000284 5b25735d DCB "[%s] (%04d) Phone off 29",0
-000288 20282530
-00028c 34642920
-000290 50686f6e
-000294 65206f66
-000298 66203239
-00029c 00
-00029d 00 DCB 0
-00029e 00 DCB 0
-00029f 00 DCB 0
- |L3.672|
DCD tp_sleep_in
- |L3.676|
-0002a4 5b25735d DCB "[%s] (%04d) disable video path\n",0
-0002a8 20282530
-0002ac 34642920
-0002b0 64697361
-0002b4 626c6520
-0002b8 76696465
-0002bc 6f207061
-0002c0 74680a00
+ |L3.648|
+000288 5b25735d DCB "[%s] (%04d) disable video path\n",0
+00028c 20282530
+000290 34642920
+000294 64697361
+000298 626c6520
+00029c 76696465
+0002a0 6f207061
+0002a4 74680a00
AREA ||i.ap_get_reg_53||, CODE, READONLY, ALIGN=2
@@ -2301,11 +2291,12 @@
;;;2438 {
;;;2439 TAU_LOGD("hb...");
;;;2440 s_heartbeat = 0;
-;;;2441 ap_tp_st_touch_software_reset();
-;;;2442 }
-;;;2443 }
-;;;2444 }
-;;;2445 }
+;;;2441 // ap_tp_st_touch_software_reset();
+;;;2442 ap_tp_st_touch_hardware_reset();
+;;;2443 }
+;;;2444 }
+;;;2445 }
+;;;2446 }
00001a bd70 POP {r4-r6,pc}
|L19.28|
00001c 4909 LDR r1,|L19.68|
@@ -2320,10 +2311,10 @@
00002c a107 ADR r1,|L19.76|
00002e a00b ADR r0,|L19.92|
000030 f7fffffe BL LOG_printf
-000034 6265 STR r5,[r4,#0x24] ;2441 ; s_heartbeat
-000036 f7fffffe BL ap_tp_st_touch_software_reset
+000034 6265 STR r5,[r4,#0x24] ;2442 ; s_heartbeat
+000036 f7fffffe BL ap_tp_st_touch_hardware_reset
00003a bd70 POP {r4-r6,pc}
-;;;2446
+;;;2447
ENDP
|L19.60|
@@ -4790,7 +4781,7 @@
AREA ||.rev16_text||, CODE
THUMB
EXPORT |__asm___9_ap_demo_c_c64640cd____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_c64640cd____REV16| PROC
#line 468
diff --git a/project/ISP_368/Listings/app_tp_st_touch.txt b/project/ISP_368/Listings/app_tp_st_touch.txt
index 9cb5b94..3cb7a30 100644
--- a/project/ISP_368/Listings/app_tp_st_touch.txt
+++ b/project/ISP_368/Listings/app_tp_st_touch.txt
@@ -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..\CVWL368 -I.\RTE\_ISP_368 -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_368 --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..\CVWL368 -I.\RTE\_ISP_368 -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_368 --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
@@ -405,36 +405,32 @@
000000 b510 PUSH {r4,lr}
;;;543 {
;;;544 // 收到 TP 异常回复 0xF3 0x02 0x00 0x00 0x00 0x00 0x00 0x00
-;;;545 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|
-;;;546 {
-;;;547 ap_tp_st_touch_software_reset();
-000014 f7fffffe BL ap_tp_st_touch_software_reset
- |L5.24|
-;;;548 }
-;;;549 }
-000018 bd10 POP {r4,pc}
-;;;550
+;;;545 // if(screendata[0] == 0xF3 && screendata[1] == 0x02 && screendata[2] == 0x00)
+;;;546 if(screendata[0] == 0xF3)
+000002 7800 LDRB r0,[r0,#0]
+000004 28f3 CMP r0,#0xf3
+000006 d101 BNE |L5.12|
+;;;547 {
+;;;548 // ap_tp_st_touch_software_reset();
+;;;549 ap_tp_st_touch_hardware_reset();
+000008 f7fffffe BL ap_tp_st_touch_hardware_reset
+ |L5.12|
+;;;550 }
+;;;551 }
+00000c bd10 POP {r4,pc}
+;;;552
ENDP
AREA ||i.ap_tp_st_touch_error_handler_FF||, CODE, READONLY, ALIGN=1
ap_tp_st_touch_error_handler_FF PROC
-;;;558
-;;;559 void ap_tp_st_touch_error_handler_FF(uint8_t* screendata)
+;;;560
+;;;561 void ap_tp_st_touch_error_handler_FF(uint8_t* screendata)
000000 b510 PUSH {r4,lr}
-;;;560 {
-;;;561 // 收到 TP 异常回复 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF
-;;;562 if(screendata[1] == 0xFF && screendata[2] == 0xFF&& screendata[3] == 0xFF&&screendata[4] == 0xFF)
+;;;562 {
+;;;563 // 收到 TP 异常回复 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF
+;;;564 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|
@@ -447,14 +443,15 @@
000014 7900 LDRB r0,[r0,#4]
000016 28ff CMP r0,#0xff
000018 d101 BNE |L6.30|
-;;;563 {
-;;;564 ap_tp_st_touch_software_reset();
-00001a f7fffffe BL ap_tp_st_touch_software_reset
+;;;565 {
+;;;566 // ap_tp_st_touch_software_reset();
+;;;567 ap_tp_st_touch_hardware_reset();
+00001a f7fffffe BL ap_tp_st_touch_hardware_reset
|L6.30|
-;;;565 }
-;;;566 }
+;;;568 }
+;;;569 }
00001e bd10 POP {r4,pc}
-;;;567
+;;;570
ENDP
@@ -1259,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
diff --git a/project/ISP_368/Listings/app_tp_transfer.txt b/project/ISP_368/Listings/app_tp_transfer.txt
index e90fe17..8c4c7d6 100644
--- a/project/ISP_368/Listings/app_tp_transfer.txt
+++ b/project/ISP_368/Listings/app_tp_transfer.txt
@@ -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..\CVWL368 -I.\RTE\_ISP_368 -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_368 --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..\CVWL368 -I.\RTE\_ISP_368 -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_368 --omf_browse=.\objects\app_tp_transfer.crf ..\..\src\app\demo\app_tp_transfer.c]
THUMB
AREA ||i.S20_Start_init||, CODE, READONLY, ALIGN=2
@@ -1276,7 +1276,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
diff --git a/project/ISP_368/Listings/board.txt b/project/ISP_368/Listings/board.txt
index 70b4711..d775036 100644
--- a/project/ISP_368/Listings/board.txt
+++ b/project/ISP_368/Listings/board.txt
@@ -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..\CVWL368 -I.\RTE\_ISP_368 -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_368 --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..\CVWL368 -I.\RTE\_ISP_368 -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_368 --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
diff --git a/project/ISP_368/Listings/main.txt b/project/ISP_368/Listings/main.txt
index de2f410..013d351 100644
--- a/project/ISP_368/Listings/main.txt
+++ b/project/ISP_368/Listings/main.txt
@@ -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..\CVWL368 -I.\RTE\_ISP_368 -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_368 --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..\CVWL368 -I.\RTE\_ISP_368 -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_368 --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
diff --git a/project/ISP_368/Objects/ISP368_N10Lite_CSOT667.bin b/project/ISP_368/Objects/ISP368_N10Lite_CSOT667.bin
deleted file mode 100644
index a78563a..0000000
Binary files a/project/ISP_368/Objects/ISP368_N10Lite_CSOT667.bin and /dev/null differ
diff --git a/src/app/demo/ap_demo.c b/src/app/demo/ap_demo.c
index e51d513..e6b1ddf 100644
--- a/src/app/demo/ap_demo.c
+++ b/src/app/demo/ap_demo.c
@@ -2438,7 +2438,8 @@ void tp_heartbeat_exec(void)
{
TAU_LOGD("hb...");
s_heartbeat = 0;
- ap_tp_st_touch_software_reset();
+ // ap_tp_st_touch_software_reset();
+ ap_tp_st_touch_hardware_reset();
}
}
}
@@ -2452,7 +2453,8 @@ void ap_demo(void)
hal_gpio_init_output(IO_PAD_PWMEN, IO_LVL_LOW); //AP_SWIRE
hal_gpio_init_output(IO_PAD_ADCIN, IO_LVL_LOW); //SWIRE
- TAU_LOGD("N10Lite CSOT667 [%s %s]", __DATE__, __TIME__);
+// TAU_LOGD("N10Lite CSOT667 [%s %s]", __DATE__, __TIME__);
+ TAU_LOGD("N10Lite V100 20230714");
/* mipi rx初始化 */
open_mipi_rx();
delayMs(20);
diff --git a/src/app/demo/app_tp_st_touch.c b/src/app/demo/app_tp_st_touch.c
index c050bcd..c3b10ee 100644
--- a/src/app/demo/app_tp_st_touch.c
+++ b/src/app/demo/app_tp_st_touch.c
@@ -542,9 +542,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();
}
}
@@ -561,7 +563,8 @@ 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();
}
}