parrot: bugfix to make rec_mode work.
The following change that refactored separate pty drivers into one
2b090c766e1b7b2142af19e84e76132a79bb1a3a
hdctools: pty_driver: refactor _issue_cmd method.
Broke rec_mode for parrot due to EOL characters being different.
This CL fixes that issue.
BUG=chrome-os-partner:16759
TEST=manual,
1. sudo servod -b parrot
2. dut-control rec_mode rec_mode:on rec_mode rec_mode:off
Change-Id: I6f1d027e56b2be6e173f50c2f21a69a75095b3b5
Reviewed-on: https://gerrit.chromium.org/gerrit/46517
Tested-by: Todd Broch <tbroch@chromium.org>
Reviewed-by: Gediminas Ramanauskas <gedis@chromium.org>
Commit-Queue: Todd Broch <tbroch@chromium.org>
diff --git a/servo/drv/parrot_ec.py b/servo/drv/parrot_ec.py
index 2478c30..9d2dabf 100644
--- a/servo/drv/parrot_ec.py
+++ b/servo/drv/parrot_ec.py
@@ -6,6 +6,7 @@
Provides the following EC controlled function:
rec_mode
"""
+import os
import pty_driver
class parrotEcError(Exception):
@@ -36,6 +37,7 @@
"""
super(parrotEc, self).__init__(interface, params)
self._logger.debug("")
+ os.linesep = '\r'
def _Set_rec_mode(self, value):
"""Setter of rec_mode.
@@ -48,11 +50,11 @@
value: 0: rec_mode off; 1: rec_mode on.
"""
if value == 1:
- self._issue_cmd("fbf5=5a\r")
- self._issue_cmd("fbf6=a5\r")
+ self._issue_cmd("fbf5=5a")
+ self._issue_cmd("fbf6=a5")
else:
- self._issue_cmd("fbf5=00\r")
- self._issue_cmd("fbf6=00\r")
+ self._issue_cmd("fbf5=00")
+ self._issue_cmd("fbf6=00")
def _Get_rec_mode(self):
"""Getter of rec_mode.
@@ -65,9 +67,9 @@
0: rec_mode off;
1: rec_mode on.
"""
- result1 = self._issue_cmd_get_results("fbf5\r", ["=(..),"])[0]
- result2 = self._issue_cmd_get_results("fbf6\r", ["=(..),"])[0]
- if result1.group(1).lower() == '5a' and result2.group(1).lower() == 'a5':
+ result1 = self._issue_cmd_get_results("fbf5", ["=(..),"])[0]
+ result2 = self._issue_cmd_get_results("fbf6", ["=(..),"])[0]
+ if result1[1].lower() == '5a' and result2[1].lower() == 'a5':
return 1
else:
return 0
