From 5c6f9ec2df03dafd4e8ede476b41ae2047a35f0d Mon Sep 17 00:00:00 2001 From: dengwei1 Date: Thu, 4 Mar 2021 15:11:42 +0800 Subject: [PATCH] pstar: input touch support cqa test input touch support cqa test Change-Id: Ief15a41b4b24f48efc52797e96ff5be46c3b0bf5 Signed-off-by: dengwei1 Reviewed-on: https://gerrit.mot.com/1892850 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- .../touchscreen/stmicro_mmi/fts_lib/ftsTest.c | 29 ++++++++++++------- .../touchscreen/stmicro_mmi/fts_lib/ftsTest.h | 7 +++-- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/drivers/input/touchscreen/stmicro_mmi/fts_lib/ftsTest.c b/drivers/input/touchscreen/stmicro_mmi/fts_lib/ftsTest.c index 1cd84708af1c..c34eb38177a9 100644 --- a/drivers/input/touchscreen/stmicro_mmi/fts_lib/ftsTest.c +++ b/drivers/input/touchscreen/stmicro_mmi/fts_lib/ftsTest.c @@ -65,18 +65,21 @@ int initTestToDo(void) limit_file.size = 0; limit_file.data = NULL; strlcpy(limit_file.name, " ", MAX_LIMIT_FILE_NAME); - + tests.SelfHoverForceRaw = 0; /* /< SS Hover Force Raw min/Max test */ + tests.SelfHoverSenceRaw = 0; /* /< SS Hover Sence Raw min/Max test */ + tests.SelfHoverForceIxTotal = 0; /* /< SS Hover Total Force Ix min/Max (for each node)* test */ + tests.SelfHoverSenceIxTotal = 0; #ifndef COMPUTE_INIT_METHOD tests.MutualRawAdjITO = 1; tests.MutualRaw = 1; - tests.MutualRawMap = 0; + tests.MutualRawMap = 1; tests.MutualRawGap = 0; tests.MutualRawAdj = 0; tests.MutualRawAdjGap = 0; tests.MutualRawAdjPeak = 0; - tests.MutualRawLP = 1; + tests.MutualRawLP = 0; tests.MutualRawGapLP = 0; tests.MutualRawMapLP = 0; tests.MutualRawAdjLP = 0; @@ -89,7 +92,7 @@ int initTestToDo(void) tests.MutualCx1LP = 0; tests.MutualCx2LP = 1; - tests.MutualCx2AdjLP = 1; + tests.MutualCx2TotalLP = 1; tests.MutualCxTotalLP = 0; tests.MutualCxTotalAdjLP = 0; @@ -101,16 +104,18 @@ int initTestToDo(void) tests.MutualKeyCx1 = 0; tests.MutualKeyCx2 = 0; #ifdef PHONE_KEY - tests.MutualKeyCxTotal = 0; + tests.MutualKeyCxTotal = 1; #else tests.MutualKeyCxTotal = 0; #endif tests.SelfForceRaw = 1; tests.SelfForceRawGap = 0; + tests.SelfForceRawMap = 1; - tests.SelfForceRawLP = 1; + tests.SelfForceRawLP = 0; tests.SelfForceRawGapLP = 0; + tests.SelfForceRawMapLP = 0; tests.SelfForceIx1 = 0; tests.SelfForceIx2 = 0; @@ -125,7 +130,7 @@ int initTestToDo(void) tests.SelfForceIx1LP = 0; tests.SelfForceIx2LP = 0; tests.SelfForceIx2AdjLP = 0; - tests.SelfForceIxTotalLP = 1; + tests.SelfForceIxTotalLP = 0; tests.SelfForceIxTotalAdjLP = 0; tests.SelfForceCx1LP = 0; tests.SelfForceCx2LP = 0; @@ -136,8 +141,10 @@ int initTestToDo(void) tests.SelfSenseRaw = 1; tests.SelfSenseRawGap = 0; - tests.SelfSenseRawLP = 1; + tests.SelfSenseRawMap = 1; + tests.SelfSenseRawLP = 0; tests.SelfSenseRawGapLP = 0; + tests.SelfSenseRawMapLP = 0; tests.SelfSenseIx1 = 0; tests.SelfSenseIx2 = 0; @@ -152,7 +159,7 @@ int initTestToDo(void) tests.SelfSenseIx1LP = 0; tests.SelfSenseIx2LP = 0; tests.SelfSenseIx2AdjLP = 0; - tests.SelfSenseIxTotalLP = 1; + tests.SelfSenseIxTotalLP = 0; tests.SelfSenseIxTotalAdjLP = 0; tests.SelfSenseCx1LP = 0; tests.SelfSenseCx2LP = 0; @@ -2770,7 +2777,7 @@ int production_test_ms_cx(char *path_limits, int stop_on_fail, TestToDo *todo) - if ((todo->MutualCx1LP | todo->MutualCx2LP | todo->MutualCx2AdjLP | + if ((todo->MutualCx1LP | todo->MutualCx2LP | todo->MutualCx2TotalLP | todo->MutualCxTotalLP | todo->MutualCxTotalAdjLP) == 1) { ret = production_test_ms_cx_lp(path_limits, stop_on_fail, todo); if (ret < OK) { @@ -3292,7 +3299,7 @@ int production_test_ms_cx_lp(char *path_limits, int stop_on_fail, TestToDo *todo tag); logError(0, "%s MS LP CX2 ADJ TEST:\n", tag); - if (todo->MutualCx2AdjLP == 1) { + if (todo->MutualCx2TotalLP == 1) { /* MS CX2 ADJ HORIZ */ logError(0, "%s MS LP CX2 ADJ HORIZ TEST:\n", tag); diff --git a/drivers/input/touchscreen/stmicro_mmi/fts_lib/ftsTest.h b/drivers/input/touchscreen/stmicro_mmi/fts_lib/ftsTest.h index 2a8588f0f82b..c9ed663c54f5 100644 --- a/drivers/input/touchscreen/stmicro_mmi/fts_lib/ftsTest.h +++ b/drivers/input/touchscreen/stmicro_mmi/fts_lib/ftsTest.h @@ -247,7 +247,7 @@ typedef struct { int MutualCx1LP; /* /< MS LowPower Cx1 min/Max test */ int MutualCx2LP; /* /< MS LowPower Cx2 min/Max (for each node) test */ - int MutualCx2AdjLP; /* /< MS LowPower Vertical and Horizontal Adj Cx2 min/Max + int MutualCx2TotalLP; /* /< MS LowPower Vertical and Horizontal Adj Cx2 min/Max * (for each node) test */ int MutualCxTotalLP; /* /< MS Total LowPower Cx min/Max (for each node) test * */ @@ -259,7 +259,10 @@ typedef struct { int MutualKeyCx2; /* /< MS Cx2 Key min/Max (for each node) test */ int MutualKeyCxTotal; /* /< MS Total Cx Key min/Max (for each node) * test */ - + int SelfHoverForceRaw; /* SS Hover Force Raw min/Max test */ + int SelfHoverSenceRaw; /*SS Hover Sence Raw min/Max test */ + int SelfHoverForceIxTotal; /*SS Hover Total Force Ix min/Max (for each node)* test */ + int SelfHoverSenceIxTotal; /*SS Hover Total Sence Ix min/Max (for each node)* test */ int SelfForceRaw; /* /< SS Force Raw min/Max test */ int SelfForceRawGap; /* /< SS Force Raw Gap(max-min) test */ int SelfForceRawMap; /* /< SS Force Raw min/Max Map test */