update examples, docs
diff --git a/pyserial/documentation/appendix.rst b/pyserial/documentation/appendix.rst
index 487a334..a2dfc80 100644
--- a/pyserial/documentation/appendix.rst
+++ b/pyserial/documentation/appendix.rst
@@ -52,7 +52,7 @@
and create a list of modules that they package. pySerial may create two issues
with that:
-- implementations for other modules are found. On Windows, it's save to exclude
+- implementations for other modules are found. On Windows, it's safe to exclude
'serialposix', 'serialjava' and 'serialcli' as these are not used.
- ``serial_for_url`` does a dynamic lookup of protocol handlers at runtime.
diff --git a/pyserial/documentation/examples.rst b/pyserial/documentation/examples.rst
index a22f5e0..fcffad6 100644
--- a/pyserial/documentation/examples.rst
+++ b/pyserial/documentation/examples.rst
@@ -27,7 +27,7 @@
such as ``rfc2217:://<host>:<port>`` respectively ``socket://<host>:<port>`` as
*port* argument when invoking.
-Command line options ``miniterm.py -h``::
+Command line options ``python -m serial.tools.miniterm -h``::
Usage: miniterm.py [options] [port [baudrate]]
@@ -96,7 +96,7 @@
This is a py2exe setup script for Windows. It can be used to create a
standalone ``miniterm.exe``.
-.. _miniterm.py: http://pyserial.svn.sourceforge.net/viewvc/*checkout*/pyserial/trunk/pyserial/examples/miniterm.py
+.. _miniterm.py: http://pyserial.svn.sourceforge.net/viewvc/*checkout*/pyserial/trunk/pyserial/serial/tools/miniterm.py
.. _setup-miniterm-py2exe.py: http://pyserial.svn.sourceforge.net/viewvc/*checkout*/pyserial/trunk/pyserial/examples/setup-miniterm-py2exe.py
diff --git a/pyserial/examples/scanlinux.py b/pyserial/examples/scanlinux.py
index 7cf6383..c888bed 100644
--- a/pyserial/examples/scanlinux.py
+++ b/pyserial/examples/scanlinux.py
@@ -12,7 +12,7 @@
def scan():
"""scan for available ports. return a list of device names."""
- return glob.glob('/dev/ttyS*') + glob.glob('/dev/ttyUSB*')
+ return glob.glob('/dev/ttyS*') + glob.glob('/dev/ttyUSB*') + glob.glob('/dev/ttyACM*')
if __name__=='__main__':
print "Found ports:"
diff --git a/pyserial/examples/setup-miniterm-py2exe.py b/pyserial/examples/setup-miniterm-py2exe.py
index e935cf0..60539ec 100644
--- a/pyserial/examples/setup-miniterm-py2exe.py
+++ b/pyserial/examples/setup-miniterm-py2exe.py
@@ -8,19 +8,20 @@
sys.argv.extend("py2exe --bundle 1".split())
+import serial.tools.miniterm
+
setup(
- name='miniterm',
- #~ version='0.5',
- zipfile=None,
+ name = 'miniterm',
+ zipfile = None,
options = {"py2exe":
{
'dist_dir': 'bin',
- 'excludes': ['javax.comm'],
+ 'excludes': ['serialjava', 'serialposix', 'serialcli'],
'compressed': 1,
}
},
console = [
- #~ "miniterm_exe_wrapper.py",
- "miniterm.py",
+ #~ "miniterm.py",
+ serial.tools.miniterm.__file__
],
)