commit e262a3e977def8931504635e2cda41adabc43046
author Vic Yang <victoryang@chromium.org> Fri Nov 02 18:48:37 2012 +0800
committer Gerrit <chrome-bot@google.com> Sat Nov 03 00:05:10 2012 -0700
tree df69444edcd855108d30e0e284abf498589d7426
parent 7701b7fd223ca882b4388e162b8080bbf3b62f48

autotest: servo: Set keyboard mux before enabling keyboard control

Enabling keyboard control before setting keyboard mux causes unwanted
key presses for a short moment. Let's enable keyboard after to avoid
this.

BUG=chrome-os-partner:15547
TEST=Passed firmware_FAFTSetup.

Change-Id: I134a3ad3d2a72c906224d9db5589b582e13e3806
Signed-off-by: Vic Yang <victoryang@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/37201
Reviewed-by: Tom Wai-Hong Tam <waihong@chromium.org>
Reviewed-by: Todd Broch <tbroch@chromium.org>

server/cros/servo.py

diff --git a/server/cros/servo.py b/server/cros/servo.py
index 505f4b9..0e0c470 100644
--- a/server/cros/servo.py
+++ b/server/cros/servo.py
@@ -222,19 +222,12 @@
     def _press_and_release_keys(self, key,
                                 press_secs=SERVO_KEY_PRESS_DELAY):
         """Simulate button presses."""
-        # set keys to none
-        (m1_a1, m1_a0, m2_a1, m2_a0) = self.KEY_MATRIX[self._key_matrix]['none']
-        self.set_nocheck('kbd_m2_a0', m2_a0)
-        self.set_nocheck('kbd_m2_a1', m2_a1)
-        self.set_nocheck('kbd_m1_a0', m1_a0)
-        self.set_nocheck('kbd_m1_a1', m1_a1)
-
         (m1_a1, m1_a0, m2_a1, m2_a0) = self.KEY_MATRIX[self._key_matrix][key]
-        self.set_nocheck('kbd_en', 'on')
         self.set_nocheck('kbd_m2_a0', m2_a0)
         self.set_nocheck('kbd_m2_a1', m2_a1)
         self.set_nocheck('kbd_m1_a0', m1_a0)
         self.set_nocheck('kbd_m1_a1', m1_a1)
+        self.set_nocheck('kbd_en', 'on')
         time.sleep(press_secs)
         self.set_nocheck('kbd_en', 'off')