commit 7456c3d059bba0ce12f96d45fa01277fab0675ff
author Vic Yang <victoryang@chromium.org> Tue May 22 07:40:51 2012
committer Gerrit <chrome-bot@google.com> Tue May 22 15:57:13 2012
tree 3a2895a9cf0376ff256c0969c3ef8ddfe207e559
parent 0ad79828bb0d9f5ecb19e038cac56dbb4d625fca

hdctools: servo: Modify ec.py to match ec console message

EC console messages have been modified to save flash size. We need to
modify the regular expression in EC driver to match them.

BUG=chrome-os-partner:9188
TEST='dut-control fan_target_rpm', 'dut-control fan_actual_rpm', and
'dut-control lid_open' all work.

Change-Id: I91489fd341f22972e26a3a3cf92ac4286e762715
Reviewed-on: https://gerrit.chromium.org/gerrit/23197
Reviewed-by: Todd Broch <tbroch@chromium.org>
Commit-Ready: Vic Yang <victoryang@chromium.org>
Tested-by: Vic Yang <victoryang@chromium.org>

servo/drv/ec.py

diff --git a/servo/drv/ec.py b/servo/drv/ec.py
index 527cce1..29598e8 100644
--- a/servo/drv/ec.py
+++ b/servo/drv/ec.py
@@ -268,7 +268,7 @@
       1: Lid opened.
     """
     result = self._issue_cmd_get_results("rw %s" % LID_STATUS_ADDR,
-        ["read word %s = 0x.......(.)" % LID_STATUS_ADDR])[0]
+        ["read %s = 0x.......(.)" % LID_STATUS_ADDR])[0]
     res_code = int(result.group(1), 16)
     return res_code & LID_STATUS_MASK
 
@@ -368,9 +368,9 @@
         fan_duty: Current fan duty cycle.
     """
     results = self._issue_cmd_get_results('faninfo',
-                                         ['Fan actual speed:[ \t]*(\d+) rpm',
-                                          'target speed:[ \t]*(\d+) rpm',
-                                          'duty cycle:[ \t]*(\d+)%'])
+                                         ['Actual:[ \t]*(\d+) rpm',
+                                          'Target:[ \t]*(\d+) rpm',
+                                          'Duty:[ \t]*(\d+)%'])
     return [int(results[0].group(1), 0),
             int(results[1].group(1), 0),
             int(results[2].group(1), 0)]