Skip to content

Commit

Permalink
Merge pull request #2 from claudyus/master
Browse files Browse the repository at this point in the history
use more generic serial identify and other minor fix
  • Loading branch information
juanrmn committed Sep 3, 2013
2 parents a8e63f1 + c96c927 commit 068b43d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -0,0 +1 @@
*.pyc
4 changes: 3 additions & 1 deletion main/python/ldevice.py
Expand Up @@ -216,8 +216,10 @@ def get_avalilable_ports():
#else:

# We only want the USB-Serial ports:
regex = re.compile('/dev/tty(USB|ACM)[0-9]+')

for port in list_ports.comports():
if port[0].find('USB') != -1:
if regex.match(port[0]):
available.append(port[0])

return available
2 changes: 1 addition & 1 deletion main/python/ui/laser_control.ui
Expand Up @@ -337,7 +337,7 @@ p, li { white-space: pre-wrap; }
</property>
<widget class="QWidget" name="tab_config">
<attribute name="title">
<string>Confituration</string>
<string>Configuration</string>
</attribute>
<widget class="QCheckBox" name="confMode">
<property name="geometry">
Expand Down

0 comments on commit 068b43d

Please sign in to comment.