diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2023-02-02 12:10:13 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2023-02-02 12:10:13 +0000 |
| commit | ec2a8dc191308ce075f77e969ee36840fb1cc0f5 (patch) | |
| tree | 0b2f9d506061ce211264c4af43412685f8cf9a82 | |
| parent | c3a4fb618567a413cb1d647d8608c06d4333a16e (diff) | |
| parent | 137ed126cc77337e6a87618b48a2dbe3d12714fc (diff) | |
| download | felix-ec2a8dc191308ce075f77e969ee36840fb1cc0f5.tar.gz | |
Merge "touch/fst2: Add noise level information" into android13-gs-pixel-5.10-tm-qpr3
| -rw-r--r-- | touch/fst2/fts.c | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/touch/fst2/fts.c b/touch/fst2/fts.c index a6696d4..ad8e610 100644 --- a/touch/fst2/fts.c +++ b/touch/fst2/fts.c @@ -728,9 +728,6 @@ do { \ */ static void fts_status_event_handler(struct fts_ts_info *info, u8 *event) { - u8 grid_touch_status; - static u8 scanning_frequency = 0; - switch (event[1]) { case EVT_TYPE_STATUS_ECHO: log_status_event(0, event); @@ -824,13 +821,20 @@ static void fts_status_event_handler(struct fts_ts_info *info, u8 *event) break; case EVT_TYPE_STATUS_NOISE: - if(scanning_frequency != event[3]) { - LOGI("%s: Scanning frequency changed from %02X to %02X\n", - __func__, scanning_frequency, event[3]); + { + static u8 noise_level; + static u8 scanning_frequency; + + if (noise_level != event[2] || scanning_frequency != event[3]) { + log_status_event2(1, "changed", event); + LOGI("%s: level:[%02X->%02X],freq:[%02X->%02X]\n", + __func__, noise_level, event[2], + scanning_frequency, event[3]); + noise_level = event[2]; scanning_frequency = event[3]; - log_status_event(1, event); } else log_status_event(0, event); + } break; case EVT_TYPE_STATUS_PALM_TOUCH: @@ -858,8 +862,11 @@ static void fts_status_event_handler(struct fts_ts_info *info, u8 *event) break; case EVT_TYPE_STATUS_GRIP_TOUCH: - grid_touch_status = (event[2] & 0xF0) >> 4; - switch (grid_touch_status) { + { + u8 grip_touch_status; + + grip_touch_status = (event[2] & 0xF0) >> 4; + switch (grip_touch_status) { case 0x01: log_status_event2(0, "entry", event); #if IS_ENABLED(CONFIG_GOOG_TOUCH_INTERFACE) @@ -880,6 +887,7 @@ static void fts_status_event_handler(struct fts_ts_info *info, u8 *event) log_status_event2(1, "unknown event", event); break; } + } break; case EVT_TYPE_STATUS_GOLDEN_RAW_VAL: |