Skip to content

Commit

Permalink
Merge branch 'pull126'
Browse files Browse the repository at this point in the history
  • Loading branch information
projectgus committed Oct 12, 2016
2 parents 8586bb5 + 9602fef commit e28b30b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ After installing, you will have `esptool.py` installed into the default Python e

Manual installation allows you to run the latest development version from this repository.

esptool.py depends on [pySerial](https://github.com/pyserial/pyserial#readme) for serial communication with the target device.
esptool.py depends on [pySerial](https://github.com/pyserial/pyserial#readme) version 2.5 or newer for serial communication with the target device.

If you choose to install esptool.py system-wide by running `python setup.py install`, then this will be taken care of automatically.

Expand Down
2 changes: 1 addition & 1 deletion esptool.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class ESPROM(object):
ESP_FLASH_SECTOR = 0x1000

def __init__(self, port=0, baud=ESP_ROM_BAUD):
self._port = serial.Serial(port)
self._port = serial.serial_for_url(port)
self._slip_reader = slip_reader(self._port)
# setting baud rate in a separate step is a workaround for
# CH341 driver on some Linux versions (this opens at 9600 then
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def find_version(*file_paths):
'flake8<3.0.0',
],
install_requires=[
'pyserial',
'pyserial>=2.5',
],
scripts=[
'esptool.py',
Expand Down

0 comments on commit e28b30b

Please sign in to comment.