diff options
| author | Marc Lasch <mlasch@mailbox.org> | 2017-04-16 17:20:38 +0200 |
|---|---|---|
| committer | Marc Lasch <mlasch@mailbox.org> | 2017-04-16 17:20:38 +0200 |
| commit | 80d80c305eb3f1227ebd88bdfb2840deb9b43682 (patch) | |
| tree | 54843260ba7522a375f3e2a5fd36a9e45fd0bb68 /usv_driver.py | |
| parent | d50ca49bb9dcf5640487df2044b62d63432b6764 (diff) | |
| parent | e3494d280fd6e2db591ea40c4365cdf18524fbdc (diff) | |
| download | usv_tools-80d80c305eb3f1227ebd88bdfb2840deb9b43682.tar.gz usv_tools-80d80c305eb3f1227ebd88bdfb2840deb9b43682.zip | |
Diffstat (limited to 'usv_driver.py')
| -rwxr-xr-x | usv_driver.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/usv_driver.py b/usv_driver.py index bdf8656..4ff52ea 100755 --- a/usv_driver.py +++ b/usv_driver.py @@ -8,7 +8,11 @@ class Usv(object): def __init__(self, device, baudrate, json_file): self._serial_port = serial.Serial(device, baudrate=baudrate, +<<<<<<< HEAD timeout=0.8) +======= + timeout=10) +>>>>>>> e3494d280fd6e2db591ea40c4365cdf18524fbdc # force a clean prompt #self._serial_port.write(b"\r") |