1、修复部分机板高概率开机无触或者唤醒无触问题。

2、修改低亮度下唤醒偶发高亮问题

project/ISP568T.uvprojx

@@ -7,7 +7,7 @@
 
   <Targets>
     <Target>
-      <TargetName>ISP568</TargetName>
+      <TargetName>ISP568T</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <pArmCC>5060750::V5.06 update 6 (build 750)::ARMCC</pArmCC>
@@ -50,7 +50,7 @@
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
           <OutputDirectory>.\Objects\</OutputDirectory>
-          <OutputName>WL568_S21_NT37701_20230612</OutputName>
+          <OutputName>WL568T_S21_NT37701_20231023</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>1</CreateHexFile>
@@ -408,16 +408,16 @@
         <Group>
           <GroupName>driver</GroupName>
           <Files>
-            <File>
-              <FileName>CVWL568.lib</FileName>
-              <FileType>4</FileType>
-              <FilePath>..\src\sdk\lib\CVWL568.lib</FilePath>
-            </File>
             <File>
               <FileName>WL568_S21_NT37701_TP.lib</FileName>
               <FileType>4</FileType>
               <FilePath>..\src\sdk\lib\WL568_S21_NT37701_TP.lib</FilePath>
             </File>
+            <File>
+              <FileName>CVWL568T.lib</FileName>
+              <FileType>4</FileType>
+              <FilePath>..\src\sdk\CVWL568T\lib\CVWL568T.lib</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -491,7 +491,7 @@
       <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
         <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
         <targetInfos>
-          <targetInfo name="ISP568"/>
+          <targetInfo name="ISP568T"/>
         </targetInfos>
       </component>
     </components>

project/RTE/_ISP568/RTE_Components.h

@@ -3,7 +3,7 @@
  * Auto generated Run-Time-Environment Configuration File
  *      *** Do not modify ! ***
  *
- * Project: 'ISP568' 
+ * Project: 'ISP568T' 
  * Target:  'ISP568' 
  */
 

project/RTE/_ISP568T/RTE_Components.h

@@ -0,0 +1,21 @@
+
+/*
+ * Auto generated Run-Time-Environment Configuration File
+ *      *** Do not modify ! ***
+ *
+ * Project: 'ISP568T' 
+ * Target:  'ISP568T' 
+ */
+
+#ifndef RTE_COMPONENTS_H
+#define RTE_COMPONENTS_H
+
+
+/*
+ * Define the Device Header File: 
+ */
+#define CMSIS_device_header "ARMCM0.h"
+
+
+
+#endif /* RTE_COMPONENTS_H */

si/SAMSUNG_S21_OLED_FHD_BC_20230602.SearchResults

@@ -1,12 +0,0 @@
----- s_screen_init_complate Matches (11 in 3 files) ----
-app_tp_transfer.c (src\app\demo) line 33 : bool    s_screen_init_complate = false;                //屏幕TP开机初始化完成标志
-S20_Start_init in app_tp_transfer.c (src\app\demo) : 			s_screen_init_complate = true;
-app_tp_transfer_screen_const in app_tp_transfer.c (src\app\demo) : 		s_screen_init_complate = true;
-app_tp_transfer_screen_const in app_tp_transfer.c (src\app\demo) : 			s_screen_init_complate = true;
-app_tp_transfer_screen_const in app_tp_transfer.c (src\app\demo) :                 s_screen_init_complate = true;
-app_tp_transfer_screen_start in app_tp_transfer.c (src\app\demo) :     s_screen_init_complate = false;
-app_tp_transfer_screen_int in app_tp_transfer.c (src\app\demo) : 	//	  s_screen_init_complate=false;//为了在线烧录，特意将码片设置为不下发数据，而是FT8719与敦泰的工具通讯
-app_tp_transfer_screen_int in app_tp_transfer.c (src\app\demo) :     if (!s_screen_init_complate)                             //TP 初始化还未完成，则先进行初始化操作
-app_tp_transfer.h (src\app\demo) line 20 : extern  bool    s_screen_init_complate;
-tp_heartbeat_exec in ap_demo.c (src\app\demo) : 	if (s_screen_init_complate)
-tp_power_up_restart in ap_demo.c (src\app\demo) : 	if(s_power_up_flag == true && s_screen_init_complate == true)

si/SAMSUNG_S21_OLED_FHD_BC_20230602.snippets.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<SourceInsightCodeSnippets
-	AppVer="4.00.0084"
-	AppVerMinReader="4.00.0019"
-	>
-	<SnippetList/>
-</SourceInsightCodeSnippets>

si/SAMSUNG_S21_OLED_FHD_BC_ISP568T_20231023.SearchResults

@@ -0,0 +1,4 @@
+---- ap_tp_st_touch_error_handler_FF Matches (3 in 3 files) ----
+app_tp_st_touch.c (src\app\demo) line 602 : void ap_tp_st_touch_error_handler_FF(uint8_t* screendata)
+app_tp_st_touch.h (src\app\demo) line 172 : void ap_tp_st_touch_error_handler_FF(uint8_t* screendata);
+app_tp_transfer_screen_int in app_tp_transfer.c (src\app\demo) : 		ap_tp_st_touch_error_handler_FF(s_screen_read_buffer);

src/app/demo/ap_demo.c

@@ -96,8 +96,11 @@
 //#define DISPLAY_ONLY
 //#define CUS_SCLD_FILTER true
 #define NEW_ACK_CMD_FUNC true
-	
+
-	
+// 更改息屏处理函数，在使用TP3V3接入到VCI，去掉息屏二极管的应用中，息屏打开VCC。
+#define FPC_BOARD_TYPE_NEW		1		// 1 新做FPC 板子       0 旧款板子
+
+
 /******************************************************/
 static hal_dsi_rx_ctrl_handle_t *g_rx_ctrl_handle = NULL;
 static hal_dsi_tx_ctrl_handle_t *g_tx_ctrl_handle = NULL;
@@ -327,7 +330,7 @@ static void ap_reset_cb(void *data)
 
 
 static bool isStart = false;
-static bool s_power_up_flag = false;
+bool s_power_up_flag = false;
 
 static bool ap_dcs_read(uint8_t data_type, uint8_t dcs_cmd, uint8_t param)
 {
@@ -1557,7 +1560,9 @@ static bool ap_set_backlight_51(hal_dsi_rx_ctrl_handle_t *handler, hal_dcs_packe
     cmd_data[0] = dcs_packet->packet_param[0]; 
     cmd_data[1] = dcs_packet->packet_param[1];  
 	hal_dsi_tx_ctrl_write_cmd(0x39, 0, 3, 0x51, cmd_data[0], cmd_data[1]);  
-	//TAU_LOGD("51:[%x]", (cmd_data[0]<<8)|cmd_data[1]); 
+//	hal_dsi_tx_ctrl_write_cmd(0x39, 0, 3, 0x51, 0x00, 0x08);
+
+//	TAU_LOGD("51:[%x]", (cmd_data[0]<<8)|cmd_data[1]); 
     return true;
 }	
 
@@ -5059,12 +5064,19 @@ void tp_heartbeat_exec(void)
 
 void tp_power_up_restart(void)
 {
-	if(s_power_up_flag == true && s_tp_delay_count >= (100*6))	// 开机6秒后重启
+	if(s_power_up_flag == true && s_tp_delay_count == (100*6))	// 开机6秒后重启
+	{
+	//	s_power_up_flag = false;
+		ap_tp_st_touch_hardware_reset();
+	//	TAU_LOGD("tp_hardware_reset");
+	}
+	else if(s_power_up_flag == true && s_tp_delay_count == (100*20))	// 开机26秒后重启
 	{
 		s_power_up_flag = false;
 		ap_tp_st_touch_hardware_reset();
 	//	TAU_LOGD("tp_hardware_reset");
 	}
+
 }
 
 void ap_demo(void)
@@ -5075,12 +5087,16 @@ void ap_demo(void)
 	hal_gpio_init_output(IO_PAD_ADCIN, IO_LVL_LOW);
 	//    hal_gpio_init_output(IO_PAD_AP_INT, IO_LVL_LOW);
 	hal_gpio_init_output(IO_PAD_PWMEN, IO_LVL_LOW);  // LED_ON
+	hal_gpio_init_output(IO_PAD_TD_TPRSTN, IO_LVL_HIGH);
+//	hal_gpio_set_output_data(g_screen_input_rst_pad, IO_LVL_LOW);
+//    delayUs(200);
+//    hal_gpio_set_output_data(IO_PAD_TD_TPRSTN, IO_LVL_HIGH);
 	tp_sleep_in = 1;
 	app_tp_I2C_init();	
 	
     /* mipi rx初始化 */
     open_mipi_rx();
-    TAU_LOGD("s21 20230606\n");
+    TAU_LOGD("s21 V101 20231023\n");
 	
  
  //	hal_dsi_rx_ctrl_set_hw_tear_mode(g_rx_ctrl_handle);
@@ -5121,6 +5137,8 @@ void ap_demo(void)
 			start_display_on = false;
 			panel_display_done = true;
 
+			ap_tp_st_touch_hardware_reset(); // 20231023
+
 			app_tp_phone_clear_reset_on();
 		#ifndef DISABLE_TDDI_I2C_FUNCTION
 			/* 与屏的TP 模块通讯并初始化 */
@@ -5192,7 +5210,10 @@ void ap_demo(void)
 			
 			TAU_LOGD("disable video path \n");
 			g_need_enter_sleep_mode = false;
-//			hal_system_set_vcc(false);
+#if (FPC_BOARD_TYPE_NEW == 0)
+			hal_system_set_vcc(false);
+#endif
+					
 			tp_sleep_in=1;
         }
     #endif

src/app/demo/app_tp_st_touch.c

@@ -585,9 +585,9 @@ 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)  
 	{
-		ap_tp_st_touch_software_reset();
+		ap_tp_st_touch_hardware_reset();
 	}
 }
 
@@ -602,9 +602,9 @@ void ap_tp_st_touch_error_handler_F3(uint8_t* screendata)
 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)
+	if(screendata[1] == 0xFF)
 	{
-		ap_tp_st_touch_software_reset();
+		ap_tp_st_touch_hardware_reset();
 	}
 }
 

src/app/demo/app_tp_transfer.c

@@ -18,6 +18,9 @@
 #include "app_tp_st_touch.h"
 #include "hal_dsi_tx_ctrl.h"
 
+extern bool s_power_up_flag;
+
+
 #if 1//def AP_TP_TRANSFER
 uint8_t read_point;							//当前要读的报点数。一个报点8BYTE数据
 uint8_t s_screen_number[2];
@@ -206,7 +209,7 @@ void app_tp_init(void)
 	hal_gpio_set_pull_state(IO_PAD_TD_SPIM_CSN, ENABLE, DISABLE);	
 #endif
 
-//    app_tp_screen_init();                                        //初始化手机复位的IO口
+ //   app_tp_screen_init();                                        //初始化手机复位的IO口
 //app_tp_screen_int_init();                                         //配置screen中断输入引脚
 #ifdef G_PHONE_INT_DEFAULT_LOW
 	hal_gpio_init_output(g_phone_output_int_pad, IO_LVL_LOW);	  //配置phone报点输出中断IO口
@@ -214,7 +217,8 @@ void app_tp_init(void)
     hal_gpio_init_output(g_phone_output_int_pad, IO_LVL_HIGH);    //配置phone报点输出中断IO口
 #endif 
     hal_gpio_init_input(g_screen_input_int_pad);
-//    hal_gpio_init_output(g_screen_input_rst_pad, IO_LVL_HIGH);	 //配置模组TP RESET
+//	hal_gpio_init_output(g_screen_input_rst_pad, IO_LVL_HIGH);
+    hal_gpio_init_output(g_screen_input_rst_pad, IO_LVL_HIGH);	 //配置模组TP RESET
 
 #if SCREEN_MASTER_TRANSFER_I2C
     hal_i2c_m_dma_init(SCREEN_I2C_ADDRESS, SCREEN_I2C_ADDR_BITS, I2C_MASTER_SPEED);
@@ -422,7 +426,10 @@ void S20_Start_init(void)
 	uint8_t temp=0;
 	uint8_t temp_start_flag=0;	
     
-    hal_dsi_tx_ctrl_write_cmd(0x29, 0, 3, 0x51, 0x07, 0xff);
+    if(s_power_up_flag == true)	 // 解决开机部分基板亮度低问题
+	{
+		hal_dsi_tx_ctrl_write_cmd(0x29, 0, 3, 0x51, 0x07, 0xff);
+	}
 	//    if(phone_start_flag==1)
 	{
 		app_tp_m_read(screen_reg_int_data[0].buffer, 1, s_screen_read_buffer, 8);

src/app/demo/demo_version.txt

@@ -13,6 +13,13 @@
 	2、如该项目提供有两个客户，需要在更改时间项前增加客户名称：
 
 /////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////
+
+			ISP568_S21_NT37701AH_HX628_20230803
+
+	1、基于最新程序 ISP568_S21_NT37701AH_HX628_20230602 量产的基础上更改
+	2、更改为使用WL568T
+
 /////////////////////////////////////////////////////////////////////////////////
 
 			ISP568_S21_NT37701AH_HX628_20230403