Commit 71e5da00 authored by kliment's avatar kliment

Merge pull request #318 from hroncok/master

Show connection error to the user
parents 5897fbc6 354bfb09
...@@ -28,6 +28,7 @@ except: ...@@ -28,6 +28,7 @@ except:
import sys, glob, time, datetime, threading, traceback, cStringIO, subprocess import sys, glob, time, datetime, threading, traceback, cStringIO, subprocess
from printrun.pronterface_widgets import * from printrun.pronterface_widgets import *
from serial import SerialException
StringIO = cStringIO StringIO = cStringIO
...@@ -72,7 +73,11 @@ class Tee(object): ...@@ -72,7 +73,11 @@ class Tee(object):
self.target(data) self.target(data)
except: except:
pass pass
self.stdout.write(data.encode("utf-8")) try:
data = data.encode("utf-8")
except:
pass
self.stdout.write(data)
def flush(self): def flush(self):
self.stdout.flush() self.stdout.flush()
...@@ -1420,7 +1425,19 @@ class PronterWindow(MainWindow, pronsole.pronsole): ...@@ -1420,7 +1425,19 @@ class PronterWindow(MainWindow, pronsole.pronsole):
self.paused = 0 self.paused = 0
if self.sdprinting: if self.sdprinting:
self.p.send_now("M26 S0") self.p.send_now("M26 S0")
self.p.connect(port, baud) try:
self.p.connect(port, baud)
except SerialException as e:
# Currently, there is no errno, but it should be there in the future
if e.errno == 2:
print _("Error: You are trying to connect to a non-exisiting port.")
elif e.errno == 8:
print _("Error: You don't have permission to open %s.") % port
print _("You might need to add yourself to the dialout group.")
else:
print e
# Kill the scope anyway
return
self.statuscheck = True self.statuscheck = True
if port != self.settings.port: if port != self.settings.port:
self.set("port", port) self.set("port", port)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment