summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWai-Hong Tam <waihong@google.com>2021-08-17 15:46:41 -0700
committerCommit Bot <commit-bot@chromium.org>2021-08-18 17:14:45 +0000
commit2a5629c65283a5a285a4d49d68535b7520e10eec (patch)
tree288ac9ae531eb9322a01faead62416b9bea5979b
parent2a418330ae2e9661f1198183683d15efb2e56ba6 (diff)
downloadchrome-ec-2a5629c65283a5a285a4d49d68535b7520e10eec.tar.gz
herobrine_npcx9: Detect the Refresh key at row 3
Herobrine uses the Vivaldi keyboard. The Refresh key is at T2 (col:2, row:3), instead of T3 (col:2, row:2). The code filters out the Refresh key and check any boot key remaining, like the Esc key. Misconfiguring it fails the recovery boot, as EC detects a redundant key pressed. BRANCH=None BUG=b:196885613 TEST=Pressed Refresh (T2) + Esc and booted EC. Checked the message: [0.005749 KB boot key mask 1] which showed the Esc key was recognized. Without this CL, the message won't show up, as a redundant key (T2 not recognized as Refresh) is pressed. Both EC-OS and Zephyr images behave the same. Change-Id: Iee82d7d4d6b3301ac342abc384488842a9858b7e Signed-off-by: Wai-Hong Tam <waihong@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3102287 Reviewed-by: Philip Chen <philipchen@chromium.org> Reviewed-by: Keith Short <keithshort@chromium.org> Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
-rw-r--r--board/herobrine_npcx9/board.h1
-rw-r--r--zephyr/projects/herobrine/herobrine_npcx9/prj.conf1
2 files changed, 2 insertions, 0 deletions
diff --git a/board/herobrine_npcx9/board.h b/board/herobrine_npcx9/board.h
index 14a8366684..09c4697672 100644
--- a/board/herobrine_npcx9/board.h
+++ b/board/herobrine_npcx9/board.h
@@ -20,6 +20,7 @@
/* Keyboard */
#define CONFIG_KEYBOARD_PROTOCOL_MKBP
+#define CONFIG_KEYBOARD_REFRESH_ROW3
#define CONFIG_PWM_KBLIGHT
diff --git a/zephyr/projects/herobrine/herobrine_npcx9/prj.conf b/zephyr/projects/herobrine/herobrine_npcx9/prj.conf
index 055ec976dd..25930b64ca 100644
--- a/zephyr/projects/herobrine/herobrine_npcx9/prj.conf
+++ b/zephyr/projects/herobrine/herobrine_npcx9/prj.conf
@@ -60,6 +60,7 @@ CONFIG_PLATFORM_EC_KEYBOARD=y
CONFIG_PLATFORM_EC_KEYBOARD_PROTOCOL_MKBP=y
CONFIG_PLATFORM_EC_MKBP_INPUT_DEVICES=y
CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED=y
+CONFIG_PLATFORM_EC_KEYBOARD_REFRESH_ROW3=y
CONFIG_PLATFORM_EC_VOLUME_BUTTONS=y
CONFIG_PLATFORM_EC_CMD_BUTTON=y
CONFIG_CROS_KB_RAW_NPCX=y